Update blockdiag to 1.3.2.

History
=======

1.3.2 (2013-11-19)
------------------
* Fix bugs

1.3.1 (2013-10-22)
------------------
* Fix bugs

1.3.0 (2013-10-05)
------------------
* Support python 3.2 and 3.3 (thanks to @masayuko)
* Drop supports for python 2.4 and 2.5
* Replace dependency: PIL -> Pillow

4 files changed, 22 insertions, 20 deletions

diff --git a/graphics/py-blockdiag/MESSAGE b/graphics/py-blockdiag/MESSAGE
index 08a231ec617..e897fc7254c 100644
--- a/graphics/py-blockdiag/MESSAGE
+++ b/graphics/py-blockdiag/MESSAGE
@@ -1,6 +1,6 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2012/11/19 19:54:39 cheusov Exp $
+$NetBSD: MESSAGE,v 1.2 2013/12/06 11:26:55 obache Exp $
 
-Install pyNN-reportlab package for PDF support
+Install ${PYPKGPREFIX}-reportlab package for PDF support
 
 ===========================================================================
diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index d3cb3b51ec2..e6117677fca 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2013/09/11 02:56:10 obache Exp $
+# $NetBSD: Makefile,v 1.13 2013/12/06 11:26:55 obache Exp $
 #
 
-DISTNAME=	blockdiag-1.2.4
+DISTNAME=	blockdiag-1.3.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics
 MASTER_SITES=	http://pypi.python.org/packages/source/b/blockdiag/
@@ -11,10 +11,13 @@ HOMEPAGE=	http://blockdiag.com/
 COMMENT=	Generate block-diagram image file from spec-text file
 LICENSE=	apache-2.0
 
-DEPENDS+=	${PYPKGPREFIX}-imaging>=1.1.7nb3:../../graphics/py-imaging
-DEPENDS+=	${PYPKGPREFIX}-funcparserlib>=0.3.4:../../devel/py-funcparserlib
+DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.2.1:../../graphics/Pillow
+DEPENDS+=	${PYPKGPREFIX}-funcparserlib>=0.3.6:../../devel/py-funcparserlib
 DEPENDS+=	${PYPKGPREFIX}-webcolors-[0-9]*:../../www/py-webcolors
 
+PYTHON_SELF_CONFLICT=		yes
+PYTHON_VERSIONS_INCLUDE_3X=	yes
+
 USE_LANGUAGES=	# none
 
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
@@ -27,4 +30,5 @@ post-install:
 .if ${PYPKGPREFIX} == "py26"
 DEPENDS+=	${PYPKGPREFIX}-ordereddict-[0-9]*:../../devel/py-ordereddict
 .endif
+MESSAGE_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX}
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-blockdiag/PLIST b/graphics/py-blockdiag/PLIST
index 1500f253139..29b33d7d926 100644
--- a/graphics/py-blockdiag/PLIST
+++ b/graphics/py-blockdiag/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2013/09/11 02:56:10 obache Exp $
+@comment $NetBSD: PLIST,v 1.12 2013/12/06 11:26:55 obache Exp $
 bin/blockdiag
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -275,6 +275,7 @@ ${PYSITELIB}/blockdiag/tests/diagrams/twin_circular_ref_to_root.diag
 ${PYSITELIB}/blockdiag/tests/diagrams/twin_forked.diag
 ${PYSITELIB}/blockdiag/tests/diagrams/twin_multiple_parent_node.diag
 ${PYSITELIB}/blockdiag/tests/diagrams/two_edges.diag
+${PYSITELIB}/blockdiag/tests/diagrams/white.gif
 ${PYSITELIB}/blockdiag/tests/test_boot_params.py
 ${PYSITELIB}/blockdiag/tests/test_boot_params.pyc
 ${PYSITELIB}/blockdiag/tests/test_boot_params.pyo
@@ -302,6 +303,9 @@ ${PYSITELIB}/blockdiag/tests/test_generate_diagram.pyo
 ${PYSITELIB}/blockdiag/tests/test_imagedraw_textfolder.py
 ${PYSITELIB}/blockdiag/tests/test_imagedraw_textfolder.pyc
 ${PYSITELIB}/blockdiag/tests/test_imagedraw_textfolder.pyo
