py-blockdiag: updated to 1.5.4

1.5.4:
- Fix Python 3.7 compatibility

5 files changed, 20 insertions, 23 deletions

diff --git a/graphics/py-blockdiag/ALTERNATIVES b/graphics/py-blockdiag/ALTERNATIVES
new file mode 100644
index 00000000000..bc727642b9a
--- /dev/null
+++ b/graphics/py-blockdiag/ALTERNATIVES
@@ -0,0 +1,2 @@
+bin/blockdiag @PREFIX@/bin/blockdiag-@PYVERSSUFFIX@
+@PKGMANDIR@/man1/blockdiag @PREFIX@/@PKGMANDIR@/man1/blockdiag-@PYVERSSUFFIX@.1
diff --git a/graphics/py-blockdiag/MESSAGE b/graphics/py-blockdiag/MESSAGE
deleted file mode 100644
index e897fc7254c..00000000000
--- a/graphics/py-blockdiag/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2013/12/06 11:26:55 obache Exp $
-
-Install ${PYPKGPREFIX}-reportlab package for PDF support
-
-===========================================================================
diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index 1bc097af670..a9dbb2238fc 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2016/08/15 19:20:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.24 2018/08/05 12:40:53 adam Exp $
 
-DISTNAME=	blockdiag-1.5.3
+DISTNAME=	blockdiag-1.5.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	graphics
+CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=b/blockdiag/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -10,21 +10,22 @@ HOMEPAGE=	http://blockdiag.com/
 COMMENT=	Generate block-diagram image file from spec-text file
 LICENSE=	apache-2.0
 
-DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.2.1:../../graphics/py-Pillow
+DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 DEPENDS+=	${PYPKGPREFIX}-funcparserlib>=0.3.6:../../devel/py-funcparserlib
+DEPENDS+=	${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab
 DEPENDS+=	${PYPKGPREFIX}-webcolors-[0-9]*:../../www/py-webcolors
-
-PYTHON_SELF_CONFLICT=		yes
+TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+TEST_DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 
 USE_LANGUAGES=	# none
 
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 post-install:
+	cd ${DESTDIR}${PREFIX} && \
+		${MV} bin/blockdiag bin/blockdiag-${PYVERSSUFFIX} || ${TRUE}
 	${INSTALL_MAN} ${WRKSRC}/blockdiag.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/blockdiag-${PYVERSSUFFIX}.1
 
 .include "../../lang/python/egg.mk"
-MESSAGE_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX}
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-blockdiag/PLIST b/graphics/py-blockdiag/PLIST
index 8402823e26f..76b219be287 100644
--- a/graphics/py-blockdiag/PLIST
+++ b/graphics/py-blockdiag/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.16 2016/08/15 19:20:25 ryoon Exp $
-bin/blockdiag
+@comment $NetBSD: PLIST,v 1.17 2018/08/05 12:40:53 adam Exp $
+bin/blockdiag-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -386,4 +386,4 @@ ${PYSITELIB}/blockdiag/utils/uuid.pyo
 ${PYSITELIB}/blockdiag_sphinxhelper.py
 ${PYSITELIB}/blockdiag_sphinxhelper.pyc
 ${PYSITELIB}/blockdiag_sphinxhelper.pyo
-man/man1/blockdiag.1
+man/man1/blockdiag-${PYVERSSUFFIX}.1
diff --git a/graphics/py-blockdiag/distinfo b/graphics/py-blockdiag/distinfo
index e4d502e496d..45205694154 100644
--- a/graphics/py-blockdiag/distinfo
+++ b/graphics/py-blockdiag/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2016/08/15 19:20:25 ryoon Exp $
+$NetBSD: distinfo,v 1.19 2018/08/05 12:40:53 adam Exp $
 
-SHA1 (blockdiag-1.5.3.tar.gz) = e02378b28b790f836fc00e6fc446c82b14aa05e6
-RMD160 (blockdiag-1.5.3.tar.gz) = 2fd5990df67e1a02ccd797e6a04e2c8c136ecd70
-SHA512 (blockdiag-1.5.3.tar.gz) = 11ff6334d1ae50c103158db6ef9acce76116a17cfb8e0066581c234138f17fabfddd183b154f407fe95dcd414b0054aebdc22682e82a8e7595905f1ee2fd6222
-Size (blockdiag-1.5.3.tar.gz) = 2704391 bytes
+SHA1 (blockdiag-1.5.4.tar.gz) = 1ea1496f2314f25287051915cb7b0be987c4b904
+RMD160 (blockdiag-1.5.4.tar.gz) = e4de1dd2967a05818307253e62725783ebcec1a3
+SHA512 (blockdiag-1.5.4.tar.gz) = 0eef8b3837282ed611e044ee618abca1f799b4a151bc2d7cece140c97ac728b2f3b9a3bb6877d3fed42a74e0173d0cbfd2966521c4dfb21c266975b4062405d2
+Size (blockdiag-1.5.4.tar.gz) = 2693073 bytes