Thu Feb 20 06:29:49 2020 UTC ()
py-nwdiag: updated to 2.0.0

2.0.0:
Drop python2 and python3.4 support
Fix a bug: Crash in antialias mode


(adam)
diff -r1.13 -r1.14 pkgsrc/graphics/py-nwdiag/Makefile
diff -r1.9 -r1.10 pkgsrc/graphics/py-nwdiag/PLIST
diff -r1.10 -r1.11 pkgsrc/graphics/py-nwdiag/distinfo
cvs diff -r1.13 -r1.14 pkgsrc/graphics/py-nwdiag/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/py-nwdiag/Makefile 2017/09/04 18:00:55 1.13
+++ pkgsrc/graphics/py-nwdiag/Makefile 2020/02/20 06:29:49 1.14
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: Makefile,v 1.13 2017/09/04 18:00:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.14 2020/02/20 06:29:49 adam Exp $
2# 
3 2
4DISTNAME= nwdiag-1.0.4 3DISTNAME= nwdiag-2.0.0
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
6CATEGORIES= graphics 5CATEGORIES= graphics python
7MASTER_SITES= ${MASTER_SITE_PYPI:=n/nwdiag/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=n/nwdiag/}
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10#HOMEPAGE= http://blockdiag.com/nwdiag/build/html/ 9#HOMEPAGE= http://blockdiag.com/
11COMMENT= Simple network-diagram image generator 10COMMENT= Simple network-diagram image generator
12LICENSE= apache-2.0 11LICENSE= apache-2.0
13 12
14DEPENDS+= ${PYPKGPREFIX}-blockdiag>=1.5.0:../../graphics/py-blockdiag 13DEPENDS+= ${PYPKGPREFIX}-blockdiag>=1.5.0:../../graphics/py-blockdiag
15 14
16USE_LANGUAGES= # none 15USE_LANGUAGES= # none
17 16
18INSTALLATION_DIRS+= ${PKGMANDIR}/man1 17INSTALLATION_DIRS+= ${PKGMANDIR}/man1
19 18
20post-install: 19post-install:
21 ${INSTALL_MAN} ${WRKSRC}/nwdiag.1 \ 20.for bin in nwdiag packetdiag rackdiag
22 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 21 cd ${DESTDIR}${PREFIX}/bin && \
23 ${INSTALL_MAN} ${WRKSRC}/rackdiag.1 \ 22 ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
24 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 23 ${INSTALL_MAN} ${WRKSRC}/${bin}.1 \
 24 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${bin}-${PYVERSSUFFIX}.1
 25.endfor
