From owner-svn-ports-all@FreeBSD.ORG  Fri Jul 20 22:25:22 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B8A441065673;
	Fri, 20 Jul 2012 22:25:22 +0000 (UTC)
	(envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A43458FC18;
	Fri, 20 Jul 2012 22:25:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6KMPMRq045740;
	Fri, 20 Jul 2012 22:25:22 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6KMPMmg045738;
	Fri, 20 Jul 2012 22:25:22 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201207202225.q6KMPMmg045738@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 20 Jul 2012 22:25:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301260 - head/textproc/senna
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Jul 2012 22:25:22 -0000

Author: bapt
Date: Fri Jul 20 22:25:22 2012
New Revision: 301260
URL: http://svn.freebsd.org/changeset/ports/301260

Log:
  Convert to new options framework

Modified:
  head/textproc/senna/Makefile

Modified: head/textproc/senna/Makefile
==============================================================================
--- head/textproc/senna/Makefile	Fri Jul 20 22:20:15 2012	(r301259)
+++ head/textproc/senna/Makefile	Fri Jul 20 22:25:22 2012	(r301260)
@@ -25,24 +25,26 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 SENNA_HOME?=	/var/senna
 
-OPTIONS=	MECAB	"use mecab for morphological analysis" on \
-		NFKC	"use nfkc based utf8 normalization" on
+OPTIONS_DEFINE=	MECAB NFKC
+OPTIONS_DEFAULT=	MECAB NFKC
+MECAB_DESC=	use mecab for morphological analysis
+NFKC_DESC=	use nfkc based utf8 normalization
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "ia64" || ${ARCH} == "sparc64"
 BROKEN=		Does not compile on ${ARCH}
 .endif
 
-.if defined(WITH_MECAB)
+.if ${PORT_OPTIONS:MMECAB}
 CONFIGURE_ARGS+=	--with-mecab
 LIB_DEPENDS+=	mecab:${PORTSDIR}/japanese/mecab
 .else
 CONFIGURE_ARGS+=	--without-mecab
 .endif
 
-.if !defined(WITH_NFKC)
+.if ${PORT_OPTIONS:MNFKC}
 CONFIGURE_ARGS+=	--disable-nfkc
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>