From owner-svn-ports-head@FreeBSD.ORG  Thu Mar 21 00:24:35 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 90030B1C;
 Thu, 21 Mar 2013 00:24:35 +0000 (UTC) (envelope-from jgh@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 69F0DD5C;
 Thu, 21 Mar 2013 00:24:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2L0OZjr045924;
 Thu, 21 Mar 2013 00:24:35 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2L0OZxS045923;
 Thu, 21 Mar 2013 00:24:35 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201303210024.r2L0OZxS045923@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Thu, 21 Mar 2013 00:24:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314789 - head/textproc/saxon-devel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Mar 2013 00:24:35 -0000

Author: jgh
Date: Thu Mar 21 00:24:34 2013
New Revision: 314789
URL: http://svnweb.freebsd.org/changeset/ports/314789

Log:
  - adopt optionsNG
  
  Approved by:	portmgr (miwi)

Modified:
  head/textproc/saxon-devel/Makefile

Modified: head/textproc/saxon-devel/Makefile
==============================================================================
--- head/textproc/saxon-devel/Makefile	Thu Mar 21 00:21:21 2013	(r314788)
+++ head/textproc/saxon-devel/Makefile	Thu Mar 21 00:24:34 2013	(r314789)
@@ -16,9 +16,10 @@ COMMENT=	An XSLT 2.0 / XPath 2.0 / XQuer
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
-OPTIONS=	JDOM "Install Jdom support" off \
-		DOM4J "Install dom4j support" off \
-		XOM "Install XOM support" off
+OPTIONS_DEFINE=	JDOM DOM4J XOM DOCS
+JDOM_DESC=	Jdom support
+DOM4J_DESC=	dom4j support
+XOM_DESC=	XOM support
 
 USE_ZIP=	yes
 USE_JAVA=	yes
@@ -36,18 +37,19 @@ PORTDOCS=	*
 .endif
 
 .include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_JDOM)
+.if ${PORT_OPTIONS:MJDOM}
 JARFILES+=	saxon9-jdom.jar
 RUN_DEPENDS+=	${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom
 .endif
 
-.if defined(WITH_DOM4J)
+.if ${PORT_OPTIONS:MDOM4J}
 JARFILES+=	saxon9-dom4j.jar
 RUN_DEPENDS+=	${JAVALIBDIR}/dom4j.jar:${PORTSDIR}/textproc/dom4j
 .endif
 
-.if defined(WITH_XOM)
+.if ${PORT_OPTIONS:MXOM}
 JARFILES+=	saxon9-xom.jar
 RUN_DEPENDS+=	${JAVALIBDIR}/xom.jar:${PORTSDIR}/textproc/xom
 .endif
@@ -63,7 +65,7 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${JAVAJARDIR}/
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}/..."
 	@cd ${WRKSRC}/samples/ \
 	  && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; \
@@ -82,7 +84,7 @@ do-install:
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	@${FIND} -s ${WRKSRC}/samples -not -type d | \
 		${SED} -ne 's,^${WRKSRC}/samples,${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}