Date: Mon, 27 Apr 2020 13:54:38 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> 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 Message-ID: <202004271354.03RDscLx002421@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004271354.03RDscLx002421>