4 files changed, 52 insertions, 45 deletions

diff --git a/ftp/py-curl/Makefile b/ftp/py-curl/Makefile
index 300735971501..25a9c9735b33 100644
--- a/ftp/py-curl/Makefile
+++ b/ftp/py-curl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.15.2
-PORTREVISION=	1
+PORTVERSION=	7.15.5.1
 CATEGORIES=	ftp python
 MASTER_SITES=	http://pycurl.sourceforge.net/download/ \
 		http://pycurl.sourceforge.net/download/00-OLD-VERSIONS/
@@ -27,11 +26,16 @@ DOCSDIR=	${PREFIX}/share/doc/py-curl
 EXAMPLESDIR=	${PREFIX}/share/examples/py-curl
 
 post-patch:
-	${REINPLACE_CMD} -e 's@\(curl-config --\)@${LOCALBASE}/bin/\1@g' \
+	${REINPLACE_CMD} \
 		-e 's@^\(include_dirs = \).*@\1["${LOCALBASE}/include"]@' \
 		-e 's@^\(PACKAGE = \).*@\1"py-curl"@' \
 		-e 's@\(os.path.join(\)datadir, "examples")@\1"share/examples/py-curl")@' \
 		-e 's@name=PACKAGE@name="pycurl"@' \
 		${WRKSRC}/setup.py
 
+pre-install:
+.if defined(NOPORTDOCS)
+	${RM} -fr ${WRKSRC}/doc
+.endif
+
 .include <bsd.port.mk>
diff --git a/ftp/py-curl/distinfo b/ftp/py-curl/distinfo
index 5895cf046f71..57e2f023ad41 100644
--- a/ftp/py-curl/distinfo
+++ b/ftp/py-curl/distinfo
@@ -1,3 +1,3 @@
-MD5 (pycurl-7.15.2.tar.gz) = d96d7392304f4c3c4ebdc05dd479fc41
-SHA256 (pycurl-7.15.2.tar.gz) = 039c1f9d38da6b5e4f7edffd62d1fed80cbe6ce43f037345599a2377f0bb6451
-SIZE (pycurl-7.15.2.tar.gz) = 62225
+MD5 (pycurl-7.15.5.1.tar.gz) = 464cfbeba150d99d92a407c7c8b751de
+SHA256 (pycurl-7.15.5.1.tar.gz) = 93a786476a32f88622ada3fe355a1cef136d9658b39ac76806ef4ba154bbd2f9
+SIZE (pycurl-7.15.5.1.tar.gz) = 66075
diff --git a/ftp/py-curl/files/patch-src-pycurl.c b/ftp/py-curl/files/patch-src-pycurl.c
index c358c6df71e9..40d7e7825d09 100644
--- a/ftp/py-curl/files/patch-src-pycurl.c
+++ b/ftp/py-curl/files/patch-src-pycurl.c
@@ -1,6 +1,6 @@
---- src/pycurl.c.orig	Tue Dec  5 17:11:38 2006
-+++ src/pycurl.c	Tue Dec  5 17:13:03 2006
-@@ -1109,9 +1109,11 @@
+--- src/pycurl.c.orig	Fri Aug 11 10:37:19 2006
++++ src/pycurl.c	Wed Dec 20 16:11:36 2006
+@@ -1475,9 +1475,11 @@
          case CURLOPT_URL:
          case CURLOPT_USERAGENT:
          case CURLOPT_USERPWD:
@@ -9,10 +9,10 @@
          case CURLOPT_SOURCE_USERPWD:
          case CURLOPT_SOURCE_PATH:
 +#endif
+         case CURLOPT_FTP_ALTERNATIVE_TO_USER:
  /* FIXME: check if more of these options allow binary data */
              str = PyString_AsString_NoNUL(obj);
-             if (str == NULL)
-@@ -1279,12 +1281,14 @@
+@@ -1646,12 +1648,14 @@
          case CURLOPT_PREQUOTE:
              old_slist = &self->prequote;
              break;
@@ -27,7 +27,7 @@
          case CURLOPT_HTTPPOST:
              break;
          default:
-@@ -2689,14 +2693,18 @@
+@@ -3180,14 +3184,18 @@
      insint_c(d, "FTP_SSL", CURLOPT_FTP_SSL);
      insint_c(d, "POSTFIELDSIZE_LARGE", CURLOPT_POSTFIELDSIZE_LARGE);
      insint_c(d, "TCP_NODELAY", CURLOPT_TCP_NODELAY);
diff --git a/ftp/py-curl/pkg-plist b/ftp/py-curl/pkg-plist
index f27b6de95007..3c000819daf7 100644
--- a/ftp/py-curl/pkg-plist
+++ b/ftp/py-curl/pkg-plist
@@ -2,35 +2,6 @@
 %%PYTHON_SITELIBDIR%%/curl/__init__.pyc
 %%PYTHON_SITELIBDIR%%/curl/__init__.pyo
 %%PYTHON_SITELIBDIR%%/pycurl.so
-%%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
@@ -38,8 +9,40 @@
 %%EXAMPLESDIR%%/retriever.py
 %%EXAMPLESDIR%%/sfquery.py
 %%EXAMPLESDIR%%/xmlrpc_curl.py
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%/tests
-@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/html/callbacks.html
+%%PORTDOCS%%%%DOCSDIR%%/html/curlmultiobject.html
+%%PORTDOCS%%%%DOCSDIR%%/html/curlobject.html
+%%PORTDOCS%%%%DOCSDIR%%/html/curlshareobject.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pycurl.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_cb.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_debug.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_ftp.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_getinfo.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_gtk.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_internals.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_memleak.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi2.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi3.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi4.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi5.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi6.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi_vs_thread.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_post.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_post2.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_post3.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_share.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_stringio.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_xmlrpc.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/util.py
 @dirrm %%PYTHON_SITELIBDIR%%/curl
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tests
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%