From 1cc19a47d197e896efc36f288c96770cbfaef92f Mon Sep 17 00:00:00 2001
From: TAKATSU Tomonari <tota@FreeBSD.org>
Date: Tue, 12 Jun 2012 15:07:09 +0000
Subject: - Update to 1.1.6 - Convert to new options framework

---
 graphics/py-blockdiag/Makefile | 13 ++++++++-----
 graphics/py-blockdiag/distinfo |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'graphics/py-blockdiag')

diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index 4791f6ad6973..44fa2030db0e 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	blockdiag
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.6
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -35,16 +35,19 @@ EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 PORTDOCS=	README.txt
 PORTEXAMPLES=	*
 
-OPTIONS=	PDF	"Enable PDF output" On \
-		IPAFONT	"Use IPA Font as default" Off
+OPTIONS_DEFINE=	IPAFONT PDF
+IPAFONT_DESC=	Use IPA Font as default
+PDF_DESC=	Enable PDF output
+
+OPTIONS_DEFAULT=	PDF
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_PDF)
+.if ${PORT_OPTIONS:MPDF}
 RUN_DEPENDS+=	${PKGNAMEPREFIX}reportlab2>0:${PORTSDIR}/print/py-reportlab2
 .endif
 
-.if defined(WITH_IPAFONT)
+.if ${PORT_OPTIONS:MIPAFONT}
 RUN_DEPENDS+=	${LOCALBASE}/share/font-ipa/ipag.otf:${PORTSDIR}/japanese/font-ipa
 .endif
 
diff --git a/graphics/py-blockdiag/distinfo b/graphics/py-blockdiag/distinfo
index 1f0907c80636..956a32ad3100 100644
--- a/graphics/py-blockdiag/distinfo
+++ b/graphics/py-blockdiag/distinfo
@@ -1,2 +1,2 @@
-SHA256 (blockdiag-1.1.5.tar.gz) = 07818e570ad15eba86d54222fa6cc35851fb3470e8b522ce155fdf9ddfd7a922
-SIZE (blockdiag-1.1.5.tar.gz) = 133589
+SHA256 (blockdiag-1.1.6.tar.gz) = e5f65ce70b7c68f0eaf8358c9b97af9554c9317d389b04d82297f6efd877f0aa
+SIZE (blockdiag-1.1.6.tar.gz) = 134141
-- 
cgit v1.2.3