Index: head/www/py-urlgrabber/Makefile =================================================================== --- head/www/py-urlgrabber/Makefile (revision 446463) +++ head/www/py-urlgrabber/Makefile (revision 446464) @@ -1,33 +1,32 @@ # Created by: Nicola Vitale # $FreeBSD$ PORTNAME= urlgrabber -PORTVERSION= 3.9.1 -PORTREVISION= 4 +PORTVERSION= 3.10.2 +PORTREVISION= 0 CATEGORIES= www python MASTER_SITES= http://urlgrabber.baseurl.org/download/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= nivit@FreeBSD.org COMMENT= High-level cross-protocol url-grabber LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PKGNAMEPREFIX}pycurl>=7.19.0_1:ftp/py-pycurl -RUN_DEPENDS= ${PKGNAMEPREFIX}pycurl>=7.19.0_1:ftp/py-pycurl +DOCS_MAKE_ENV= INSTALL_DOCS=yes +DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME} -USES= python:2.7 -USE_PYTHON= distutils +OPTIONS_DEFINE= DOCS REINPLACE_ARGS= -i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},' -DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME} -OPTIONS_DEFINE= DOCS +SHEBANG_FILES= scripts/urlgrabber-ext-down -DOCS_MAKE_ENV= INSTALL_DOCS=yes +USES= python:2.7 shebangfix +USE_PYTHON= distutils post-patch: @${REINPLACE_CMD} ${WRKSRC}/${PYSETUP} .include Index: head/www/py-urlgrabber/distinfo =================================================================== --- head/www/py-urlgrabber/distinfo (revision 446463) +++ head/www/py-urlgrabber/distinfo (revision 446464) @@ -1,2 +1,3 @@ -SHA256 (urlgrabber-3.9.1.tar.gz) = 4437076c8708e5754ea04540e46c7f4f233734ee3590bb8a96389264fb0650d0 -SIZE (urlgrabber-3.9.1.tar.gz) = 72343 +TIMESTAMP = 1500803698 +SHA256 (urlgrabber-3.10.2.tar.gz) = 53691185e3d462bb0fa8db853a205ee79cdd4089687cddd22cabb8b3d4280142 +SIZE (urlgrabber-3.10.2.tar.gz) = 84700 Index: head/www/py-urlgrabber/files/patch-urlgrabber__grabber.py =================================================================== --- head/www/py-urlgrabber/files/patch-urlgrabber__grabber.py (revision 446463) +++ head/www/py-urlgrabber/files/patch-urlgrabber__grabber.py (nonexistent) @@ -1,54 +0,0 @@ ---- ./urlgrabber/grabber.py.orig 2009-09-25 18:19:50.000000000 +0200 -+++ ./urlgrabber/grabber.py 2013-08-15 17:18:28.000000000 +0200 -@@ -1052,7 +1052,7 @@ - self._reget_length = 0 - self._prog_running = False - self._error = (None, None) -- self.size = None -+ self.size = 0 - self._do_open() - - -@@ -1127,6 +1127,9 @@ - if not opts: - opts = self.opts - -+ # keepalives -+ if not opts.keepalive: -+ self.curl_obj.setopt(pycurl.FORBID_REUSE, 1) - - # defaults we're always going to set - self.curl_obj.setopt(pycurl.NOPROGRESS, False) -@@ -1158,7 +1161,8 @@ - self.curl_obj.setopt(pycurl.CAPATH, opts.ssl_ca_cert) - self.curl_obj.setopt(pycurl.CAINFO, opts.ssl_ca_cert) - self.curl_obj.setopt(pycurl.SSL_VERIFYPEER, opts.ssl_verify_peer) -- self.curl_obj.setopt(pycurl.SSL_VERIFYHOST, opts.ssl_verify_host) -+ if opts.ssl_verify_host: # 1 is meaningless to curl -+ self.curl_obj.setopt(pycurl.SSL_VERIFYHOST, 2) - if opts.ssl_key: - self.curl_obj.setopt(pycurl.SSLKEY, opts.ssl_key) - if opts.ssl_key_type: -@@ -1299,6 +1303,12 @@ - err.code = code - err.exception = e - raise err -+ else: -+ if self._error[1]: -+ msg = self._error[1] -+ err = URLGRabError(14, msg) -+ err.url = self.url -+ raise err - - def _do_open(self): - self.curl_obj = _curl_cache -@@ -1536,7 +1546,8 @@ - if self.opts.size: # if we set an opts size use that, no matter what - max_size = self.opts.size - if not max_size: return False # if we have None for all of the Max then this is dumb -- if cur > max_size + max_size*.10: -+ -+ if cur > int(float(max_size) * 1.10): - - msg = _("Downloaded more than max size for %s: %s > %s") \ - % (self.url, cur, max_size) Property changes on: head/www/py-urlgrabber/files/patch-urlgrabber__grabber.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/py-urlgrabber/files/patch-setup.py =================================================================== --- head/www/py-urlgrabber/files/patch-setup.py (revision 446463) +++ head/www/py-urlgrabber/files/patch-setup.py (revision 446464) @@ -1,26 +1,20 @@ ---- setup.py 2005-03-08 23:53:20.000000000 +0100 -+++ setup.py.port 2008-07-03 17:30:05.000000000 +0200 -@@ -1,3 +1,4 @@ -+ - # urlgrabber distutils setup - import re as _re - import urlgrabber as _urlgrabber -@@ -15,8 +16,6 @@ - packages = ['urlgrabber'] +--- setup.py.orig 2017-07-23 09:57:14 UTC ++++ setup.py +@@ -32,7 +32,6 @@ packages = ['urlgrabber'] package_dir = {'urlgrabber':'urlgrabber'} scripts = ['scripts/urlgrabber'] --data_files = [('share/doc/' + name + '-' + version, -- ['README','LICENSE', 'TODO', 'ChangeLog'])] + data_files = [ +- ('share/doc/' + name + '-' + version, ['README','LICENSE', 'TODO', 'ChangeLog']), + ('libexec', ['scripts/urlgrabber-ext-down']), + ] options = { 'clean' : { 'all' : 1 } } - classifiers = [ - 'Development Status :: 4 - Beta', -@@ -41,5 +40,9 @@ +@@ -59,5 +58,9 @@ if __name__ == '__main__': #print '%-20s -> %s' % (k, config[k]) if k.startswith('_'): del config[k] + import os + if os.environ.has_key('INSTALL_DOCS'): -+ config.setdefault('data_files', [('%%DOCSDIR%%', ['README','LICENSE', 'TODO', 'ChangeLog'])]) ++ data_files.append(('%%DOCSDIR%%', ['README', 'TODO', 'ChangeLog'])) + from distutils.core import setup setup(**config) Index: head/www/py-urlgrabber/pkg-plist =================================================================== --- head/www/py-urlgrabber/pkg-plist (revision 446463) +++ head/www/py-urlgrabber/pkg-plist (revision 446464) @@ -1,20 +1,20 @@ bin/urlgrabber %%PYTHON_SITELIBDIR%%/urlgrabber/__init__.py %%PYTHON_SITELIBDIR%%/urlgrabber/__init__.pyc -%%PYTHON_SITELIBDIR%%/urlgrabber/__init__.pyo +%%PYTHON_SITELIBDIR%%/urlgrabber/__init__.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/urlgrabber/byterange.py %%PYTHON_SITELIBDIR%%/urlgrabber/byterange.pyc -%%PYTHON_SITELIBDIR%%/urlgrabber/byterange.pyo +%%PYTHON_SITELIBDIR%%/urlgrabber/byterange.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/urlgrabber/grabber.py %%PYTHON_SITELIBDIR%%/urlgrabber/grabber.pyc -%%PYTHON_SITELIBDIR%%/urlgrabber/grabber.pyo +%%PYTHON_SITELIBDIR%%/urlgrabber/grabber.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/urlgrabber/mirror.py %%PYTHON_SITELIBDIR%%/urlgrabber/mirror.pyc -%%PYTHON_SITELIBDIR%%/urlgrabber/mirror.pyo +%%PYTHON_SITELIBDIR%%/urlgrabber/mirror.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/urlgrabber/progress.py %%PYTHON_SITELIBDIR%%/urlgrabber/progress.pyc -%%PYTHON_SITELIBDIR%%/urlgrabber/progress.pyo +%%PYTHON_SITELIBDIR%%/urlgrabber/progress.%%PYTHON_PYOEXTENSION%% +libexec/urlgrabber-ext-down %%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO