summaryrefslogtreecommitdiff
path: root/www/py-curl
diff options
context:
space:
mode:
Diffstat (limited to 'www/py-curl')
-rw-r--r--www/py-curl/Makefile7
-rw-r--r--www/py-curl/PLIST78
-rw-r--r--www/py-curl/distinfo10
-rw-r--r--www/py-curl/patches/patch-aa37
4 files changed, 61 insertions, 71 deletions
diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index 25c90635a6f..571839de7da 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2013/02/06 23:24:03 jperkin Exp $
+# $NetBSD: Makefile,v 1.46 2014/01/19 09:31:33 wiz Exp $
-DISTNAME= pycurl-7.19.0
+DISTNAME= pycurl-7.19.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION= 2
CATEGORIES= www python
MASTER_SITES= http://pycurl.sourceforge.net/download/
@@ -15,6 +14,8 @@ PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
BUILDLINK_API_DEPENDS.curl+= curl>=7.19.0
+PYSETUPARGS= --with-ssl
+
.include "../../www/curl/buildlink3.mk"
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/py-curl/PLIST b/www/py-curl/PLIST
index 642703db7d8..0eaddcabba3 100644
--- a/www/py-curl/PLIST
+++ b/www/py-curl/PLIST
@@ -1,15 +1,14 @@
-@comment $NetBSD: PLIST,v 1.10 2012/04/08 20:21:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2014/01/19 09:31:33 wiz Exp $
${PYSITELIB}/curl/__init__.py
${PYSITELIB}/curl/__init__.pyc
${PYSITELIB}/curl/__init__.pyo
${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/pycurl.so
-share/doc/pycurl${PYVERSSUFFIX}/COPYING
-share/doc/pycurl${PYVERSSUFFIX}/COPYING2
+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}/README
-share/doc/pycurl${PYVERSSUFFIX}/TODO
+share/doc/pycurl${PYVERSSUFFIX}/README.rst
share/doc/pycurl${PYVERSSUFFIX}/examples/basicfirst.py
share/doc/pycurl${PYVERSSUFFIX}/examples/file_upload.py
share/doc/pycurl${PYVERSSUFFIX}/examples/linksys.py
@@ -22,29 +21,48 @@ 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}/tests/test.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_cb.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_debug.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_ftp.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_getinfo.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_gtk.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_internals.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_memleak.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi2.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi3.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi4.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi5.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi6.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi_socket.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi_socket_select.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi_timer.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi_vs_thread.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_post.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_post2.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_post3.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_share.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_socketopen.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_stringio.py
-share/doc/pycurl${PYVERSSUFFIX}/tests/test_xmlrpc.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/__init__.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/app.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/appmanager.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/certinfo_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/debug_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/default_write_function_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/easy_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/error_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/ftp_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/functools_backport.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/getinfo_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/global_init_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/header_function_test.py
+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_socket_select_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/multi_socket_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/multi_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/multi_timer_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/option_constants_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/pause_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/post_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/procmgr.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/pycurl_object_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/read_callback_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/relative_url_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/reset_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/resolve_test.py
+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/share_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/socket_open_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/unset_range_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/user_agent_string_test.py
share/doc/pycurl${PYVERSSUFFIX}/tests/util.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/version_comparison_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/version_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/write_abort_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/write_cb_bogus_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/write_to_file_test.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/write_to_stringio_test.py
diff --git a/www/py-curl/distinfo b/www/py-curl/distinfo
index 270fa1f5e07..8901e17e18a 100644
--- a/www/py-curl/distinfo
+++ b/www/py-curl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2012/01/28 13:15:10 obache Exp $
+$NetBSD: distinfo,v 1.18 2014/01/19 09:31:33 wiz Exp $
-SHA1 (pycurl-7.19.0.tar.gz) = 3fb59eca1461331bb9e9e8d6fe3b23eda961a416
-RMD160 (pycurl-7.19.0.tar.gz) = dab547b3db67ed30cafb556a1a383f567064de49
-Size (pycurl-7.19.0.tar.gz) = 71346 bytes
-SHA1 (patch-aa) = 10d4cf15ea9eae7c7fc0f587fe8b3bd2bf3852e1
+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
diff --git a/www/py-curl/patches/patch-aa b/www/py-curl/patches/patch-aa
index daa8915b3e7..445e2f0d1b3 100644
--- a/www/py-curl/patches/patch-aa
+++ b/www/py-curl/patches/patch-aa
@@ -1,39 +1,10 @@
-$NetBSD: patch-aa,v 1.8 2012/01/28 13:15:11 obache Exp $
+$NetBSD: patch-aa,v 1.9 2014/01/19 09:31:33 wiz Exp $
-* in pkgsrc, OpenSSL is used for cURL SSL support, so disable pick up of
- static-libs to detect ssl library for REQUIRE_LIB_DEPS=no platforms,
- and prevent to link with static library additionally.
* add multi python variant support
---- setup.py.orig 2008-09-09 17:40:34.000000000 +0000
+--- setup.py.orig 2014-01-10 06:04:40.000000000 +0000
+++ setup.py
-@@ -96,16 +96,10 @@ else:
- include_dirs.append(e[2:])
- else:
- extra_compile_args.append(e)
-- libs = split_quoted(
-- os.popen("'%s' --libs" % CURL_CONFIG).read()+\
-- os.popen("'%s' --static-libs" % CURL_CONFIG).read())
-+ libs = split_quoted(os.popen("'%s' --libs" % CURL_CONFIG).read())
- for e in libs:
- if e[:2] == "-l":
- libraries.append(e[2:])
-- if e[2:] == 'ssl':
-- define_macros.append(('HAVE_CURL_OPENSSL', 1))
-- if e[2:] == 'gnutls':
-- define_macros.append(('HAVE_CURL_GNUTLS', 1))
- elif e[:2] == "-L":
- library_dirs.append(e[2:])
- else:
-@@ -113,6 +107,7 @@ else:
- for e in split_quoted(os.popen("'%s' --features" % CURL_CONFIG).read()):
- if e == 'SSL':
- define_macros.append(('HAVE_CURL_SSL', 1))
-+ define_macros.append(('HAVE_CURL_OPENSSL', 1))
- if not libraries:
- libraries.append("curl")
- # Add extra compile flag for MacOS X
-@@ -149,9 +144,9 @@ def get_data_files():
+@@ -336,9 +336,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":
@@ -43,5 +14,5 @@ $NetBSD: patch-aa,v 1.8 2012/01/28 13:15:11 obache Exp $
- datadir = os.path.join("share", "doc", PACKAGE)
+ datadir = os.path.join("share", "doc", PACKAGE + sys.version[0:3])
#
- files = ["ChangeLog", "COPYING", "COPYING2", "INSTALL", "README", "TODO",]
+ files = ["ChangeLog", "COPYING-LGPL", "COPYING-MIT", "INSTALL", "README.rst"]
if files:
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-15 23:06:05 +0000