aboutsummaryrefslogtreecommitdiff
path: root/ftp/py-curl
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2007-03-25 17:05:13 +0000
committerPav Lucistnik <pav@FreeBSD.org>2007-03-25 17:05:13 +0000
commit8ae2d04c9e65dc607a20ad42a646c5bfd9400bd6 (patch)
treeac968e210c356d146acad0d4c5020044db78e861 /ftp/py-curl
parent03a32e52daa005bc0973d20eb54e58136d5a4538 (diff)
downloadports-8ae2d04c9e65dc607a20ad42a646c5bfd9400bd6.tar.gz
ports-8ae2d04c9e65dc607a20ad42a646c5bfd9400bd6.zip
Notes
Diffstat (limited to 'ftp/py-curl')
-rw-r--r--ftp/py-curl/Makefile6
-rw-r--r--ftp/py-curl/distinfo6
-rw-r--r--ftp/py-curl/files/patch-src-pycurl.c48
-rw-r--r--ftp/py-curl/pkg-plist6
4 files changed, 10 insertions, 56 deletions
diff --git a/ftp/py-curl/Makefile b/ftp/py-curl/Makefile
index 25a9c9735b33..88b05260815c 100644
--- a/ftp/py-curl/Makefile
+++ b/ftp/py-curl/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= curl
-PORTVERSION= 7.15.5.1
+PORTVERSION= 7.16.1
CATEGORIES= ftp python
MASTER_SITES= http://pycurl.sourceforge.net/download/ \
http://pycurl.sourceforge.net/download/00-OLD-VERSIONS/
@@ -22,8 +22,8 @@ USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_OPENSSL= yes
-DOCSDIR= ${PREFIX}/share/doc/py-curl
-EXAMPLESDIR= ${PREFIX}/share/examples/py-curl
+DOCSDIR= ${TARGETDIR}/share/doc/py-curl
+EXAMPLESDIR= ${TARGETDIR}/share/examples/py-curl
post-patch:
${REINPLACE_CMD} \
diff --git a/ftp/py-curl/distinfo b/ftp/py-curl/distinfo
index 57e2f023ad41..fc56498785a0 100644
--- a/ftp/py-curl/distinfo
+++ b/ftp/py-curl/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (pycurl-7.16.1.tar.gz) = 42f6f583a9350111c84ccc437ffb0870
+SHA256 (pycurl-7.16.1.tar.gz) = 16e010911148d9fd6cc6543a79d6caa99afa7eb8c9f28acee7d44f2d3882b585
+SIZE (pycurl-7.16.1.tar.gz) = 68194
diff --git a/ftp/py-curl/files/patch-src-pycurl.c b/ftp/py-curl/files/patch-src-pycurl.c
deleted file mode 100644
index 40d7e7825d09..000000000000
--- a/ftp/py-curl/files/patch-src-pycurl.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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:
-+#if LIBCURL_VERSION_NUM < 0x071000
- case CURLOPT_SOURCE_HOST:
- 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);
-@@ -1646,12 +1648,14 @@
- case CURLOPT_PREQUOTE:
- old_slist = &self->prequote;
- break;
-+#if LIBCURL_VERSION_NUM < 0x071000
- case CURLOPT_SOURCE_PREQUOTE:
- old_slist = &self->source_prequote;
- break;
- case CURLOPT_SOURCE_POSTQUOTE:
- old_slist = &self->source_postquote;
- break;
-+#endif
- case CURLOPT_HTTPPOST:
- break;
- default:
-@@ -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);
-+#if LIBCURL_VERSION_NUM < 0x071000
- insint_c(d, "SOURCE_USERPWD", CURLOPT_SOURCE_USERPWD);
- insint_c(d, "SOURCE_PREQUOTE", CURLOPT_SOURCE_PREQUOTE);
- insint_c(d, "SOURCE_POSTQUOTE", CURLOPT_SOURCE_POSTQUOTE);
-+#endif
- insint_c(d, "FTPSSLAUTH", CURLOPT_FTPSSLAUTH);
- insint_c(d, "IOCTLFUNCTION", CURLOPT_IOCTLFUNCTION);
- insint_c(d, "IOCTLDATA", CURLOPT_IOCTLDATA);
-+#if LIBCURL_VERSION_NUM < 0x071000
- insint_c(d, "SOURCE_URL", CURLOPT_SOURCE_URL);
- insint_c(d, "SOURCE_QUOTE", CURLOPT_SOURCE_QUOTE);
-+#endif
- insint_c(d, "FTP_ACCOUNT", CURLOPT_FTP_ACCOUNT);
- insint_c(d, "IGNORE_CONTENT_LENGTH", CURLOPT_IGNORE_CONTENT_LENGTH);
- insint_c(d, "COOKIELIST", CURLOPT_COOKIELIST);
diff --git a/ftp/py-curl/pkg-plist b/ftp/py-curl/pkg-plist
index 3c000819daf7..a5d3e259ee74 100644
--- a/ftp/py-curl/pkg-plist
+++ b/ftp/py-curl/pkg-plist
@@ -2,6 +2,7 @@
%%PYTHON_SITELIBDIR%%/curl/__init__.pyc
%%PYTHON_SITELIBDIR%%/curl/__init__.pyo
%%PYTHON_SITELIBDIR%%/pycurl.so
+@dirrm %%PYTHON_SITELIBDIR%%/curl
%%EXAMPLESDIR%%/basicfirst.py
%%EXAMPLESDIR%%/file_upload.py
%%EXAMPLESDIR%%/linksys.py
@@ -9,6 +10,7 @@
%%EXAMPLESDIR%%/retriever.py
%%EXAMPLESDIR%%/sfquery.py
%%EXAMPLESDIR%%/xmlrpc_curl.py
+@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
@@ -33,6 +35,8 @@
%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi4.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi5.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi6.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi_socket.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi_timer.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi_vs_thread.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_post.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_post2.py
@@ -41,8 +45,6 @@
%%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%%