- Update to 1.1.7

- Convert to new Makefile header

4 files changed, 6 insertions, 52 deletions

diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index 44fa2030db0e..1a4e73d91a22 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	py-blockdiag
-# Date created:		2011-08-02
-# Whom:			TAKATSU Tomonari <tota@FreeBSD.org>
-#
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	blockdiag
-PORTVERSION=	1.1.6
+PORTVERSION=	1.1.7
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -51,9 +47,6 @@ RUN_DEPENDS+=	${PKGNAMEPREFIX}reportlab2>0:${PORTSDIR}/print/py-reportlab2
 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 956a32ad3100..81118a902548 100644
--- a/graphics/py-blockdiag/distinfo
+++ b/graphics/py-blockdiag/distinfo
@@ -1,2 +1,2 @@
-SHA256 (blockdiag-1.1.6.tar.gz) = e5f65ce70b7c68f0eaf8358c9b97af9554c9317d389b04d82297f6efd877f0aa
-SIZE (blockdiag-1.1.6.tar.gz) = 134141
+SHA256 (blockdiag-1.1.7.tar.gz) = 895c63c857a2f79314a4d1f1c2ec7da454b29a69c2a48b8cafcf6fa53a69dc6c
+SIZE (blockdiag-1.1.7.tar.gz) = 131942
diff --git a/graphics/py-blockdiag/files/patch-bootstrap.py b/graphics/py-blockdiag/files/patch-bootstrap.py
deleted file mode 100644
index baa65a574b77..000000000000
--- a/graphics/py-blockdiag/files/patch-bootstrap.py
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/blockdiag/utils/bootstrap.py.orig	2012-04-18 11:00:23.000000000 +0900
-+++ src/blockdiag/utils/bootstrap.py	2012-04-23 11:34:13.000000000 +0900
-@@ -182,23 +182,7 @@
- 
- 
- def detectfont(options):
--    fonts = [
--        # for Windows
--        'c:/windows/fonts/VL-Gothic-Regular.ttf',
--        'c:/windows/fonts/msgothic.ttf',
--        'c:/windows/fonts/msgoth04.ttc',
--        # for Debian (squeeze)
--        '/usr/share/fonts/truetype/ipafont/ipagp.ttf',
--        '/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf',
--        # for Debian (wheezy)
--        '/usr/share/fonts/opentype/ipafont-gothic/ipagp.ttf',
--        '/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf',
--        # for MacOS
--        '/Library/Fonts/Hiragino Sans GB W3.otf',  # for MacOS
--        '/System/Library/Fonts/AppleGothic.ttf',  # for MacOS
--        # for FreeBSD
--        '/usr/local/share/font-ipa/ipagp.otf',  # for FreeBSD
--    ]
-+    ipafontpath = '%%LOCALBASE%%/share/font-ipa/ipagp.otf'
- 
-     fontpath = None
-     if options.font:
-@@ -212,11 +196,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 02f017686454..bffa6f7a6390 100644
--- a/graphics/py-blockdiag/pkg-plist
+++ b/graphics/py-blockdiag/pkg-plist
@@ -225,6 +225,8 @@ bin/blockdiag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/node_shape.diag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/node_shape_background.diag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/node_shape_namespace.diag
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/node_shape_with_none_shadow.diag
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/node_shape_with_solid_shadow.diag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/node_style_dasharray.diag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/node_styles.diag
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/blockdiag/tests/diagrams/node_width_and_height.diag