From owner-svn-ports-all@freebsd.org Wed Sep 30 07:41:15 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 46EEA3FEC73; Wed, 30 Sep 2020 07:41:15 +0000 (UTC) (envelope-from nivit@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C1Sqb1D8fz3bj5; Wed, 30 Sep 2020 07:41:15 +0000 (UTC) (envelope-from nivit@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0E7EE1C610; Wed, 30 Sep 2020 07:41:15 +0000 (UTC) (envelope-from nivit@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08U7fEuu093240; Wed, 30 Sep 2020 07:41:14 GMT (envelope-from nivit@FreeBSD.org) Received: (from nivit@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08U7fER0093237; Wed, 30 Sep 2020 07:41:14 GMT (envelope-from nivit@FreeBSD.org) Message-Id: <202009300741.08U7fER0093237@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nivit set sender to nivit@FreeBSD.org using -f From: Nicola Vitale Date: Wed, 30 Sep 2020 07:41:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550652 - in head/www/py-urlgrabber: . files X-SVN-Group: ports-head X-SVN-Commit-Author: nivit X-SVN-Commit-Paths: in head/www/py-urlgrabber: . files X-SVN-Commit-Revision: 550652 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2020 07:41:15 -0000 Author: nivit Date: Wed Sep 30 07:41:14 2020 New Revision: 550652 URL: https://svnweb.freebsd.org/changeset/ports/550652 Log: - Update to 4.0.0 - Remove dependency on Python 2.X (reported by [1]) - Use autoplist facility PR: 249799 Submitted by: swills [1] Deleted: head/www/py-urlgrabber/pkg-plist Modified: head/www/py-urlgrabber/Makefile head/www/py-urlgrabber/distinfo head/www/py-urlgrabber/files/patch-setup.py Modified: head/www/py-urlgrabber/Makefile ============================================================================== --- head/www/py-urlgrabber/Makefile Wed Sep 30 07:33:38 2020 (r550651) +++ head/www/py-urlgrabber/Makefile Wed Sep 30 07:41:14 2020 (r550652) @@ -2,8 +2,8 @@ # $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} @@ -14,8 +14,12 @@ 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} @@ -25,10 +29,9 @@ 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 Modified: head/www/py-urlgrabber/distinfo ============================================================================== --- head/www/py-urlgrabber/distinfo Wed Sep 30 07:33:38 2020 (r550651) +++ head/www/py-urlgrabber/distinfo Wed Sep 30 07:41:14 2020 (r550652) @@ -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 Modified: head/www/py-urlgrabber/files/patch-setup.py ============================================================================== --- head/www/py-urlgrabber/files/patch-setup.py Wed Sep 30 07:33:38 2020 (r550651) +++ head/www/py-urlgrabber/files/patch-setup.py Wed Sep 30 07:41:14 2020 (r550652) @@ -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 } }