25 26
26.include "../../lang/python/egg.mk" 27.include "../../lang/python/egg.mk"
27.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/graphics/py-nwdiag/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/py-nwdiag/PLIST 2015/01/20 10:50:03 1.9
+++ pkgsrc/graphics/py-nwdiag/PLIST 2020/02/20 06:29:49 1.10
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1@comment $NetBSD: PLIST,v 1.9 2015/01/20 10:50:03 obache Exp $ 1@comment $NetBSD: PLIST,v 1.10 2020/02/20 06:29:49 adam Exp $
2bin/nwdiag 2bin/nwdiag-${PYVERSSUFFIX}
3bin/packetdiag 3bin/packetdiag-${PYVERSSUFFIX}
4bin/rackdiag 4bin/rackdiag-${PYVERSSUFFIX}
5${PYSITELIB}/${EGG_INFODIR}/PKG-INFO 5${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
6${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt 6${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
7${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt 7${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
8${PYSITELIB}/${EGG_INFODIR}/entry_points.txt 8${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
9${PYSITELIB}/${EGG_INFODIR}/requires.txt 9${PYSITELIB}/${EGG_INFODIR}/requires.txt
10${PYSITELIB}/${EGG_INFODIR}/top_level.txt 10${PYSITELIB}/${EGG_INFODIR}/top_level.txt
11${PYSITELIB}/nwdiag/__init__.py 11${PYSITELIB}/nwdiag/__init__.py
12${PYSITELIB}/nwdiag/__init__.pyc 12${PYSITELIB}/nwdiag/__init__.pyc
13${PYSITELIB}/nwdiag/__init__.pyo 13${PYSITELIB}/nwdiag/__init__.pyo
14${PYSITELIB}/nwdiag/builder.py 14${PYSITELIB}/nwdiag/builder.py
15${PYSITELIB}/nwdiag/builder.pyc 15${PYSITELIB}/nwdiag/builder.pyc
16${PYSITELIB}/nwdiag/builder.pyo 16${PYSITELIB}/nwdiag/builder.pyo
17${PYSITELIB}/nwdiag/command.py 17${PYSITELIB}/nwdiag/command.py
@@ -58,29 +58,26 @@ ${PYSITELIB}/nwdiag/tests/diagrams/peer_ @@ -58,29 +58,26 @@ ${PYSITELIB}/nwdiag/tests/diagrams/peer_
58${PYSITELIB}/nwdiag/tests/diagrams/peer_network4.diag 58${PYSITELIB}/nwdiag/tests/diagrams/peer_network4.diag
59${PYSITELIB}/nwdiag/tests/diagrams/peer_network5.diag 59${PYSITELIB}/nwdiag/tests/diagrams/peer_network5.diag
60${PYSITELIB}/nwdiag/tests/diagrams/peer_network_branched.diag 60${PYSITELIB}/nwdiag/tests/diagrams/peer_network_branched.diag
61${PYSITELIB}/nwdiag/tests/diagrams/same_peer_network.diag 61${PYSITELIB}/nwdiag/tests/diagrams/same_peer_network.diag
62${PYSITELIB}/nwdiag/tests/diagrams/single_network.diag 62${PYSITELIB}/nwdiag/tests/diagrams/single_network.diag
63${PYSITELIB}/nwdiag/tests/diagrams/split_group.diag 63${PYSITELIB}/nwdiag/tests/diagrams/split_group.diag
64${PYSITELIB}/nwdiag/tests/diagrams/two_networks.diag 64${PYSITELIB}/nwdiag/tests/diagrams/two_networks.diag
65${PYSITELIB}/nwdiag/tests/test_builder.py 65${PYSITELIB}/nwdiag/tests/test_builder.py
66${PYSITELIB}/nwdiag/tests/test_builder.pyc 66${PYSITELIB}/nwdiag/tests/test_builder.pyc
67${PYSITELIB}/nwdiag/tests/test_builder.pyo 67${PYSITELIB}/nwdiag/tests/test_builder.pyo
68${PYSITELIB}/nwdiag/tests/test_generate_diagram.py 68${PYSITELIB}/nwdiag/tests/test_generate_diagram.py
69${PYSITELIB}/nwdiag/tests/test_generate_diagram.pyc 69${PYSITELIB}/nwdiag/tests/test_generate_diagram.pyc
70${PYSITELIB}/nwdiag/tests/test_generate_diagram.pyo 70${PYSITELIB}/nwdiag/tests/test_generate_diagram.pyo
71${PYSITELIB}/nwdiag/tests/test_pep8.py 
72${PYSITELIB}/nwdiag/tests/test_pep8.pyc 
73${PYSITELIB}/nwdiag/tests/test_pep8.pyo 
74${PYSITELIB}/nwdiag/tests/test_rst_directives.py 71${PYSITELIB}/nwdiag/tests/test_rst_directives.py
75${PYSITELIB}/nwdiag/tests/test_rst_directives.pyc 72${PYSITELIB}/nwdiag/tests/test_rst_directives.pyc
76${PYSITELIB}/nwdiag/tests/test_rst_directives.pyo 73${PYSITELIB}/nwdiag/tests/test_rst_directives.pyo
77${PYSITELIB}/nwdiag/tests/utils.py 74${PYSITELIB}/nwdiag/tests/utils.py
78${PYSITELIB}/nwdiag/tests/utils.pyc 75${PYSITELIB}/nwdiag/tests/utils.pyc
79${PYSITELIB}/nwdiag/tests/utils.pyo 76${PYSITELIB}/nwdiag/tests/utils.pyo
80${PYSITELIB}/nwdiag/utils/__init__.py 77${PYSITELIB}/nwdiag/utils/__init__.py
81${PYSITELIB}/nwdiag/utils/__init__.pyc 78${PYSITELIB}/nwdiag/utils/__init__.pyc
82${PYSITELIB}/nwdiag/utils/__init__.pyo 79${PYSITELIB}/nwdiag/utils/__init__.pyo
83${PYSITELIB}/nwdiag/utils/rst/__init__.py 80${PYSITELIB}/nwdiag/utils/rst/__init__.py
84${PYSITELIB}/nwdiag/utils/rst/__init__.pyc 81${PYSITELIB}/nwdiag/utils/rst/__init__.pyc
85${PYSITELIB}/nwdiag/utils/rst/__init__.pyo 82${PYSITELIB}/nwdiag/utils/rst/__init__.pyo
86${PYSITELIB}/nwdiag/utils/rst/directives.py 83${PYSITELIB}/nwdiag/utils/rst/directives.py
@@ -117,29 +114,26 @@ ${PYSITELIB}/packetdiag/parser.py @@ -117,29 +114,26 @@ ${PYSITELIB}/packetdiag/parser.py
117${PYSITELIB}/packetdiag/parser.pyc 114${PYSITELIB}/packetdiag/parser.pyc
118${PYSITELIB}/packetdiag/parser.pyo 115${PYSITELIB}/packetdiag/parser.pyo
119${PYSITELIB}/packetdiag/tests/VLGothic/VL-Gothic-Regular.ttf 116${PYSITELIB}/packetdiag/tests/VLGothic/VL-Gothic-Regular.ttf
120${PYSITELIB}/packetdiag/tests/diagrams/oneliner.diag 117${PYSITELIB}/packetdiag/tests/diagrams/oneliner.diag
121${PYSITELIB}/packetdiag/tests/diagrams/oneliner_with_quoted.diag 118${PYSITELIB}/packetdiag/tests/diagrams/oneliner_with_quoted.diag
122${PYSITELIB}/packetdiag/tests/diagrams/oneliner_without_last_semicolon.diag 119${PYSITELIB}/packetdiag/tests/diagrams/oneliner_without_last_semicolon.diag
123${PYSITELIB}/packetdiag/tests/diagrams/scale_direction.diag 120${PYSITELIB}/packetdiag/tests/diagrams/scale_direction.diag
124${PYSITELIB}/packetdiag/tests/diagrams/scale_interval.diag 121${PYSITELIB}/packetdiag/tests/diagrams/scale_interval.diag
125${PYSITELIB}/packetdiag/tests/diagrams/tcp.diag 122${PYSITELIB}/packetdiag/tests/diagrams/tcp.diag
126${PYSITELIB}/packetdiag/tests/diagrams/tcp_2.diag 123${PYSITELIB}/packetdiag/tests/diagrams/tcp_2.diag
127${PYSITELIB}/packetdiag/tests/test_generate_diagram.py 124${PYSITELIB}/packetdiag/tests/test_generate_diagram.py
128${PYSITELIB}/packetdiag/tests/test_generate_diagram.pyc 125${PYSITELIB}/packetdiag/tests/test_generate_diagram.pyc
129${PYSITELIB}/packetdiag/tests/test_generate_diagram.pyo 126${PYSITELIB}/packetdiag/tests/test_generate_diagram.pyo
130${PYSITELIB}/packetdiag/tests/test_pep8.py 
131${PYSITELIB}/packetdiag/tests/test_pep8.pyc 
132${PYSITELIB}/packetdiag/tests/test_pep8.pyo 
133${PYSITELIB}/packetdiag/tests/test_rst_directives.py 127${PYSITELIB}/packetdiag/tests/test_rst_directives.py
134${PYSITELIB}/packetdiag/tests/test_rst_directives.pyc 128${PYSITELIB}/packetdiag/tests/test_rst_directives.pyc
135${PYSITELIB}/packetdiag/tests/test_rst_directives.pyo 129${PYSITELIB}/packetdiag/tests/test_rst_directives.pyo
136${PYSITELIB}/packetdiag/utils/__init__.py 130${PYSITELIB}/packetdiag/utils/__init__.py
137${PYSITELIB}/packetdiag/utils/__init__.pyc 131${PYSITELIB}/packetdiag/utils/__init__.pyc
138${PYSITELIB}/packetdiag/utils/__init__.pyo 132${PYSITELIB}/packetdiag/utils/__init__.pyo
139${PYSITELIB}/packetdiag/utils/rst/__init__.py 133${PYSITELIB}/packetdiag/utils/rst/__init__.py
140${PYSITELIB}/packetdiag/utils/rst/__init__.pyc 134${PYSITELIB}/packetdiag/utils/rst/__init__.pyc
141${PYSITELIB}/packetdiag/utils/rst/__init__.pyo 135${PYSITELIB}/packetdiag/utils/rst/__init__.pyo
142${PYSITELIB}/packetdiag/utils/rst/directives.py 136${PYSITELIB}/packetdiag/utils/rst/directives.py
143${PYSITELIB}/packetdiag/utils/rst/directives.pyc 137${PYSITELIB}/packetdiag/utils/rst/directives.pyc
144${PYSITELIB}/packetdiag/utils/rst/directives.pyo 138${PYSITELIB}/packetdiag/utils/rst/directives.pyo
145${PYSITELIB}/packetdiag/utils/rst/nodes.py 139${PYSITELIB}/packetdiag/utils/rst/nodes.py
@@ -160,55 +154,52 @@ ${PYSITELIB}/rackdiag/command.pyo @@ -160,55 +154,52 @@ ${PYSITELIB}/rackdiag/command.pyo
160${PYSITELIB}/rackdiag/drawer.py 154${PYSITELIB}/rackdiag/drawer.py
161${PYSITELIB}/rackdiag/drawer.pyc 155${PYSITELIB}/rackdiag/drawer.pyc
162${PYSITELIB}/rackdiag/drawer.pyo 156${PYSITELIB}/rackdiag/drawer.pyo
163${PYSITELIB}/rackdiag/elements.py 157${PYSITELIB}/rackdiag/elements.py
164${PYSITELIB}/rackdiag/elements.pyc 158${PYSITELIB}/rackdiag/elements.pyc
165${PYSITELIB}/rackdiag/elements.pyo 159${PYSITELIB}/rackdiag/elements.pyo
166${PYSITELIB}/rackdiag/metrics.py 160${PYSITELIB}/rackdiag/metrics.py
167${PYSITELIB}/rackdiag/metrics.pyc 161${PYSITELIB}/rackdiag/metrics.pyc
168${PYSITELIB}/rackdiag/metrics.pyo 162${PYSITELIB}/rackdiag/metrics.pyo
169${PYSITELIB}/rackdiag/parser.py 163${PYSITELIB}/rackdiag/parser.py
170${PYSITELIB}/rackdiag/parser.pyc 164${PYSITELIB}/rackdiag/parser.pyc
171${PYSITELIB}/rackdiag/parser.pyo 165${PYSITELIB}/rackdiag/parser.pyo
172${PYSITELIB}/rackdiag/tests/VLGothic/VL-Gothic-Regular.ttf 166${PYSITELIB}/rackdiag/tests/VLGothic/VL-Gothic-Regular.ttf
173${PYSITELIB}/rackdiag/tests/diagrams/ascending.diag 
174${PYSITELIB}/rackdiag/tests/diagrams/autonumber.diag 167${PYSITELIB}/rackdiag/tests/diagrams/autonumber.diag
175${PYSITELIB}/rackdiag/tests/diagrams/multi_rackitem.diag 168${PYSITELIB}/rackdiag/tests/diagrams/multi_rackitem.diag
176${PYSITELIB}/rackdiag/tests/diagrams/multi_racks.diag 169${PYSITELIB}/rackdiag/tests/diagrams/multi_racks.diag
177${PYSITELIB}/rackdiag/tests/diagrams/oneliner.diag 170${PYSITELIB}/rackdiag/tests/diagrams/oneliner.diag
178${PYSITELIB}/rackdiag/tests/diagrams/oneliner_with_quoted.diag 171${PYSITELIB}/rackdiag/tests/diagrams/oneliner_with_quoted.diag
179${PYSITELIB}/rackdiag/tests/diagrams/oneliner_without_last_semicolon.diag 172${PYSITELIB}/rackdiag/tests/diagrams/oneliner_without_last_semicolon.diag
180${PYSITELIB}/rackdiag/tests/diagrams/rack_height.diag 173${PYSITELIB}/rackdiag/tests/diagrams/rack_height.diag
181${PYSITELIB}/rackdiag/tests/diagrams/rack_height_for_multi_racks.diag 174${PYSITELIB}/rackdiag/tests/diagrams/rack_height_for_multi_racks.diag
182${PYSITELIB}/rackdiag/tests/diagrams/simple.diag 175${PYSITELIB}/rackdiag/tests/diagrams/simple.diag
183${PYSITELIB}/rackdiag/tests/test_builder.py 176${PYSITELIB}/rackdiag/tests/test_builder.py
184${PYSITELIB}/rackdiag/tests/test_builder.pyc 177${PYSITELIB}/rackdiag/tests/test_builder.pyc
185${PYSITELIB}/rackdiag/tests/test_builder.pyo 178${PYSITELIB}/rackdiag/tests/test_builder.pyo
186${PYSITELIB}/rackdiag/tests/test_generate_diagram.py 179${PYSITELIB}/rackdiag/tests/test_generate_diagram.py
187${PYSITELIB}/rackdiag/tests/test_generate_diagram.pyc 180${PYSITELIB}/rackdiag/tests/test_generate_diagram.pyc
188${PYSITELIB}/rackdiag/tests/test_generate_diagram.pyo 181${PYSITELIB}/rackdiag/tests/test_generate_diagram.pyo
189${PYSITELIB}/rackdiag/tests/test_pep8.py 
190${PYSITELIB}/rackdiag/tests/test_pep8.pyc 
191${PYSITELIB}/rackdiag/tests/test_pep8.pyo 
192${PYSITELIB}/rackdiag/tests/test_rst_directives.py 182${PYSITELIB}/rackdiag/tests/test_rst_directives.py
193${PYSITELIB}/rackdiag/tests/test_rst_directives.pyc 183${PYSITELIB}/rackdiag/tests/test_rst_directives.pyc
194${PYSITELIB}/rackdiag/tests/test_rst_directives.pyo 184${PYSITELIB}/rackdiag/tests/test_rst_directives.pyo
195${PYSITELIB}/rackdiag/utils/__init__.py 185${PYSITELIB}/rackdiag/utils/__init__.py
196${PYSITELIB}/rackdiag/utils/__init__.pyc 186${PYSITELIB}/rackdiag/utils/__init__.pyc
197${PYSITELIB}/rackdiag/utils/__init__.pyo 187${PYSITELIB}/rackdiag/utils/__init__.pyo
198${PYSITELIB}/rackdiag/utils/math.py 188${PYSITELIB}/rackdiag/utils/math.py
199${PYSITELIB}/rackdiag/utils/math.pyc 189${PYSITELIB}/rackdiag/utils/math.pyc
200${PYSITELIB}/rackdiag/utils/math.pyo 190${PYSITELIB}/rackdiag/utils/math.pyo
201${PYSITELIB}/rackdiag/utils/rst/__init__.py 191${PYSITELIB}/rackdiag/utils/rst/__init__.py
202${PYSITELIB}/rackdiag/utils/rst/__init__.pyc 192${PYSITELIB}/rackdiag/utils/rst/__init__.pyc
203${PYSITELIB}/rackdiag/utils/rst/__init__.pyo 193${PYSITELIB}/rackdiag/utils/rst/__init__.pyo
204${PYSITELIB}/rackdiag/utils/rst/directives.py 194${PYSITELIB}/rackdiag/utils/rst/directives.py
205${PYSITELIB}/rackdiag/utils/rst/directives.pyc 195${PYSITELIB}/rackdiag/utils/rst/directives.pyc
206${PYSITELIB}/rackdiag/utils/rst/directives.pyo 196${PYSITELIB}/rackdiag/utils/rst/directives.pyo
207${PYSITELIB}/rackdiag/utils/rst/nodes.py 197${PYSITELIB}/rackdiag/utils/rst/nodes.py
208${PYSITELIB}/rackdiag/utils/rst/nodes.pyc 198${PYSITELIB}/rackdiag/utils/rst/nodes.pyc
209${PYSITELIB}/rackdiag/utils/rst/nodes.pyo 199${PYSITELIB}/rackdiag/utils/rst/nodes.pyo
210${PYSITELIB}/rackdiag_sphinxhelper.py 200${PYSITELIB}/rackdiag_sphinxhelper.py
211${PYSITELIB}/rackdiag_sphinxhelper.pyc 201${PYSITELIB}/rackdiag_sphinxhelper.pyc
212${PYSITELIB}/rackdiag_sphinxhelper.pyo 202${PYSITELIB}/rackdiag_sphinxhelper.pyo
213man/man1/nwdiag.1 203man/man1/nwdiag-${PYVERSSUFFIX}.1
214man/man1/rackdiag.1 204man/man1/packetdiag-${PYVERSSUFFIX}.1
 205man/man1/rackdiag-${PYVERSSUFFIX}.1
cvs diff -r1.10 -r1.11 pkgsrc/graphics/py-nwdiag/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/py-nwdiag/distinfo 2015/11/03 21:34:17 1.10
+++ pkgsrc/graphics/py-nwdiag/distinfo 2020/02/20 06:29:49 1.11
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.10 2015/11/03 21:34:17 agc Exp $ 1$NetBSD: distinfo,v 1.11 2020/02/20 06:29:49 adam Exp $
2 2
3SHA1 (nwdiag-1.0.4.tar.gz) = 501c4a07f559cfd78b8f49b6949d79c2464b8818 3SHA1 (nwdiag-2.0.0.tar.gz) = 472a3c6a845f81c31c331068de6884d6a78be600
4RMD160 (nwdiag-1.0.4.tar.gz) = 151f22c058337febc8ef93996b7abbed823ef83e 4RMD160 (nwdiag-2.0.0.tar.gz) = 769b1298ca1a9043e77b034476cb1657cf209f74
5SHA512 (nwdiag-1.0.4.tar.gz) = 755493fb8425243117e11d06e7657c9cae44a8c72bc1fbf515a7f38670307fca43bf46c3017b32aa66eece4f389379abb12fcb4914c33fd58e3bb6eff3361f2f 5SHA512 (nwdiag-2.0.0.tar.gz) = b9064c56955c68074e6c9e262f90fadde5b0c9412d86e6fe3c7f76745638fb02a62ab720b515d3b81d1b896cac18df55622893d73380dfe003a4004b0b8b50e5
6Size (nwdiag-1.0.4.tar.gz) = 2652472 bytes 6Size (nwdiag-2.0.0.tar.gz) = 7751634 bytes