From owner-svn-ports-all@FreeBSD.ORG  Thu Dec 13 07:58:08 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 45010915;
 Thu, 13 Dec 2012 07:58:08 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 294A28FC0A;
 Thu, 13 Dec 2012 07:58:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBD7w8RN080859;
 Thu, 13 Dec 2012 07:58:08 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBD7w8SZ080857;
 Thu, 13 Dec 2012 07:58:08 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212130758.qBD7w8SZ080857@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 13 Dec 2012 07:58:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308832 - head/math/jlatexmath
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Thu, 13 Dec 2012 07:58:08 -0000

Author: bapt
Date: Thu Dec 13 07:58:07 2012
New Revision: 308832
URL: http://svnweb.freebsd.org/changeset/ports/308832

Log:
  Convert to new option framework

Modified:
  head/math/jlatexmath/Makefile

Modified: head/math/jlatexmath/Makefile
==============================================================================
--- head/math/jlatexmath/Makefile	Thu Dec 13 07:55:43 2012	(r308831)
+++ head/math/jlatexmath/Makefile	Thu Dec 13 07:58:07 2012	(r308832)
@@ -22,13 +22,13 @@ USE_ANT=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-OPTIONS=	FOP "textproc/fop plugin (required for math/scilab)" ON
+OPTIONS_DEFINE=	FOP EXAMPLES
+OPTIONS_DEFAULT=	FOP
+FOP_DESC=	textproc/fop plugin (required for math/scilab)
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_FOP)
-PLIST_SUB+=	FOP="@comment "
-.else
+.if ${PORT_OPTIONS:MFOP}
 BUILD_DEPENDS=	fop:${PORTSDIR}/textproc/fop \
 		${JAVALIBDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons \
 		${JAVASHAREDIR}/batik/batik.jar:${PORTSDIR}/graphics/batik \
@@ -42,6 +42,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 ALL_TARGET+=	fop
 
 PLIST_SUB+=	FOP=""
+.else
+PLIST_SUB+=	FOP="@comment "
 .endif
 
 post-patch:
@@ -52,7 +54,7 @@ post-patch:
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-${PORTVERSION}.jar ${JAVAJARDIR}/jlatexmath.jar
 	${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-fop-${PORTVERSION}.jar ${JAVAJARDIR}/jlatexmath-fop.jar
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
 .endif