update to pycurl-7.21.5 and enable py3 support

This commit is contained in:
sthen 2016-01-06 10:49:28 +00:00
parent dfcbcb4848
commit 79bbda564b
5 changed files with 68 additions and 80 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.947 2015/12/23 13:41:10 sthen Exp $
# $OpenBSD: Makefile,v 1.948 2016/01/06 10:49:28 sthen Exp $
SUBDIR =
SUBDIR += GeoIP
@ -513,6 +513,7 @@
SUBDIR += py-ripe.atlas.tools
SUBDIR += py-boto
SUBDIR += py-curl
SUBDIR += py-curl,python3
SUBDIR += py-czmq
SUBDIR += py-dns
SUBDIR += py-dnslib

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.36 2015/08/19 20:13:59 sthen Exp $
# $OpenBSD: Makefile,v 1.37 2016/01/06 10:49:28 sthen Exp $
SHARED_ONLY= Yes
COMMENT= Python interface to cURL library
MODPY_EGG_VERSION= 7.19.0
MODPY_EGG_VERSION= 7.21.5
DISTNAME= pycurl-${MODPY_EGG_VERSION}
PKGNAME= py-curl-${MODPY_EGG_VERSION}
REVISION= 4
CATEGORIES= net
HOMEPAGE= http://pycurl.sourceforge.net/
@ -15,17 +14,33 @@ HOMEPAGE= http://pycurl.sourceforge.net/
# dual: LGPL or MIT-like
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ${MODPY_WANTLIB} crypto curl idn nghttp2 pthread ssl z
MASTER_SITES= ${HOMEPAGE}download/ \
${HOMEPAGE}download/00-OLD-VERSIONS/
MODULES= lang/python
FLAVORS= python3
FLAVOR?=
LIB_DEPENDS= net/curl
WANTLIB= crypto idn ssl z curl>=12 ${MODPY_WANTLIB} pthread
do-test: fake
@cd ${WRKSRC}/tests && ${MAKE_ENV} \
PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \
${MODPY_BIN} ./test_getinfo.py
SUBST_VARS+= MODPY_PY_PREFIX
pre-configure:
@${SUBST_CMD} ${WRKSRC}/setup.py
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples
mv ${PREFIX}/share/doc/${MODPY_PY_PREFIX}curl/examples \
${PREFIX}/share/examples/${MODPY_PY_PREFIX}curl/
# tests need more work; some need Bottle and Flaky which are not ported yet
TEST_DEPENDS= ${BUILD_PKGPATH} \
devel/py-nose${MODPY_FLAVOR}
do-test:
@cd ${WRKSRC}/tests && nosetests${MODPY_BIN_SUFFIX} -a \!standalone
@cd ${WRKSRC}/tests && nosetests${MODPY_BIN_SUFFIX} -a standalone
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (pycurl-7.19.0.tar.gz) = 63gt/MWnwCNTmgd0Yrg8Fn4XgSjun3IBZlufuxqLBkI=
SIZE (pycurl-7.19.0.tar.gz) = 71346
SHA256 (pycurl-7.21.5.tar.gz) = ih4OtVVzOIJ1odbCU0ykz8pdf6dyuZtQXAj6FJsnrtA=
SIZE (pycurl-7.21.5.tar.gz) = 170962

View File

@ -1,30 +1,12 @@
$OpenBSD: patch-setup_py,v 1.5 2009/02/01 19:49:59 wcmaier Exp $
--- setup.py.orig Tue Sep 9 19:40:34 2008
+++ setup.py Sat Jan 3 01:13:32 2009
@@ -151,20 +151,20 @@ def get_data_files():
$OpenBSD: patch-setup_py,v 1.6 2016/01/06 10:49:28 sthen Exp $
--- setup.py.orig Tue Jan 5 07:03:44 2016
+++ setup.py Wed Jan 6 10:25:54 2016
@@ -521,6 +521,8 @@ def get_data_files():
data_files = []
if sys.platform == "win32":
datadir = os.path.join("doc", PACKAGE)
+ elif sys.platform.startswith("openbsd"):
+ datadir = os.path.join("share", "doc", "${MODPY_PY_PREFIX}curl")
else:
- datadir = os.path.join("share", "doc", PACKAGE)
+ datadir = os.path.join("share")
datadir = os.path.join("share", "doc", PACKAGE)
#
- files = ["ChangeLog", "COPYING", "COPYING2", "INSTALL", "README", "TODO",]
+ files = []
if files:
- data_files.append((os.path.join(datadir), files))
+ data_files.append((os.path.join(datadir, "doc", "py-curl"), files))
files = glob.glob(os.path.join("doc", "*.html"))
if files:
- data_files.append((os.path.join(datadir, "html"), files))
+ data_files.append((os.path.join(datadir, "doc", "py-curl"), files))
files = glob.glob(os.path.join("examples", "*.py"))
if files:
- data_files.append((os.path.join(datadir, "examples"), files))
+ data_files.append((os.path.join(datadir, "examples", "py-curl"), files))
files = glob.glob(os.path.join("tests", "*.py"))
if files:
- data_files.append((os.path.join(datadir, "tests"), files))
+ data_files.append((os.path.join(datadir, "examples", "py-curl", "tests"), files))
#
assert data_files
for install_dir, files in data_files:

