diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2020-04-27 13:46:27 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2020-04-27 13:46:27 +0000 |
| commit | e47d5c0c1259f2a2b83ec9ea12e162bab2b904b7 (patch) | |
| tree | 68fcd238f737b83acc0d89556e41b61590ece372 /graphics/py-blockdiag | |
| parent | graphics/rawtherapee: set +e to obtain failing exit codes in self-test. (diff) | |
Move all py*diag version to newer version supporting python3
while here in blockdiag add a patch to fix backward compatibility
Reviewed by: maintainer (tota)
Differential Revision: https://reviews.freebsd.org/D24039
Notes
Notes:
svn path=/head/; revision=533138
Diffstat (limited to 'graphics/py-blockdiag')
4 files changed, 39 insertions, 14 deletions
diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile index 3c316380ec62..dd023543de60 100644 --- a/graphics/py-blockdiag/Makefile +++ b/graphics/py-blockdiag/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= blockdiag -PORTVERSION= 1.5.4 -PORTREVISION= 1 +PORTVERSION= 2.0.1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,7 +17,7 @@ RUN_DEPENDS= ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors@${PY_FLAVOR} -USES= python:2.7 +USES= python:3.5+ USE_PYTHON= autoplist distutils DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} @@ -27,18 +26,34 @@ EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} PORTDOCS= README.rst PORTEXAMPLES= * -OPTIONS_DEFINE= DOCS EXAMPLES IPAFONT PDF -IPAFONT_DESC= Use IPA Font as default -PDF_DESC= Enable PDF output - +OPTIONS_DEFINE= DOCS EXAMPLES PDF OPTIONS_DEFAULT= PDF -IPAFONT_RUN_DEPENDS= ${LOCALBASE}/share/font/ipa/ipag.otf:japanese/font-ipa +OPTIONS_RADIO= FONT +OPTIONS_RADIO_FONT= IPA MPLUSIPA VLGOTHIC + +IPA_DESC= Use IPA Font as default +MPLUSIPA_DESC= Use M-plus IPA Font as default +VLGOTHIC_DESC= Use VLGothic Font as default +PDF_DESC= Enable PDF output + +IPA_RUN_DEPENDS= ${LOCALBASE}/share/fonts/ipa/ipagp.otf:japanese/font-ipa +MPLUSIPA_RUN_DEPENDS= ${LOCALBASE}/share/fonts/mplus-ipa/fonts/ipagp.ttf:japanese/font-mplus-ipa +VLGOTHIC_RUN_DEPENDS= ${LOCALBASE}/share/fonts/vlgothic/VL-PGothic-Regular.ttf:japanese/font-vlgothic PDF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/blockdiag/utils/bootstrap.py +post-patch-IPA-on: + ${REINPLACE_CMD} '/fontfiles = \[/,/\]/{/fontfiles = \[/H;/ipagp\.otf/H;/\]/H;/\]/!d;g;}' ${WRKSRC}/src/blockdiag/utils/bootstrap.py + +post-patch-MPLUSIPA-on: + ${REINPLACE_CMD} '/fontfiles = \[/,/\]/{/fontfiles = \[/H;/ipagp\.ttf/H;/\]/H;/\]/!d;g;}' ${WRKSRC}/src/blockdiag/utils/bootstrap.py + +post-patch-VLGOTHIC-on: + ${REINPLACE_CMD} '/fontfiles = \[/,/\]/{/fontfiles = \[/H;/VL-PGothic-Regular\.ttf/H;/\]/H;/\]/!d;g;}' ${WRKSRC}/src/blockdiag/utils/bootstrap.py + post-install: ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/ @${ECHO_CMD} man/man1/${PORTNAME}.1.gz >> ${TMPPLIST} diff --git a/graphics/py-blockdiag/distinfo b/graphics/py-blockdiag/distinfo index 94071c9b2feb..a5d92e27ac23 100644 --- a/graphics/py-blockdiag/distinfo +++ b/graphics/py-blockdiag/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535344932 -SHA256 (blockdiag-1.5.4.tar.gz) = 929125db1cb59145e09dc561021389c7ca71108ef4e4c51a12728eea5b75fccc -SIZE (blockdiag-1.5.4.tar.gz) = 2693073 +TIMESTAMP = 1584005269 +SHA256 (blockdiag-2.0.1.tar.gz) = 16a69dd9f3b44c9e0869999ce82aa968586698febc86ece9ca0c902dba772397 +SIZE (blockdiag-2.0.1.tar.gz) = 2694776 diff --git a/graphics/py-blockdiag/files/patch-src-blockdiag-utils-bootstrap.py b/graphics/py-blockdiag/files/patch-src-blockdiag-utils-bootstrap.py index 672142f5b886..1a3097795e4b 100644 --- a/graphics/py-blockdiag/files/patch-src-blockdiag-utils-bootstrap.py +++ b/graphics/py-blockdiag/files/patch-src-blockdiag-utils-bootstrap.py @@ -1,6 +1,6 @@ ---- src/blockdiag/utils/bootstrap.py.orig 2014-11-21 02:20:16 UTC +--- src/blockdiag/utils/bootstrap.py.orig 2020-02-01 09:48:17 UTC +++ src/blockdiag/utils/bootstrap.py -@@ -254,11 +254,7 @@ class Options(object): +@@ -255,11 +255,7 @@ class Options(object): def detectfont(options): import glob fontdirs = [ @@ -9,7 +9,7 @@ - '/System/Library/Fonts', - 'c:/windows/fonts', - '/usr/local/share/font-*', -+ '%%LOCALBASE%%/share/font-*', ++ '/usr/local/share/fonts', ] fontfiles = [ 'ipagp.ttf', diff --git a/graphics/py-blockdiag/files/patch-src_blockdiag_noderenderer_____init____.py b/graphics/py-blockdiag/files/patch-src_blockdiag_noderenderer_____init____.py new file mode 100644 index 000000000000..a83aaadab925 --- /dev/null +++ b/graphics/py-blockdiag/files/patch-src_blockdiag_noderenderer_____init____.py @@ -0,0 +1,10 @@ +--- src/blockdiag/noderenderer/__init__.py.orig 2020-01-13 09:55:52 UTC ++++ src/blockdiag/noderenderer/__init__.py +@@ -16,6 +16,7 @@ + from __future__ import division + + import pkg_resources ++from blockdiag.noderenderer.base import NodeShape # NOQA: backward compatibility + + renderers = {} + searchpath = [] |