1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00

Fix merge badly solved merge conflicts

Pointy hat:	bapt
This commit is contained in:
Baptiste Daroussin 2020-04-27 13:54:38 +00:00
parent e47d5c0c12
commit 275d23d103
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=533139
2 changed files with 4 additions and 14 deletions

View File

@ -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}

View File

@ -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}