From owner-svn-ports-all@freebsd.org Mon Apr 27 13:54:39 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 07A8D2B97ED; Mon, 27 Apr 2020 13:54:39 +0000 (UTC) (envelope-from bapt@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) server-signature RSA-PSS (4096 bits) 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 499mVQ6TtGz44Xy; Mon, 27 Apr 2020 13:54:38 +0000 (UTC) (envelope-from bapt@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 D98E4B65C; Mon, 27 Apr 2020 13:54:38 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03RDscIe002422; Mon, 27 Apr 2020 13:54:38 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03RDscLx002421; Mon, 27 Apr 2020 13:54:38 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202004271354.03RDscLx002421@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 27 Apr 2020 13:54:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533139 - in head/graphics: py-nwdiag py-seqdiag X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/graphics: py-nwdiag py-seqdiag X-SVN-Commit-Revision: 533139 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.29 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: Mon, 27 Apr 2020 13:54:39 -0000 Author: bapt Date: Mon Apr 27 13:54:38 2020 New Revision: 533139 URL: https://svnweb.freebsd.org/changeset/ports/533139 Log: Fix merge badly solved merge conflicts Pointy hat: bapt Modified: head/graphics/py-nwdiag/Makefile head/graphics/py-seqdiag/Makefile Modified: head/graphics/py-nwdiag/Makefile ============================================================================== --- head/graphics/py-nwdiag/Makefile Mon Apr 27 13:46:27 2020 (r533138) +++ head/graphics/py-nwdiag/Makefile Mon Apr 27 13:54:38 2020 (r533139) @@ -13,14 +13,9 @@ COMMENT= Simple network-diagram image generator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-08-15 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} -RUN_DEPENDS= ${PY_PILLOW} \ - ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} - -USES= python:2.7 +USES= python:3.5+ USE_PYTHON= autoplist distutils DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} Modified: head/graphics/py-seqdiag/Makefile ============================================================================== --- head/graphics/py-seqdiag/Makefile Mon Apr 27 13:46:27 2020 (r533138) +++ head/graphics/py-seqdiag/Makefile Mon Apr 27 13:54:38 2020 (r533139) @@ -13,14 +13,9 @@ COMMENT= Simple sequence-diagram image generator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-08-15 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} -RUN_DEPENDS= ${PY_PILLOW} \ - ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} - -USES= python:2.7 +USES= python:3.5+ USE_PYTHON= autoplist distutils DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}