View File

@ -1,47 +1,37 @@
@comment $OpenBSD: PLIST,v 1.9 2009/02/05 20:50:51 wcmaier Exp $
@comment $OpenBSD: PLIST,v 1.10 2016/01/06 10:49:28 sthen Exp $
lib/python${MODPY_VERSION}/site-packages/curl/
lib/python${MODPY_VERSION}/site-packages/curl/__init__.py
lib/python${MODPY_VERSION}/site-packages/curl/__init__.pyc
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/curl/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/curl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/pycurl.so
share/doc/py-curl/
share/doc/py-curl/callbacks.html
share/doc/py-curl/curlmultiobject.html
share/doc/py-curl/curlobject.html
share/doc/py-curl/curlshareobject.html
share/doc/py-curl/pycurl.html
share/examples/py-curl/
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/tests/
share/examples/py-curl/tests/test.py
share/examples/py-curl/tests/test_cb.py
share/examples/py-curl/tests/test_debug.py
share/examples/py-curl/tests/test_ftp.py
share/examples/py-curl/tests/test_getinfo.py
share/examples/py-curl/tests/test_gtk.py
share/examples/py-curl/tests/test_internals.py
share/examples/py-curl/tests/test_memleak.py
share/examples/py-curl/tests/test_multi.py
share/examples/py-curl/tests/test_multi2.py
share/examples/py-curl/tests/test_multi3.py
share/examples/py-curl/tests/test_multi4.py
share/examples/py-curl/tests/test_multi5.py
share/examples/py-curl/tests/test_multi6.py
share/examples/py-curl/tests/test_multi_socket.py
share/examples/py-curl/tests/test_multi_socket_select.py
share/examples/py-curl/tests/test_multi_timer.py
share/examples/py-curl/tests/test_multi_vs_thread.py
share/examples/py-curl/tests/test_post.py
share/examples/py-curl/tests/test_post2.py
share/examples/py-curl/tests/test_post3.py
share/examples/py-curl/tests/test_share.py
share/examples/py-curl/tests/test_socketopen.py
share/examples/py-curl/tests/test_stringio.py
share/examples/py-curl/tests/test_xmlrpc.py
share/examples/py-curl/tests/util.py
share/examples/py-curl/xmlrpc_curl.py
share/doc/${MODPY_PY_PREFIX}curl/
share/doc/${MODPY_PY_PREFIX}curl/AUTHORS
share/doc/${MODPY_PY_PREFIX}curl/COPYING-LGPL
share/doc/${MODPY_PY_PREFIX}curl/COPYING-MIT
share/doc/${MODPY_PY_PREFIX}curl/ChangeLog
share/doc/${MODPY_PY_PREFIX}curl/INSTALL.rst
share/doc/${MODPY_PY_PREFIX}curl/README.rst
share/doc/${MODPY_PY_PREFIX}curl/RELEASE-NOTES.rst
share/examples/${MODPY_PY_PREFIX}curl/
share/examples/${MODPY_PY_PREFIX}curl/basicfirst.py
share/examples/${MODPY_PY_PREFIX}curl/file_upload.py
share/examples/${MODPY_PY_PREFIX}curl/linksys.py
share/examples/${MODPY_PY_PREFIX}curl/quickstart/
share/examples/${MODPY_PY_PREFIX}curl/quickstart/file_upload_buffer.py
share/examples/${MODPY_PY_PREFIX}curl/quickstart/file_upload_real.py
share/examples/${MODPY_PY_PREFIX}curl/quickstart/file_upload_real_fancy.py
share/examples/${MODPY_PY_PREFIX}curl/quickstart/follow_redirect.py
share/examples/${MODPY_PY_PREFIX}curl/quickstart/form_post.py
share/examples/${MODPY_PY_PREFIX}curl/quickstart/get.py
share/examples/${MODPY_PY_PREFIX}curl/quickstart/get_python2.py
share/examples/${MODPY_PY_PREFIX}curl/quickstart/get_python3.py
share/examples/${MODPY_PY_PREFIX}curl/quickstart/response_headers.py
share/examples/${MODPY_PY_PREFIX}curl/quickstart/response_info.py
share/examples/${MODPY_PY_PREFIX}curl/quickstart/write_file.py
share/examples/${MODPY_PY_PREFIX}curl/retriever-multi.py
share/examples/${MODPY_PY_PREFIX}curl/retriever.py
share/examples/${MODPY_PY_PREFIX}curl/sfquery.py
share/examples/${MODPY_PY_PREFIX}curl/smtp.py
share/examples/${MODPY_PY_PREFIX}curl/ssh_keyfunction.py
share/examples/${MODPY_PY_PREFIX}curl/xmlrpc_curl.py