diff options
| author | Peter Pentchev <roam@FreeBSD.org> | 2006-12-13 12:41:35 +0000 |
|---|---|---|
| committer | Peter Pentchev <roam@FreeBSD.org> | 2006-12-13 12:41:35 +0000 |
| commit | 64e068d25c1370f67d2f0d779ac1719f9bc5d137 (patch) | |
| tree | e8e79d2b112a29862848aa733e4b3f9387c78d2e /ftp/py-curl | |
| parent | 68ee2dd59c7dc7173d1688b825cc1c5a70f097c1 (diff) | |
| download | ports-64e068d25c1370f67d2f0d779ac1719f9bc5d137.tar.gz ports-64e068d25c1370f67d2f0d779ac1719f9bc5d137.zip | |
Notes
Diffstat (limited to 'ftp/py-curl')
| -rw-r--r-- | ftp/py-curl/Makefile | 3 | ||||
| -rw-r--r-- | ftp/py-curl/files/patch-src-pycurl.c | 48 |
2 files changed, 50 insertions, 1 deletions
diff --git a/ftp/py-curl/Makefile b/ftp/py-curl/Makefile index f97278324870..300735971501 100644 --- a/ftp/py-curl/Makefile +++ b/ftp/py-curl/Makefile @@ -7,6 +7,7 @@ PORTNAME= curl PORTVERSION= 7.15.2 +PORTREVISION= 1 CATEGORIES= ftp python MASTER_SITES= http://pycurl.sourceforge.net/download/ \ http://pycurl.sourceforge.net/download/00-OLD-VERSIONS/ @@ -16,7 +17,7 @@ DISTNAME= py${PORTNAME}-${PORTVERSION} MAINTAINER= perky@FreeBSD.org COMMENT= Python interface to libcurl -LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_PYTHON= yes USE_PYDISTUTILS= yes diff --git a/ftp/py-curl/files/patch-src-pycurl.c b/ftp/py-curl/files/patch-src-pycurl.c new file mode 100644 index 000000000000..c358c6df71e9 --- /dev/null +++ b/ftp/py-curl/files/patch-src-pycurl.c @@ -0,0 +1,48 @@ +--- 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 @@ + 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 + /* FIXME: check if more of these options allow binary data */ + str = PyString_AsString_NoNUL(obj); + if (str == NULL) +@@ -1279,12 +1281,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: +@@ -2689,14 +2693,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); |