py-nwdiag: updated to 2.0.0

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

3 files changed, 22 insertions, 30 deletions

diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile
index 84c760838bc..8e68635cac7 100644
--- a/graphics/py-nwdiag/Makefile
+++ b/graphics/py-nwdiag/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.13 2017/09/04 18:00:55 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.14 2020/02/20 06:29:49 adam Exp $
 
-DISTNAME=	nwdiag-1.0.4
+DISTNAME=	nwdiag-2.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	graphics
+CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=n/nwdiag/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-#HOMEPAGE=	http://blockdiag.com/nwdiag/build/html/
+#HOMEPAGE=	http://blockdiag.com/
 COMMENT=	Simple network-diagram image generator
 LICENSE=	apache-2.0
 
@@ -18,10 +17,12 @@ USE_LANGUAGES=	# none
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/nwdiag.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/rackdiag.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+.for bin in nwdiag packetdiag rackdiag
+	cd ${DESTDIR}${PREFIX}/bin && \
+	${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
+	${INSTALL_MAN} ${WRKSRC}/${bin}.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${bin}-${PYVERSSUFFIX}.1
+.endfor
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-nwdiag/PLIST b/graphics/py-nwdiag/PLIST
index 771b8adbcc8..a99862e3d52 100644
--- a/graphics/py-nwdiag/PLIST
+++ b/graphics/py-nwdiag/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.9 2015/01/20 10:50:03 obache Exp $
-bin/nwdiag
-bin/packetdiag
-bin/rackdiag
+@comment $NetBSD: PLIST,v 1.10 2020/02/20 06:29:49 adam Exp $
+bin/nwdiag-${PYVERSSUFFIX}
+bin/packetdiag-${PYVERSSUFFIX}
+bin/rackdiag-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -68,9 +68,6 @@ ${PYSITELIB}/nwdiag/tests/test_builder.pyo
 ${PYSITELIB}/nwdiag/tests/test_generate_diagram.py
 ${PYSITELIB}/nwdiag/tests/test_generate_diagram.pyc
 ${PYSITELIB}/nwdiag/tests/test_generate_diagram.pyo
-${PYSITELIB}/nwdiag/tests/test_pep8.py
-${PYSITELIB}/nwdiag/tests/test_pep8.pyc
-${PYSITELIB}/nwdiag/tests/test_pep8.pyo
 ${PYSITELIB}/nwdiag/tests/test_rst_directives.py
 ${PYSITELIB}/nwdiag/tests/test_rst_directives.pyc
 ${PYSITELIB}/nwdiag/tests/test_rst_directives.pyo
@@ -127,9 +124,6 @@ ${PYSITELIB}/packetdiag/tests/diagrams/tcp_2.diag
 ${PYSITELIB}/packetdiag/tests/test_generate_diagram.py
 ${PYSITELIB}/packetdiag/tests/test_generate_diagram.pyc
 ${PYSITELIB}/packetdiag/tests/test_generate_diagram.pyo
-${PYSITELIB}/packetdiag/tests/test_pep8.py
-${PYSITELIB}/packetdiag/tests/test_pep8.pyc
-${PYSITELIB}/packetdiag/tests/test_pep8.pyo
 ${PYSITELIB}/packetdiag/tests/test_rst_directives.py
 ${PYSITELIB}/packetdiag/tests/test_rst_directives.pyc
 ${PYSITELIB}/packetdiag/tests/test_rst_directives.pyo
@@ -170,7 +164,6 @@ ${PYSITELIB}/rackdiag/parser.py
 ${PYSITELIB}/rackdiag/parser.pyc
 ${PYSITELIB}/rackdiag/parser.pyo
 ${PYSITELIB}/rackdiag/tests/VLGothic/VL-Gothic-Regular.ttf
-${PYSITELIB}/rackdiag/tests/diagrams/ascending.diag
 ${PYSITELIB}/rackdiag/tests/diagrams/autonumber.diag
 ${PYSITELIB}/rackdiag/tests/diagrams/multi_rackitem.diag
 ${PYSITELIB}/rackdiag/tests/diagrams/multi_racks.diag
@@ -186,9 +179,6 @@ ${PYSITELIB}/rackdiag/tests/test_builder.pyo
 ${PYSITELIB}/rackdiag/tests/test_generate_diagram.py
 ${PYSITELIB}/rackdiag/tests/test_generate_diagram.pyc
 ${PYSITELIB}/rackdiag/tests/test_generate_diagram.pyo
-${PYSITELIB}/rackdiag/tests/test_pep8.py
-${PYSITELIB}/rackdiag/tests/test_pep8.pyc
-${PYSITELIB}/rackdiag/tests/test_pep8.pyo
 ${PYSITELIB}/rackdiag/tests/test_rst_directives.py
 ${PYSITELIB}/rackdiag/tests/test_rst_directives.pyc
 ${PYSITELIB}/rackdiag/tests/test_rst_directives.pyo
@@ -210,5 +200,6 @@ ${PYSITELIB}/rackdiag/utils/rst/nodes.pyo
 ${PYSITELIB}/rackdiag_sphinxhelper.py
 ${PYSITELIB}/rackdiag_sphinxhelper.pyc
 ${PYSITELIB}/rackdiag_sphinxhelper.pyo
-man/man1/nwdiag.1
-man/man1/rackdiag.1
+man/man1/nwdiag-${PYVERSSUFFIX}.1
+man/man1/packetdiag-${PYVERSSUFFIX}.1
+man/man1/rackdiag-${PYVERSSUFFIX}.1
diff --git a/graphics/py-nwdiag/distinfo b/graphics/py-nwdiag/distinfo
index fa0ef49745f..8d6e808f2e2 100644
--- a/graphics/py-nwdiag/distinfo
+++ b/graphics/py-nwdiag/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2015/11/03 21:34:17 agc Exp $
+$NetBSD: distinfo,v 1.11 2020/02/20 06:29:49 adam Exp $
 
-SHA1 (nwdiag-1.0.4.tar.gz) = 501c4a07f559cfd78b8f49b6949d79c2464b8818
-RMD160 (nwdiag-1.0.4.tar.gz) = 151f22c058337febc8ef93996b7abbed823ef83e
-SHA512 (nwdiag-1.0.4.tar.gz) = 755493fb8425243117e11d06e7657c9cae44a8c72bc1fbf515a7f38670307fca43bf46c3017b32aa66eece4f389379abb12fcb4914c33fd58e3bb6eff3361f2f
-Size (nwdiag-1.0.4.tar.gz) = 2652472 bytes
+SHA1 (nwdiag-2.0.0.tar.gz) = 472a3c6a845f81c31c331068de6884d6a78be600
+RMD160 (nwdiag-2.0.0.tar.gz) = 769b1298ca1a9043e77b034476cb1657cf209f74
+SHA512 (nwdiag-2.0.0.tar.gz) = b9064c56955c68074e6c9e262f90fadde5b0c9412d86e6fe3c7f76745638fb02a62ab720b515d3b81d1b896cac18df55622893d73380dfe003a4004b0b8b50e5
+Size (nwdiag-2.0.0.tar.gz) = 7751634 bytes