Changes 7.19.3.1:

This release restores PycURL’s ability to automatically detect SSL library in use in most circumstances.

4 files changed, 26 insertions, 20 deletions

diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index b117f63667f..c165f0ba9e0 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2014/02/12 23:18:46 tron Exp $
+# $NetBSD: Makefile,v 1.48 2014/04/23 10:32:55 adam Exp $
 
-DISTNAME=	pycurl-7.19.3
+DISTNAME=	pycurl-7.19.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://pycurl.sourceforge.net/download/
 
diff --git a/www/py-curl/PLIST b/www/py-curl/PLIST
index 0eaddcabba3..3877a5def7a 100644
--- a/www/py-curl/PLIST
+++ b/www/py-curl/PLIST
@@ -1,13 +1,14 @@
-@comment $NetBSD: PLIST,v 1.11 2014/01/19 09:31:33 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2014/04/23 10:32:55 adam Exp $
 ${PYSITELIB}/curl/__init__.py
 ${PYSITELIB}/curl/__init__.pyc
 ${PYSITELIB}/curl/__init__.pyo
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/pycurl.so
+share/doc/pycurl${PYVERSSUFFIX}/AUTHORS
 share/doc/pycurl${PYVERSSUFFIX}/COPYING-LGPL
 share/doc/pycurl${PYVERSSUFFIX}/COPYING-MIT
 share/doc/pycurl${PYVERSSUFFIX}/ChangeLog
-share/doc/pycurl${PYVERSSUFFIX}/INSTALL
+share/doc/pycurl${PYVERSSUFFIX}/INSTALL.rst
 share/doc/pycurl${PYVERSSUFFIX}/README.rst
 share/doc/pycurl${PYVERSSUFFIX}/examples/basicfirst.py
 share/doc/pycurl${PYVERSSUFFIX}/examples/file_upload.py
@@ -16,11 +17,15 @@ 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/curlshareobject.html
-share/doc/pycurl${PYVERSSUFFIX}/html/pycurl.html
+share/doc/pycurl${PYVERSSUFFIX}/rst/callbacks.rst
+share/doc/pycurl${PYVERSSUFFIX}/rst/curlmultiobject.rst
+share/doc/pycurl${PYVERSSUFFIX}/rst/curlobject.rst
+share/doc/pycurl${PYVERSSUFFIX}/rst/curlshareobject.rst
+share/doc/pycurl${PYVERSSUFFIX}/rst/files.rst
+share/doc/pycurl${PYVERSSUFFIX}/rst/internals.rst
+share/doc/pycurl${PYVERSSUFFIX}/rst/pycurl.rst
+share/doc/pycurl${PYVERSSUFFIX}/rst/release-process.rst
+share/doc/pycurl${PYVERSSUFFIX}/rst/unicode.rst
 share/doc/pycurl${PYVERSSUFFIX}/tests/__init__.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/app.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/appmanager.py
@@ -38,6 +43,7 @@ share/doc/pycurl${PYVERSSUFFIX}/tests/header_test.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/internals_test.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/matrix.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/memory_mgmt_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/multi_option_constants_test.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/multi_socket_select_test.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/multi_socket_test.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/multi_test.py
@@ -55,6 +61,7 @@ share/doc/pycurl${PYVERSSUFFIX}/tests/runwsgi.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/seek_function_test.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/setopt_lifecycle_test.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/setopt_unicode_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/setup_test.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/share_test.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/socket_open_test.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/unset_range_test.py
diff --git a/www/py-curl/distinfo b/www/py-curl/distinfo
index 8901e17e18a..82ad9926f1f 100644
--- a/www/py-curl/distinfo
+++ b/www/py-curl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2014/01/19 09:31:33 wiz Exp $
+$NetBSD: distinfo,v 1.19 2014/04/23 10:32:55 adam Exp $
 
-SHA1 (pycurl-7.19.3.tar.gz) = 5d8b7a7f869362421061d72f6d234bf805ebebb5
-RMD160 (pycurl-7.19.3.tar.gz) = cecbd26d6097a74a601eb8a334d0502f22aadf5c
-Size (pycurl-7.19.3.tar.gz) = 113771 bytes
-SHA1 (patch-aa) = 498e377238bdb42ff1f61added622edf3522f691
+SHA1 (pycurl-7.19.3.1.tar.gz) = fd82722e2abc108b7bd469ab6a743cebe8cd8f78
+RMD160 (pycurl-7.19.3.1.tar.gz) = 091e66521b942dbf25afac952776cdecc3649142
+Size (pycurl-7.19.3.1.tar.gz) = 116687 bytes
+SHA1 (patch-aa) = 0c237e7b8e01ff9398c26765976f0c36e19cc5d2
diff --git a/www/py-curl/patches/patch-aa b/www/py-curl/patches/patch-aa
index 445e2f0d1b3..0335842fcb9 100644
--- a/www/py-curl/patches/patch-aa
+++ b/www/py-curl/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.9 2014/01/19 09:31:33 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2014/04/23 10:32:55 adam Exp $
 
 * add multi python variant support
 
---- setup.py.orig	2014-01-10 06:04:40.000000000 +0000
+--- setup.py.orig	2014-02-06 09:55:59.000000000 +0000
 +++ setup.py
-@@ -336,9 +336,9 @@ def get_data_files():
+@@ -392,9 +392,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":
@@ -14,5 +14,5 @@ $NetBSD: patch-aa,v 1.9 2014/01/19 09:31:33 wiz Exp $
 -        datadir = os.path.join("share", "doc", PACKAGE)
 +        datadir = os.path.join("share", "doc", PACKAGE  + sys.version[0:3])
      #
-     files = ["ChangeLog", "COPYING-LGPL", "COPYING-MIT", "INSTALL", "README.rst"]
-     if files:
+     files = ["AUTHORS", "ChangeLog", "COPYING-LGPL", "COPYING-MIT",
+         "INSTALL.rst", "README.rst"]