- Update to 1.5.3

- Fix Python version
- Make use of options helpers
- Regenerate patch file with 'make makepatch'

3 files changed, 16 insertions, 23 deletions

diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index a81dd17258e5..b4163e5d9279 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	blockdiag
-PORTVERSION=	1.4.4
+PORTVERSION=	1.5.3
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \
 		${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib \
 		${PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors
 
-USES=	python
+USES=	python:-3.4
 USE_PYTHON=	autoplist distutils
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
@@ -32,29 +32,22 @@ PDF_DESC=	Enable PDF output
 
 OPTIONS_DEFAULT=	PDF
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_VER} == 3.1
-IGNORE=	does not support in ${PYTHON_VERSION}
-.endif
-
-.if ${PORT_OPTIONS:MPDF}
-RUN_DEPENDS+=	${PKGNAMEPREFIX}reportlab>0:print/py-reportlab
-.endif
-
-.if ${PORT_OPTIONS:MIPAFONT}
-RUN_DEPENDS+=	${LOCALBASE}/share/font-ipa/ipag.otf:japanese/font-ipa
-.endif
+IPAFONT_RUN_DEPENDS=	${LOCALBASE}/share/font-ipa/ipag.otf:japanese/font-ipa
+PDF_RUN_DEPENDS=	${PKGNAMEPREFIX}reportlab>0:print/py-reportlab
 
 post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/blockdiag/utils/bootstrap.py
 
 post-install:
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/
+	@${ECHO_CMD} man/man1/${PORTNAME}.1.gz >> ${TMPPLIST}
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/examples/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/
-	@${ECHO_CMD} man/man1/${PORTNAME}.1.gz >> ${TMPPLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/py-blockdiag/distinfo b/graphics/py-blockdiag/distinfo
index 156764c77605..8c1ad5f95040 100644
--- a/graphics/py-blockdiag/distinfo
+++ b/graphics/py-blockdiag/distinfo
@@ -1,2 +1,2 @@
-SHA256 (blockdiag-1.4.4.tar.gz) = dca6ab8cf96d862386755813fca598e2c9bc29d05148dfd384f063878e653c9e
-SIZE (blockdiag-1.4.4.tar.gz) = 136258
+SHA256 (blockdiag-1.5.3.tar.gz) = 5ea3501fca0ca40fbacccc6f4ca177750e4b610009e021faa4868c0f6480ae8b
+SIZE (blockdiag-1.5.3.tar.gz) = 2704391
diff --git a/graphics/py-blockdiag/files/patch-src-blockdiag-utils-bootstrap.py b/graphics/py-blockdiag/files/patch-src-blockdiag-utils-bootstrap.py
index 22421d18ee64..672142f5b886 100644
--- a/graphics/py-blockdiag/files/patch-src-blockdiag-utils-bootstrap.py
+++ b/graphics/py-blockdiag/files/patch-src-blockdiag-utils-bootstrap.py
@@ -1,6 +1,6 @@
---- src/blockdiag/utils/bootstrap.py.orig	2013-09-30 22:19:06.000000000 +0900
-+++ src/blockdiag/utils/bootstrap.py	2014-01-02 16:19:04.000000000 +0900
-@@ -222,11 +222,7 @@
+--- src/blockdiag/utils/bootstrap.py.orig	2014-11-21 02:20:16 UTC
++++ src/blockdiag/utils/bootstrap.py
+@@ -254,11 +254,7 @@ class Options(object):
  def detectfont(options):
      import glob
      fontdirs = [