Update to 7.14.0

PR:		83623
Submitted by:	vsevolod

3 files changed, 47 insertions, 44 deletions

diff --git a/ftp/py-curl/Makefile b/ftp/py-curl/Makefile
index bf3a429..adf6dce 100644
--- a/ftp/py-curl/Makefile
+++ b/ftp/py-curl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.13.1
+PORTVERSION=	7.14.0
 CATEGORIES=	ftp python
 MASTER_SITES=	http://pycurl.sourceforge.net/download/ \
 		http://pycurl.sourceforge.net/download/00-OLD-VERSIONS/
@@ -21,7 +21,10 @@ LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_REINPLACE=	yes
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - 2>/dev/null || true
+USE_OPENSSL=	yes
+
+DOCSDIR=	${PREFIX}/share/doc/py-curl
+EXAMPLESDIR=	${PREFIX}/share/examples/py-curl
 
 post-patch:
 	${REINPLACE_CMD} -e 's@\(curl-config --\)@${LOCALBASE}/bin/\1@g' \
diff --git a/ftp/py-curl/distinfo b/ftp/py-curl/distinfo
index 15dfd03..35461eb 100644
--- a/ftp/py-curl/distinfo
+++ b/ftp/py-curl/distinfo
@@ -1,2 +1,2 @@
-MD5 (pycurl-7.13.1.tar.gz) = 9dda4d883b2a9cd2e819296f9b91c555
-SIZE (pycurl-7.13.1.tar.gz) = 61568
+MD5 (pycurl-7.14.0.tar.gz) = 6f73d518fb520af14634a06ee1b7ddce
+SIZE (pycurl-7.14.0.tar.gz) = 62114
diff --git a/ftp/py-curl/pkg-plist b/ftp/py-curl/pkg-plist
index bd6377a..f27b6de 100644
--- a/ftp/py-curl/pkg-plist
+++ b/ftp/py-curl/pkg-plist
@@ -2,44 +2,44 @@
 %%PYTHON_SITELIBDIR%%/curl/__init__.pyc
 %%PYTHON_SITELIBDIR%%/curl/__init__.pyo
 %%PYTHON_SITELIBDIR%%/pycurl.so
-share/doc/py-curl/COPYING
-share/doc/py-curl/ChangeLog
-share/doc/py-curl/INSTALL
-share/doc/py-curl/README
-share/doc/py-curl/TODO
-share/doc/py-curl/html/callbacks.html
-share/doc/py-curl/html/curlmultiobject.html
-share/doc/py-curl/html/curlobject.html
-share/doc/py-curl/html/pycurl.html
-share/doc/py-curl/tests/test.py
-share/doc/py-curl/tests/test_cb.py
-share/doc/py-curl/tests/test_debug.py
-share/doc/py-curl/tests/test_getinfo.py
-share/doc/py-curl/tests/test_gtk.py
-share/doc/py-curl/tests/test_internals.py
-share/doc/py-curl/tests/test_memleak.py
-share/doc/py-curl/tests/test_multi.py
-share/doc/py-curl/tests/test_multi2.py
-share/doc/py-curl/tests/test_multi3.py
-share/doc/py-curl/tests/test_multi4.py
-share/doc/py-curl/tests/test_multi5.py
-share/doc/py-curl/tests/test_multi6.py
-share/doc/py-curl/tests/test_multi_vs_thread.py
-share/doc/py-curl/tests/test_post.py
-share/doc/py-curl/tests/test_post2.py
-share/doc/py-curl/tests/test_post3.py
-share/doc/py-curl/tests/test_stringio.py
-share/doc/py-curl/tests/test_xmlrpc.py
-share/doc/py-curl/tests/util.py
-share/examples/py-curl/basicfirst.py
-share/examples/py-curl/file_upload.py
-share/examples/py-curl/linksys.py
-share/examples/py-curl/retriever-multi.py
-share/examples/py-curl/retriever.py
-share/examples/py-curl/sfquery.py
-share/examples/py-curl/xmlrpc_curl.py
-@dirrm share/examples/py-curl
-@dirrm share/doc/py-curl/tests
-@dirrm share/doc/py-curl/html
-@dirrm share/doc/py-curl
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/README
+%%DOCSDIR%%/TODO
+%%DOCSDIR%%/html/callbacks.html
+%%DOCSDIR%%/html/curlmultiobject.html
+%%DOCSDIR%%/html/curlobject.html
+%%DOCSDIR%%/html/pycurl.html
+%%DOCSDIR%%/tests/test.py
+%%DOCSDIR%%/tests/test_cb.py
+%%DOCSDIR%%/tests/test_debug.py
+%%DOCSDIR%%/tests/test_getinfo.py
+%%DOCSDIR%%/tests/test_gtk.py
+%%DOCSDIR%%/tests/test_internals.py
+%%DOCSDIR%%/tests/test_memleak.py
+%%DOCSDIR%%/tests/test_multi.py
+%%DOCSDIR%%/tests/test_multi2.py
+%%DOCSDIR%%/tests/test_multi3.py
+%%DOCSDIR%%/tests/test_multi4.py
+%%DOCSDIR%%/tests/test_multi5.py
+%%DOCSDIR%%/tests/test_multi6.py
+%%DOCSDIR%%/tests/test_multi_vs_thread.py
+%%DOCSDIR%%/tests/test_post.py
+%%DOCSDIR%%/tests/test_post2.py
+%%DOCSDIR%%/tests/test_post3.py
+%%DOCSDIR%%/tests/test_stringio.py
+%%DOCSDIR%%/tests/test_xmlrpc.py
+%%DOCSDIR%%/tests/util.py
+%%EXAMPLESDIR%%/basicfirst.py
+%%EXAMPLESDIR%%/file_upload.py
+%%EXAMPLESDIR%%/linksys.py
+%%EXAMPLESDIR%%/retriever-multi.py
+%%EXAMPLESDIR%%/retriever.py
+%%EXAMPLESDIR%%/sfquery.py
+%%EXAMPLESDIR%%/xmlrpc_curl.py
+@dirrm %%EXAMPLESDIR%%
+@dirrm %%DOCSDIR%%/tests
+@dirrm %%DOCSDIR%%/html
+@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/curl