- Update to 1.1.2

- Add OPTIONS for IPA font support

4 files changed, 59 insertions, 8 deletions

diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index ec63513063f2..6b2e4f093742 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	blockdiag
-PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTVERSION=	1.1.2
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -36,7 +35,8 @@ EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 PORTDOCS=	README.txt
 PORTEXAMPLES=	*
 
-OPTIONS=	PDF	"Enable PDF output" On
+OPTIONS=	PDF	"Enable PDF output" On \
+		IPAFONT	"Use IPA Font as default" Off
 
 .include <bsd.port.options.mk>
 
@@ -44,6 +44,13 @@ OPTIONS=	PDF	"Enable PDF output" On
 RUN_DEPENDS+=	${PKGNAMEPREFIX}reportlab2>0:${PORTSDIR}/print/py-reportlab2
 .endif
 
+.if defined(WITH_IPAFONT)
+RUN_DEPENDS+=	${LOCALBASE}/share/font-ipa/ipag.otf:${PORTSDIR}/japanese/font-ipa
+.endif
+
+post-patch:
+	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/blockdiag/utils/bootstrap.py
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/graphics/py-blockdiag/distinfo b/graphics/py-blockdiag/distinfo
index 72ad914933f1..2fa7fcc03c65 100644
--- a/graphics/py-blockdiag/distinfo
+++ b/graphics/py-blockdiag/distinfo
@@ -1,2 +1,2 @@
-SHA256 (blockdiag-1.1.1.tar.gz) = 0882065af125e96e3f1c6a18f0275f68cc99d0148e3e8430e0c95cd889b16823
-SIZE (blockdiag-1.1.1.tar.gz) = 128625
+SHA256 (blockdiag-1.1.2.tar.gz) = 3be7d80ba598a5ecdc99bb7b61ed74646c53848fa7d856373179e3618c82881e
+SIZE (blockdiag-1.1.2.tar.gz) = 130895
diff --git a/graphics/py-blockdiag/files/patch-bootstrap.py b/graphics/py-blockdiag/files/patch-bootstrap.py
new file mode 100644
index 000000000000..ec7240caac27
--- /dev/null
+++ b/graphics/py-blockdiag/files/patch-bootstrap.py
@@ -0,0 +1,31 @@
+--- src/blockdiag/utils/bootstrap.py.orig	2011-12-16 20:04:27.000000000 +0900
++++ src/blockdiag/utils/bootstrap.py	2011-12-29 11:15:27.000000000 +0900
+@@ -170,13 +170,7 @@
+ 
+ 
+ def detectfont(options):
+-    fonts = ['c:/windows/fonts/VL-Gothic-Regular.ttf',  # for Windows
+-             'c:/windows/fonts/msgothic.ttf',  # for Windows
+-             'c:/windows/fonts/msgoth04.ttc',  # for Windows
+-             '/usr/share/fonts/truetype/ipafont/ipagp.ttf',  # for Debian
+-             '/usr/local/share/font-ipa/ipagp.otf',  # for FreeBSD
+-             '/Library/Fonts/Hiragino Sans GB W3.otf',  # for MacOS
+-             '/System/Library/Fonts/AppleGothic.ttf']  # for MacOS
++    ipafontpath = '%%LOCALBASE%%/share/font-ipa/ipagp.otf'
+ 
+     fontpath = None
+     if options.font:
+@@ -190,11 +184,8 @@
+             raise RuntimeError(msg)
+ 
+     if fontpath is None:
+-        for path in fonts:
+-            _path, index = parse_fontpath(path)
+-            if os.path.isfile(_path):
+-                fontpath = path
+-                break
++        if ipafontpath and os.path.isfile(ipafontpath):
++            fontpath = ipafontpath
+ 
+     return fontpath
+ 
diff --git a/graphics/py-blockdiag/pkg-plist b/graphics/py-blockdiag/pkg-plist
index ddb1e4262b1e..7c65986341f1 100644
--- a/graphics/py-blockdiag/pkg-plist
+++ b/graphics/py-blockdiag/pkg-plist
@@ -21,9 +21,9 @@ bin/blockdiag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/command.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/command.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/command.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/diagparser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/diagparser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/diagparser.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/drawer.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/drawer.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/drawer.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/elements.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/elements.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/elements.pyo
@@ -48,6 +48,9 @@ bin/blockdiag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/imagedraw/svg.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/imagedraw/svg.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/imagedraw/svg.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/metrics.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/metrics.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/metrics.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/noderenderer/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/noderenderer/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/noderenderer/__init__.pyo
@@ -117,6 +120,9 @@ bin/blockdiag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/noderenderer/textbox.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/noderenderer/textbox.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/noderenderer/textbox.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/parser.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/parser.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/parser.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/plugins/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/plugins/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/plugins/__init__.pyo
@@ -139,6 +145,7 @@ bin/blockdiag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/circular_skipped_edge.diag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/define_class.diag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/diagram_attributes.diag
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/diagram_attributes_order.diag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/diagram_orientation.diag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/edge_attribute.diag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/edge_label.diag
@@ -309,9 +316,15 @@ bin/blockdiag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/bootstrap.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/bootstrap.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/bootstrap.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/collections.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/collections.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/collections.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/config.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/config.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/config.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/ellipse.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/ellipse.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/utils/ellipse.pyo