update to 7.11.1 (sync with net/curl recent update)

maintainer timeout .... okay sturm@.

net/py-curl/Makefile

@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.11 2004/01/29 17:13:37 sturm Exp $
+# $OpenBSD: Makefile,v 1.12 2004/04/20 13:06:27 xsa Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
 COMMENT=	"python interface to cURL library"
 
-VERSION=	7.9.8.4
+VERSION=	7.11.1
 DISTNAME=	pycurl-${VERSION}
 PKGNAME=	py-curl-${VERSION}
 CATEGORIES=    	net
 
 HOMEPAGE=	http://pycurl.sourceforge.net/
-MASTER_SITES=	${HOMEPAGE}download/ \
-		${HOMEPAGE}download/00-OLD-VERSIONS/
 
 MAINTAINER=	Shell Hung <shell@openbsd.org>
 
@@ -21,10 +19,16 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MASTER_SITES=	${HOMEPAGE}download/ \
+		${HOMEPAGE}download/00-OLD-VERSIONS/
+
 MODULES=	python
 
 LIB_DEPENDS=	curl.2.2::net/curl
 
-NO_REGRESS=	Yes
+do-regress: fake
+	@cd ${WRKSRC}/tests && ${MAKE_ENV} \
+		PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \
+		${MODPY_BIN} ./test_getinfo.py
 
 .include <bsd.port.mk>

net/py-curl/distinfo

@@ -1,3 +1,3 @@
-MD5 (pycurl-7.9.8.4.tar.gz) = 64d12cba8c07959e5c26ded3a6fbba4c
+MD5 (pycurl-7.11.1.tar.gz) = d9228f7c482c867920ddd8a5cf66e087
-RMD160 (pycurl-7.9.8.4.tar.gz) = 0a4ee67fb89f76b00073eebcb00e5473045facf8
+RMD160 (pycurl-7.11.1.tar.gz) = bd258ebbcf0975608da70c16c514261580cef50c
-SHA1 (pycurl-7.9.8.4.tar.gz) = b60a342d38ec37192df9a8c8e9c28c1ffa0beeff
+SHA1 (pycurl-7.11.1.tar.gz) = 6954cdede48911baaea8ed0e928ab1873e986d86

net/py-curl/patches/patch-setup_py

@@ -1,16 +1,30 @@
-$OpenBSD: patch-setup_py,v 1.1 2003/07/31 19:11:59 sturm Exp $
+$OpenBSD: patch-setup_py,v 1.2 2004/04/20 13:06:27 xsa Exp $
---- setup.py.orig	2002-09-04 21:22:10.000000000 +0200
+--- setup.py.orig	2004-03-15 11:24:01.000000000 +0100
-+++ setup.py	2003-07-30 09:26:07.000000000 +0200
++++ setup.py	2004-04-16 17:12:05.000000000 +0200
-@@ -83,10 +83,10 @@ setup_args = get_kw(
+@@ -142,20 +142,20 @@ def get_data_files():
-     license="GNU Lesser General Public License (LGPL)",
+     if sys.platform == "win32":
-     data_files = [
+         datadir = os.path.join("doc", PACKAGE)
-         # list of tuples with (path to install to, a list of files)
+     else:
--        (os.path.join("doc", "pycurl"), [
+-        datadir = os.path.join("share", "doc", PACKAGE)
-+        (os.path.join("share", "doc", "pycurl"), [
++        datadir = os.path.join("share")
-             "COPYING", "INSTALL", "README", "TODO",
+     #
-         ]),
+-    files = ["ChangeLog", "COPYING", "INSTALL", "README", "TODO",]
--        (os.path.join("doc", "pycurl", "examples"), [
++    files = []
-+        (os.path.join("share", "examples", "pycurl"), [
+     if files:
-             os.path.join("examples", "basicfirst.py"),
+-        data_files.append((os.path.join(datadir), files))
-             os.path.join("examples", "curl.py"),
++        data_files.append((os.path.join(datadir, "doc", "py-curl"),files))
-             os.path.join("examples", "gtkhtml_demo.py"),
+     files = glob.glob(os.path.join("doc", "*.html"))
+     if files:
+-        data_files.append((os.path.join(datadir, "html"), files))
++        data_files.append((os.path.join(datadir, "doc", "py-curl"), files))
+     files = glob.glob(os.path.join("examples", "*.py"))
+     if files:
+-        data_files.append((os.path.join(datadir, "examples"), files))
++        data_files.append((os.path.join(datadir, "examples", "py-curl"), files))
+     files = glob.glob(os.path.join("tests", "*.py"))
+     if files:
+-        data_files.append((os.path.join(datadir, "tests"), files))
++        data_files.append((os.path.join(datadir, "examples", "py-curl", "tests"), files))
+     #
+     assert data_files
+     for install_dir, files in data_files:

net/py-curl/pkg/PLIST

@@ -1,14 +1,38 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/07/31 19:11:59 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/04/20 13:06:27 xsa Exp $
+lib/python${MODPY_VERSION}/site-packages/curl/__init__.py
+lib/python${MODPY_VERSION}/site-packages/curl/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/pycurl.so
-share/doc/pycurl/COPYING
+share/doc/py-curl/callbacks.html
-share/doc/pycurl/INSTALL
+share/doc/py-curl/curlmultiobject.html
-share/doc/pycurl/README
+share/doc/py-curl/curlobject.html
-share/doc/pycurl/TODO
+share/doc/py-curl/pycurl.html
-share/examples/pycurl/basicfirst.py
+share/examples/py-curl/basicfirst.py
-share/examples/pycurl/curl.py
+share/examples/py-curl/gtkhtml_demo.py
-share/examples/pycurl/gtkhtml_demo.py
+share/examples/py-curl/linksys.py
-share/examples/pycurl/retriever.py
+share/examples/py-curl/retriever-multi.py
-share/examples/pycurl/sfquery.py
+share/examples/py-curl/retriever.py
-share/examples/pycurl/xmlrpc_curl.py
+share/examples/py-curl/sfquery.py
-@dirrm share/examples/pycurl
+share/examples/py-curl/tests/test.py
-@dirrm share/doc/pycurl
+share/examples/py-curl/tests/test_cb.py
+share/examples/py-curl/tests/test_debug.py
+share/examples/py-curl/tests/test_getinfo.py
+share/examples/py-curl/tests/test_gtk.py
+share/examples/py-curl/tests/test_internals.py
+share/examples/py-curl/tests/test_memleak.py
+share/examples/py-curl/tests/test_multi.py
+share/examples/py-curl/tests/test_multi2.py
+share/examples/py-curl/tests/test_multi3.py
+share/examples/py-curl/tests/test_multi4.py
+share/examples/py-curl/tests/test_multi5.py
+share/examples/py-curl/tests/test_multi6.py
+share/examples/py-curl/tests/test_multi_vs_thread.py
+share/examples/py-curl/tests/test_post.py
+share/examples/py-curl/tests/test_post2.py
+share/examples/py-curl/tests/test_stringio.py
+share/examples/py-curl/tests/test_xmlrpc.py
+share/examples/py-curl/tests/util.py
+share/examples/py-curl/xmlrpc_curl.py
+@dirrm share/examples/py-curl/tests
+@dirrm share/examples/py-curl
+@dirrm share/doc/py-curl
+@dirrm lib/python${MODPY_VERSION}/site-packages/curl