From owner-svn-ports-all@freebsd.org Sun Aug 16 20:28:51 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 C36EE3C51D7; Sun, 16 Aug 2020 20:28:51 +0000 (UTC) (envelope-from flo@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 4BV8034n9yz3Wr8; Sun, 16 Aug 2020 20:28:51 +0000 (UTC) (envelope-from flo@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 6D2EF15A9B; Sun, 16 Aug 2020 20:28:51 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07GKSpKj052311; Sun, 16 Aug 2020 20:28:51 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07GKSpcc052310; Sun, 16 Aug 2020 20:28:51 GMT (envelope-from flo@FreeBSD.org) Message-Id: <202008162028.07GKSpcc052310@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Sun, 16 Aug 2020 20:28:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545134 - in head/www/py-cherrypy: . files X-SVN-Group: ports-head X-SVN-Commit-Author: flo X-SVN-Commit-Paths: in head/www/py-cherrypy: . files X-SVN-Commit-Revision: 545134 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: Sun, 16 Aug 2020 20:28:51 -0000 Author: flo Date: Sun Aug 16 20:28:50 2020 New Revision: 545134 URL: https://svnweb.freebsd.org/changeset/ports/545134 Log: Update to 17.4.2 The upcoming update of news/sabnzbd to 3.0.0 needs an updated cherrypy. This is not the newest release of cherrypy as that has dependencies that aren't in ports yet, but this gets us from a 2016 release to a 2019 release PR: 247597 Submitted by: James French Approved by: maintainer timeout Deleted: head/www/py-cherrypy/files/ Modified: head/www/py-cherrypy/Makefile head/www/py-cherrypy/distinfo Modified: head/www/py-cherrypy/Makefile ============================================================================== --- head/www/py-cherrypy/Makefile Sun Aug 16 20:00:25 2020 (r545133) +++ head/www/py-cherrypy/Makefile Sun Aug 16 20:28:50 2020 (r545134) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= cherrypy -PORTVERSION= 5.4.0 -PORTREVISION= 4 +PORTVERSION= 17.4.2 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,26 +13,26 @@ COMMENT= Pythonic, object-oriented web development fra LICENSE= BSD3CLAUSE -EXAMPLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} + +EXAMPLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject@${PY_FLAVOR} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cheroot>=6.2.4:www/py-cheroot@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}portend>=2.1.1:net/py-portend@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zclockfile>0:devel/py-zclockfile@${PY_FLAVOR} + OPTIONS_DEFINE= EXAMPLES PORTEXAMPLES= * -USES= python shebangfix +USES= python USE_PYTHON= distutils autoplist concurrent -SHEBANG_FILES= cherrypy/cherryd .include -# handle tutorial separately, and remove cherrypy.process from data_files -# otherwise it confuses build_py.get_outputs() and breaks PYDISTUTILS_AUTOPLIST -post-patch: - @${REINPLACE_CMD} -e '99,106d' -e '78s/"cherrypy.tutorial",//1' \ - -e '88d' -i.bak ${WRKSRC}/${PYSETUP} - .if ${PORT_OPTIONS:MEXAMPLES} post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @@ -46,20 +45,16 @@ post-install: .include -.if ${PYTHON_REL} >= 3000 # devel/py-cheetah doesn't yet build with Python 3 -.undef EXAMPLES_RUN_DEPENDS +.if ${PYTHON_REL} < 3800 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR} .endif -# The package cherrypy.wsgiserver includes both Python 2 and Python 3 modules, -# so it breaks PYDISTUTILS_AUTOPLIST. -# Instead of defining a cherrypy_build_py.get_outputs() method in setup.py -# we simply remove unwanted modules (see cherrypy_build_py() in setup.py) -post-extract: -.if ${PYTHON_REL} >= 3000 - @(cd ${WRKSRC}/cherrypy && ${RM} _cpcompat_subprocess.py && \ - cd wsgiserver && ${RM} ssl_pyopenssl.py wsgiserver2.py) +.if ${PYTHON_REL} < 3000 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}more-itertools5>0:devel/py-more-itertools5@${PY_FLAVOR} +EXAMPLES_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR} .else - @${RM} ${WRKSRC}/cherrypy/wsgiserver/wsgiserver3.py +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} +EXAMPLES_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} .endif .include Modified: head/www/py-cherrypy/distinfo ============================================================================== --- head/www/py-cherrypy/distinfo Sun Aug 16 20:00:25 2020 (r545133) +++ head/www/py-cherrypy/distinfo Sun Aug 16 20:28:50 2020 (r545134) @@ -1,3 +1,3 @@ -TIMESTAMP = 1464940005 -SHA256 (CherryPy-5.4.0.tar.gz) = bc8702099f6071ddd8b6404c110e22bb93e6a007fd9455e27f056be59a2ca801 -SIZE (CherryPy-5.4.0.tar.gz) = 435759 +TIMESTAMP = 1597378048 +SHA256 (CherryPy-17.4.2.tar.gz) = ef1619ad161f526745d4f0e4e517753d9d985814f1280e330661333d2ba05cdf +SIZE (CherryPy-17.4.2.tar.gz) = 684366