+${PYSITELIB}/blockdiag/tests/test_imagedraw_utils.py
+${PYSITELIB}/blockdiag/tests/test_imagedraw_utils.pyc
+${PYSITELIB}/blockdiag/tests/test_imagedraw_utils.pyo
 ${PYSITELIB}/blockdiag/tests/test_parser.py
 ${PYSITELIB}/blockdiag/tests/test_parser.pyc
 ${PYSITELIB}/blockdiag/tests/test_parser.pyo
@@ -323,18 +327,15 @@ ${PYSITELIB}/blockdiag/utils/__init__.pyo
 ${PYSITELIB}/blockdiag/utils/bootstrap.py
 ${PYSITELIB}/blockdiag/utils/bootstrap.pyc
 ${PYSITELIB}/blockdiag/utils/bootstrap.pyo
-${PYSITELIB}/blockdiag/utils/collections.py
-${PYSITELIB}/blockdiag/utils/collections.pyc
-${PYSITELIB}/blockdiag/utils/collections.pyo
+${PYSITELIB}/blockdiag/utils/compat.py
+${PYSITELIB}/blockdiag/utils/compat.pyc
+${PYSITELIB}/blockdiag/utils/compat.pyo
 ${PYSITELIB}/blockdiag/utils/config.py
 ${PYSITELIB}/blockdiag/utils/config.pyc
 ${PYSITELIB}/blockdiag/utils/config.pyo
 ${PYSITELIB}/blockdiag/utils/fontmap.py
 ${PYSITELIB}/blockdiag/utils/fontmap.pyc
 ${PYSITELIB}/blockdiag/utils/fontmap.pyo
-${PYSITELIB}/blockdiag/utils/functools.py
-${PYSITELIB}/blockdiag/utils/functools.pyc
-${PYSITELIB}/blockdiag/utils/functools.pyo
 ${PYSITELIB}/blockdiag/utils/images.py
 ${PYSITELIB}/blockdiag/utils/images.pyc
 ${PYSITELIB}/blockdiag/utils/images.pyo
@@ -344,9 +345,6 @@ ${PYSITELIB}/blockdiag/utils/jpeg.pyo
 ${PYSITELIB}/blockdiag/utils/myitertools.py
 ${PYSITELIB}/blockdiag/utils/myitertools.pyc
 ${PYSITELIB}/blockdiag/utils/myitertools.pyo
-${PYSITELIB}/blockdiag/utils/namedtuple.py
-${PYSITELIB}/blockdiag/utils/namedtuple.pyc
-${PYSITELIB}/blockdiag/utils/namedtuple.pyo
 ${PYSITELIB}/blockdiag/utils/rst/__init__.py
 ${PYSITELIB}/blockdiag/utils/rst/__init__.pyc
 ${PYSITELIB}/blockdiag/utils/rst/__init__.pyo
diff --git a/graphics/py-blockdiag/distinfo b/graphics/py-blockdiag/distinfo
index a9c07a06598..600ee456b6b 100644
--- a/graphics/py-blockdiag/distinfo
+++ b/graphics/py-blockdiag/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2013/09/11 02:56:10 obache Exp $
+$NetBSD: distinfo,v 1.12 2013/12/06 11:26:55 obache Exp $
 
-SHA1 (blockdiag-1.2.4.tar.gz) = 645e3357a8d5aefa24def753c6a7eeb86b6d0d5a
-RMD160 (blockdiag-1.2.4.tar.gz) = 70e1935566ea6064dadb3f4e18b11c7c55ef076d
-Size (blockdiag-1.2.4.tar.gz) = 136854 bytes
+SHA1 (blockdiag-1.3.2.tar.gz) = 56f427930f89c30d80fa210a856b1b21051f827d
+RMD160 (blockdiag-1.3.2.tar.gz) = b151fba5edeeff358aff1013e9af0d193d08b6ed
+Size (blockdiag-1.3.2.tar.gz) = 134482 bytes