From owner-svn-ports-all@freebsd.org Tue Jul 31 12:49:09 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 960341059664; Tue, 31 Jul 2018 12:49:09 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B49E897B2; Tue, 31 Jul 2018 12:49:09 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from [127.0.0.1] (unknown [127.0.1.132]) by freefall.freebsd.org (Postfix) with ESMTP id 32B5911061; Tue, 31 Jul 2018 12:49:08 +0000 (UTC) (envelope-from rm@FreeBSD.org) Subject: Re: svn commit: r475996 - branches/2018Q3/www/py-notebook To: Po-Chuan Hsieh , Ruslan Mahmatkhanov Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org References: <201807311239.w6VCd73n070432@repo.freebsd.org> From: Ruslan Makhmatkhanov Message-ID: <0d82ce84-ee61-bdd3-233c-7a24264b3927@FreeBSD.org> Date: Tue, 31 Jul 2018 15:46:35 +0300 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 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: Tue, 31 Jul 2018 12:49:09 -0000 Too bad. What I supposed to do now? Merge 5.6.0 there or revert this two mfced commits? Po-Chuan Hsieh wrote on 7/31/18 3:45 PM: > On Tue, Jul 31, 2018 at 8:39 PM Ruslan Makhmatkhanov wrote: > >> Author: rm >> Date: Tue Jul 31 12:39:07 2018 >> New Revision: 475996 >> URL: https://svnweb.freebsd.org/changeset/ports/475996 >> >> Log: >> MFH: r475992 r475993 >> >> www/py-notebook: add missing dependencies >> >> Fix runtime by adding missing dependencies: prometheus-client is >> required for >> all versions and ipaddress is required for python 2.7. Bump PORTREVISION >> to >> chase a dependency change. >> >> With hat: python >> >> www/py-notebook: correct typo >> >> Approved by: portmgr (miwi) >> >> Modified: >> branches/2018Q3/www/py-notebook/Makefile >> Directory Properties: >> branches/2018Q3/ (props changed) >> >> Modified: branches/2018Q3/www/py-notebook/Makefile >> >> ============================================================================== >> --- branches/2018Q3/www/py-notebook/Makefile Tue Jul 31 12:32:45 2018 >> (r475995) >> +++ branches/2018Q3/www/py-notebook/Makefile Tue Jul 31 12:39:07 2018 >> (r475996) >> @@ -2,6 +2,7 @@ >> >> PORTNAME= notebook >> PORTVERSION= 5.5.0 >> > > Hello, > > The newly-added dependencies are for notebook 5.6.0, not 5.5.0. > > Regards, > sunpoet > > +PORTREVISION= 1 >> CATEGORIES= www python >> MASTER_SITES= CHEESESHOP >> PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} >> @@ -23,10 +24,17 @@ RUN_DEPENDS= >> ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py >> >> ${PYTHON_PKGNAMEPREFIX}send2trash>=0:deskutils/py-send2trash@${PY_FLAVOR} >> \ >> ${PYTHON_PKGNAMEPREFIX}terminado>=0.8.1:net/py-terminado@${PY_FLAVOR} >> \ >> ${PYTHON_PKGNAMEPREFIX}tornado>=4:www/py-tornado@${PY_FLAVOR} >> \ >> - ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2.1:devel/py-traitlets@ >> ${PY_FLAVOR} >> + ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2.1:devel/py-traitlets@${PY_FLAVOR} >> \ >> + >> ${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@ >> ${PY_FLAVOR} >> >> NO_ARCH= yes >> USES= python >> USE_PYTHON= autoplist concurrent distutils >> >> -.include >> +.include >> + >> +.if ${PYTHON_REL} < 3000 >> +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress@ >> ${PY_FLAVOR} >> +.endif >> + >> +.include -- Regards, Ruslan T.O.S. Of Reality