update to 7.10.6

added python23-pth support

Many changes and fixes.

See ChangeLog for a complete list.

Important:
* WARNING: Removed the deprecated pycurl.init() and pycurl.multi_init()
  names - use pycurl.Curl() and pycurl.CurlMulti() instead.

* WARNING: Removed the deprecated Curl.cleanup() and CurlMulti.cleanup()
  methods - use Curl.close() and CurlMulti.close() instead.

4 files changed, 55 insertions, 27 deletions

diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index 5f618aac724..4cee978ead0 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/07/22 04:14:35 martti Exp $
+# $NetBSD: Makefile,v 1.11 2003/09/14 18:03:53 recht Exp $
 
-DISTNAME=	pycurl-7.10.1
-PKGREVISION=	1
-PKGNAME=	${PYPKGPREFIX}-curl-7.10.1
+DISTNAME=	pycurl-7.10.6
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	www
 MASTER_SITES=	http://pycurl.sourceforge.net/download/
 
@@ -12,7 +11,7 @@ COMMENT=	Python module interface to the cURL library
 
 PYDISTUTILSPKG=	# defined
 PYBINMODULE=	# defined
-PYTHON_VERSIONS_ACCEPTED=	21pth 22pth
+PYTHON_VERSIONS_ACCEPTED=	21pth 22pth 23pth
 USE_BUILDLINK2=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
diff --git a/www/py-curl/PLIST b/www/py-curl/PLIST
index ff91325e6cf..3b0ee0cb8df 100644
--- a/www/py-curl/PLIST
+++ b/www/py-curl/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2002/10/22 14:21:04 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/09/14 18:03:53 recht Exp $
+${PYSITELIB}/curl/__init__.py
+${PYSITELIB}/curl/__init__.pyc
+${PYSITELIB}/curl/__init__.pyo
 ${PYSITELIB}/pycurl.so
 share/doc/pycurl${PYVERSSUFFIX}/COPYING
 share/doc/pycurl${PYVERSSUFFIX}/ChangeLog
@@ -6,10 +9,37 @@ share/doc/pycurl${PYVERSSUFFIX}/INSTALL
 share/doc/pycurl${PYVERSSUFFIX}/README
 share/doc/pycurl${PYVERSSUFFIX}/TODO
 share/doc/pycurl${PYVERSSUFFIX}/examples/basicfirst.py
-share/doc/pycurl${PYVERSSUFFIX}/examples/curl.py
 share/doc/pycurl${PYVERSSUFFIX}/examples/gtkhtml_demo.py
+share/doc/pycurl${PYVERSSUFFIX}/examples/linksys.py
+share/doc/pycurl${PYVERSSUFFIX}/examples/retriever-multi.py
 share/doc/pycurl${PYVERSSUFFIX}/examples/retriever.py
 share/doc/pycurl${PYVERSSUFFIX}/examples/sfquery.py
 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/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_getinfo.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/test_gtk.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/test_internals.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/test_memleak.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi2.py
+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_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_stringio.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/test_xmlrpc.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/util.py
+@dirrm share/doc/pycurl${PYVERSSUFFIX}/tests
+@dirrm share/doc/pycurl${PYVERSSUFFIX}/html
 @dirrm share/doc/pycurl${PYVERSSUFFIX}/examples
 @dirrm share/doc/pycurl${PYVERSSUFFIX}
+@dirrm ${PYSITELIB}/curl
diff --git a/www/py-curl/distinfo b/www/py-curl/distinfo
index 334f8b51a06..c8cf250b459 100644
--- a/www/py-curl/distinfo
+++ b/www/py-curl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/10/22 14:21:04 drochner Exp $
+$NetBSD: distinfo,v 1.6 2003/09/14 18:03:53 recht Exp $
 
-SHA1 (pycurl-7.10.1.tar.gz) = 87f06eae731b79905924cdaf9102b90e7074f0c3
-Size (pycurl-7.10.1.tar.gz) = 41581 bytes
-SHA1 (patch-aa) = a78df7f3dd5c320a61b2903b707cc35beefd7801
+SHA1 (pycurl-7.10.6.tar.gz) = a2f07e69433701985659b4436156e49e7b24c871
+Size (pycurl-7.10.6.tar.gz) = 58974 bytes
+SHA1 (patch-aa) = 8535e415484b1fdfdd4cc77760d917d3181afc4d
diff --git a/www/py-curl/patches/patch-aa b/www/py-curl/patches/patch-aa
index 8f874968d07..d750d794033 100644
--- a/www/py-curl/patches/patch-aa
+++ b/www/py-curl/patches/patch-aa
@@ -1,17 +1,16 @@
-$NetBSD: patch-aa,v 1.1 2002/10/22 14:21:04 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2003/09/14 18:03:54 recht Exp $
 
---- setup.py.orig	Wed Oct 16 09:14:35 2002
-+++ setup.py	Tue Oct 22 16:12:45 2002
-@@ -111,10 +111,10 @@
-     license="GNU Lesser General Public License (LGPL)",
-     data_files = [
-         # list of tuples with (path to install to, a list of files)
--        (os.path.join("doc", "pycurl"), [
-+        (os.path.join("share", "doc", "pycurl" + sys.version[0:3]), [
-             "ChangeLog", "COPYING", "INSTALL", "README", "TODO",
-         ]),
--        (os.path.join("doc", "pycurl", "examples"), [
-+        (os.path.join("share", "doc", "pycurl" + sys.version[0:3], "examples"), [
-             os.path.join("examples", "basicfirst.py"),
-             os.path.join("examples", "curl.py"),
-             os.path.join("examples", "gtkhtml_demo.py"),
+--- setup.py.orig	2003-08-16 19:35:17.000000000 +0200
++++ setup.py	2003-09-13 17:41:21.000000000 +0200
+@@ -136,9 +136,9 @@
+     # a list of tuples with (path to install to, a list of local files)
+     data_files = []
+     if sys.platform == "win32":
+-        datadir = os.path.join("doc", PACKAGE)
++        datadir = os.path.join("doc", PACKAGE + sys.version[0:3])
+     else:
+-        datadir = os.path.join("share", "doc", PACKAGE)
++        datadir = os.path.join("share", "doc", PACKAGE  + sys.version[0:3])
+     #
+     files = ["ChangeLog", "COPYING", "INSTALL", "README", "TODO",]
+     if files: