Date: Mon, 27 Apr 2020 13:46:27 +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: r533138 - in head/graphics: py-actdiag py-blockdiag py-blockdiag/files py-blockdiagcontrib-cisco py-nwdiag py-seqdiag Message-ID: <202004271346.03RDkRCO095994@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Apr 27 13:46:27 2020 New Revision: 533138 URL: https://svnweb.freebsd.org/changeset/ports/533138 Log: 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 Added: head/graphics/py-blockdiag/files/patch-src_blockdiag_noderenderer_____init____.py (contents, props changed) Modified: head/graphics/py-actdiag/Makefile head/graphics/py-actdiag/distinfo head/graphics/py-blockdiag/Makefile head/graphics/py-blockdiag/distinfo head/graphics/py-blockdiag/files/patch-src-blockdiag-utils-bootstrap.py head/graphics/py-blockdiagcontrib-cisco/Makefile head/graphics/py-nwdiag/Makefile head/graphics/py-nwdiag/distinfo head/graphics/py-seqdiag/Makefile head/graphics/py-seqdiag/distinfo Modified: head/graphics/py-actdiag/Makefile ============================================================================== --- head/graphics/py-actdiag/Makefile Mon Apr 27 13:45:11 2020 (r533137) +++ head/graphics/py-actdiag/Makefile Mon Apr 27 13:46:27 2020 (r533138) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= actdiag -PORTVERSION= 0.5.4 -PORTREVISION= 1 +PORTVERSION= 2.0.0 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,14 +13,9 @@ COMMENT= Simple activity-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}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} - -USES= python:2.7 +USES= python:3.5+ USE_PYTHON= autoplist distutils DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} Modified: head/graphics/py-actdiag/distinfo ============================================================================== --- head/graphics/py-actdiag/distinfo Mon Apr 27 13:45:11 2020 (r533137) +++ head/graphics/py-actdiag/distinfo Mon Apr 27 13:46:27 2020 (r533138) @@ -1,2 +1,3 @@ -SHA256 (actdiag-0.5.4.tar.gz) = 983071777d9941093aaef3be1f67c198a8ac8d2bba264cdd1f337ca415ab46af -SIZE (actdiag-0.5.4.tar.gz) = 2577258 +TIMESTAMP = 1584006716 +SHA256 (actdiag-2.0.0.tar.gz) = f0e830b3a24f0b5681b4b116f5d4c370acca800b4e8cb1c7f828e0565bdaa13c +SIZE (actdiag-2.0.0.tar.gz) = 2575076 Modified: head/graphics/py-blockdiag/Makefile ============================================================================== --- head/graphics/py-blockdiag/Makefile Mon Apr 27 13:45:11 2020 (r533137) +++ head/graphics/py-blockdiag/Makefile Mon Apr 27 13:46:27 2020 (r533138) @@ -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,17 +26,33 @@ EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX} 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/ Modified: head/graphics/py-blockdiag/distinfo ============================================================================== --- head/graphics/py-blockdiag/distinfo Mon Apr 27 13:45:11 2020 (r533137) +++ head/graphics/py-blockdiag/distinfo Mon Apr 27 13:46:27 2020 (r533138) @@ -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 Modified: head/graphics/py-blockdiag/files/patch-src-blockdiag-utils-bootstrap.py ============================================================================== --- head/graphics/py-blockdiag/files/patch-src-blockdiag-utils-bootstrap.py Mon Apr 27 13:45:11 2020 (r533137) +++ head/graphics/py-blockdiag/files/patch-src-blockdiag-utils-bootstrap.py Mon Apr 27 13:46:27 2020 (r533138) @@ -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', Added: head/graphics/py-blockdiag/files/patch-src_blockdiag_noderenderer_____init____.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/py-blockdiag/files/patch-src_blockdiag_noderenderer_____init____.py Mon Apr 27 13:46:27 2020 (r533138) @@ -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 = [] Modified: head/graphics/py-blockdiagcontrib-cisco/Makefile ============================================================================== --- head/graphics/py-blockdiagcontrib-cisco/Makefile Mon Apr 27 13:45:11 2020 (r533137) +++ head/graphics/py-blockdiagcontrib-cisco/Makefile Mon Apr 27 13:46:27 2020 (r533138) @@ -2,7 +2,7 @@ PORTNAME= blockdiagcontrib-cisco PORTVERSION= 0.1.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,12 +10,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= kuriyama@FreeBSD.org COMMENT= Networking shapes for blockdiag designed by Cisco -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-08-15 - RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blockdiag>=0.8.0:graphics/py-blockdiag@${PY_FLAVOR} -USES= python:2.7 +USES= python:3.5+ USE_PYTHON= distutils autoplist .include <bsd.port.mk> Modified: head/graphics/py-nwdiag/Makefile ============================================================================== --- head/graphics/py-nwdiag/Makefile Mon Apr 27 13:45:11 2020 (r533137) +++ head/graphics/py-nwdiag/Makefile Mon Apr 27 13:46:27 2020 (r533138) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= nwdiag -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 2.0.0 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/graphics/py-nwdiag/distinfo ============================================================================== --- head/graphics/py-nwdiag/distinfo Mon Apr 27 13:45:11 2020 (r533137) +++ head/graphics/py-nwdiag/distinfo Mon Apr 27 13:46:27 2020 (r533138) @@ -1,2 +1,3 @@ -SHA256 (nwdiag-1.0.4.tar.gz) = 002565875559789a2dfc5f578c07abdf44269c3f7cdf78d4809bdc4bdc2213fa -SIZE (nwdiag-1.0.4.tar.gz) = 2652472 +TIMESTAMP = 1584006817 +SHA256 (nwdiag-2.0.0.tar.gz) = 5cd7fafd6085cd762ca9171234d07d2a33c6e81f5c66a1b233992e76300d74e2 +SIZE (nwdiag-2.0.0.tar.gz) = 7751634 Modified: head/graphics/py-seqdiag/Makefile ============================================================================== --- head/graphics/py-seqdiag/Makefile Mon Apr 27 13:45:11 2020 (r533137) +++ head/graphics/py-seqdiag/Makefile Mon Apr 27 13:46:27 2020 (r533138) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= seqdiag -PORTVERSION= 0.9.6 -PORTREVISION= 1 +PORTVERSION= 2.0.0 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/graphics/py-seqdiag/distinfo ============================================================================== --- head/graphics/py-seqdiag/distinfo Mon Apr 27 13:45:11 2020 (r533137) +++ head/graphics/py-seqdiag/distinfo Mon Apr 27 13:46:27 2020 (r533138) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535352109 -SHA256 (seqdiag-0.9.6.tar.gz) = 78104e7644c1a4d3a5cacb68de6a7f720793f08dd78561ef0e9e80bed63702bf -SIZE (seqdiag-0.9.6.tar.gz) = 2619777 +TIMESTAMP = 1584005167 +SHA256 (seqdiag-2.0.0.tar.gz) = 93ebc7a0c6b56b6ba0d1e36863c5749f03e82c487b6d1e6f1103b4219323f24c +SIZE (seqdiag-2.0.0.tar.gz) = 2619184
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004271346.03RDkRCO095994>