Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1533472853195210"
MIME-Version: 1.0
Date: Sun, 5 Aug 2018 12:40:53 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/graphics/py-blockdiag
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20180805124053.5C991FBEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1533472853195210
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Sun Aug  5 12:40:53 UTC 2018

Modified Files:
	pkgsrc/graphics/py-blockdiag: Makefile PLIST distinfo
Added Files:
	pkgsrc/graphics/py-blockdiag: ALTERNATIVES
Removed Files:
	pkgsrc/graphics/py-blockdiag: MESSAGE

Log Message:
py-blockdiag: updated to 1.5.4

1.5.4:
- Fix Python 3.7 compatibility


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/py-blockdiag/ALTERNATIVES
cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/py-blockdiag/MESSAGE
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/py-blockdiag/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/py-blockdiag/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/py-blockdiag/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1533472853195210
Content-Disposition: inline
Content-Length: 4155
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/graphics/py-blockdiag/Makefile
diff -u pkgsrc/graphics/py-blockdiag/Makefile:1.23 pkgsrc/graphics/py-blockdiag/Makefile:1.24
--- pkgsrc/graphics/py-blockdiag/Makefile:1.23	Mon Aug 15 19:20:25 2016
+++ pkgsrc/graphics/py-blockdiag/Makefile	Sun Aug  5 12:40:53 2018
@@ -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"

Index: pkgsrc/graphics/py-blockdiag/PLIST
diff -u pkgsrc/graphics/py-blockdiag/PLIST:1.16 pkgsrc/graphics/py-blockdiag/PLIST:1.17
--- pkgsrc/graphics/py-blockdiag/PLIST:1.16	Mon Aug 15 19:20:25 2016
+++ pkgsrc/graphics/py-blockdiag/PLIST	Sun Aug  5 12:40:53 2018
@@ -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

Index: pkgsrc/graphics/py-blockdiag/distinfo
diff -u pkgsrc/graphics/py-blockdiag/distinfo:1.18 pkgsrc/graphics/py-blockdiag/distinfo:1.19
--- pkgsrc/graphics/py-blockdiag/distinfo:1.18	Mon Aug 15 19:20:25 2016
+++ pkgsrc/graphics/py-blockdiag/distinfo	Sun Aug  5 12:40:53 2018
@@ -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

Added files:

Index: pkgsrc/graphics/py-blockdiag/ALTERNATIVES
diff -u /dev/null pkgsrc/graphics/py-blockdiag/ALTERNATIVES:1.1
--- /dev/null	Sun Aug  5 12:40:53 2018
+++ pkgsrc/graphics/py-blockdiag/ALTERNATIVES	Sun Aug  5 12:40:53 2018
@@ -0,0 +1,2 @@
+bin/blockdiag @PREFIX@/bin/blockdiag-@PYVERSSUFFIX@
+@PKGMANDIR@/man1/blockdiag @PREFIX@/@PKGMANDIR@/man1/blockdiag-@PYVERSSUFFIX@.1


--_----------=_1533472853195210--