Index: head/www/py-urlgrabber/pkg-plist
===================================================================
--- head/www/py-urlgrabber/pkg-plist	(revision 550651)
+++ head/www/py-urlgrabber/pkg-plist	(nonexistent)
@@ -1,20 +0,0 @@
-bin/urlgrabber
-%%PYTHON_SITELIBDIR%%/urlgrabber/__init__.py
-%%PYTHON_SITELIBDIR%%/urlgrabber/__init__.pyc
-%%PYTHON_SITELIBDIR%%/urlgrabber/__init__.pyo
-%%PYTHON_SITELIBDIR%%/urlgrabber/byterange.py
-%%PYTHON_SITELIBDIR%%/urlgrabber/byterange.pyc
-%%PYTHON_SITELIBDIR%%/urlgrabber/byterange.pyo
-%%PYTHON_SITELIBDIR%%/urlgrabber/grabber.py
-%%PYTHON_SITELIBDIR%%/urlgrabber/grabber.pyc
-%%PYTHON_SITELIBDIR%%/urlgrabber/grabber.pyo
-%%PYTHON_SITELIBDIR%%/urlgrabber/mirror.py
-%%PYTHON_SITELIBDIR%%/urlgrabber/mirror.pyc
-%%PYTHON_SITELIBDIR%%/urlgrabber/mirror.pyo
-%%PYTHON_SITELIBDIR%%/urlgrabber/progress.py
-%%PYTHON_SITELIBDIR%%/urlgrabber/progress.pyc
-%%PYTHON_SITELIBDIR%%/urlgrabber/progress.pyo
-libexec/urlgrabber-ext-down
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO

Property changes on: head/www/py-urlgrabber/pkg-plist
___________________________________________________________________
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/Makefile
===================================================================
--- head/www/py-urlgrabber/Makefile	(revision 550651)
+++ head/www/py-urlgrabber/Makefile	(revision 550652)
@@ -1,34 +1,37 @@
 # Created by: Nicola Vitale <nivit@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	urlgrabber
-PORTVERSION=	3.10.2
-PORTREVISION=	1
+PORTVERSION=	4.0.0
+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
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.0_1:ftp/py-pycurl@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.0_1:ftp/py-pycurl@${PY_FLAVOR}
 
+USES=		python shebangfix
+
 DOCS_MAKE_ENV=	INSTALL_DOCS=yes
 DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 REINPLACE_ARGS=	-i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},'
 
 SHEBANG_FILES=	scripts/urlgrabber-ext-down
 
-USES=		python:2.7 shebangfix
-USE_PYTHON=	distutils
+USE_PYTHON=	autoplist distutils
 
 post-patch:
-	@${REINPLACE_CMD} ${WRKSRC}/${PYSETUP}
+	@${REINPLACE_CMD} ${REINPLACE_ARGS} ${WRKSRC}/${PYSETUP}
 
 .include <bsd.port.mk>
Index: head/www/py-urlgrabber/distinfo
===================================================================
--- head/www/py-urlgrabber/distinfo	(revision 550651)
+++ head/www/py-urlgrabber/distinfo	(revision 550652)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500803698
-SHA256 (urlgrabber-3.10.2.tar.gz) = 53691185e3d462bb0fa8db853a205ee79cdd4089687cddd22cabb8b3d4280142
-SIZE (urlgrabber-3.10.2.tar.gz) = 84700
+TIMESTAMP = 1601416704
+SHA256 (urlgrabber-4.0.0.tar.gz) = d152d10c7decce45ce5b44f8ee8ee5fd0047217f4152eebb8e0c552ca5137af0
+SIZE (urlgrabber-4.0.0.tar.gz) = 86308
Index: head/www/py-urlgrabber/files/patch-setup.py
===================================================================
--- head/www/py-urlgrabber/files/patch-setup.py	(revision 550651)
+++ head/www/py-urlgrabber/files/patch-setup.py	(revision 550652)
@@ -1,20 +1,22 @@
---- setup.py.orig	2017-07-23 09:57:14 UTC
+--- setup.py.orig	2019-02-25 13:49:04 UTC
 +++ setup.py
-@@ -32,7 +32,6 @@ packages = ['urlgrabber']
+@@ -1,4 +1,5 @@
+ # urlgrabber distutils setup
++import os
+ import re as _re
+ import sys as _sys
+ 
+@@ -32,9 +33,12 @@ packages = ['urlgrabber']
  package_dir = {'urlgrabber':'urlgrabber'}
  scripts = ['scripts/urlgrabber']
  data_files = [
 -    ('share/doc/' + name + '-' + version, ['README','LICENSE', 'TODO', 'ChangeLog']),
      ('libexec', ['scripts/urlgrabber-ext-down']),
  ]
- options = { 'clean' : { 'all' : 1 } }
-@@ -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'):
++if (sys.version_info.major == 2 and os.environ.has_key('INSTALL_DOCS')) or \
++        (sys.version_info.major == 3 and os.environ.get('INSTALL_DOCS')):
 +    data_files.append(('%%DOCSDIR%%', ['README', 'TODO', 'ChangeLog']))
 +
-   from distutils.core import setup
-   setup(**config)
+ setup_requires = ['six']
+ install_requires = ['pycurl', 'six']
+ options = { 'clean' : { 'all' : 1 } }