From owner-svn-ports-head@FreeBSD.ORG  Thu Mar 21 00:13:08 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 8301B3E5;
 Thu, 21 Mar 2013 00:13:08 +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 5B7A8CE9;
 Thu, 21 Mar 2013 00:13:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2L0D8Vg042333;
 Thu, 21 Mar 2013 00:13:08 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2L0D8c1042332;
 Thu, 21 Mar 2013 00:13:08 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201303210013.r2L0D8c1042332@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Thu, 21 Mar 2013 00:13:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314783 - head/textproc/nux
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:13:08 -0000

Author: jgh
Date: Thu Mar 21 00:13:07 2013
New Revision: 314783
URL: http://svnweb.freebsd.org/changeset/ports/314783

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

Modified:
  head/textproc/nux/Makefile

Modified: head/textproc/nux/Makefile
==============================================================================
--- head/textproc/nux/Makefile	Thu Mar 21 00:11:34 2013	(r314782)
+++ head/textproc/nux/Makefile	Thu Mar 21 00:13:07 2013	(r314783)
@@ -14,7 +14,9 @@ COMMENT=	Small open-source XQuery extens
 RUN_DEPENDS=	${JAVALIBDIR}/xom.jar:${PORTSDIR}/textproc/xom \
 		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel
 
-OPTIONS=	XQUERY_TOOL "Install the XQuery command-line tool" on
+OPTIONS_DEFINE=	XQUERY_TOOL DOCS
+XQUERY_TOOL_DESC=	Install the XQuery command-line tool
+OPTIONS_DEFAULT=	XQUERY_TOOL
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
@@ -22,23 +24,23 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_XQUERY_TOOL)
+.if ${PORT_OPTIONS:MXQUERY_TOOL}
 RUN_DEPENDS+=	${JAVALIBDIR}/getopt.jar:${PORTSDIR}/java/java-getopt \
 		classpath:${PORTSDIR}/java/javavmwrapper
 .endif
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
-.if defined(WITH_XQUERY_TOOL)
+.if ${PORT_OPTIONS:MXQUERY_TOOL}
 PLIST_FILES+=	bin/fire-xquery
 .endif
-.if !defined(NOPORTDOCS)
+
 PORTDOCS=	api changelog.html cvs.html dependencies.html \
 		gettingstarted.html images index.html license.html licenses \
 		mailing.html readme.html related.html style.css todo.html
-.endif
 
-.if defined(WITH_XQUERY_TOOL)
+.if ${PORT_OPTIONS:MXQUERY_TOOL}
 SUB_FILES=	fire-xquery.sh
 .endif
 
@@ -47,12 +49,12 @@ do-install:
 	@${MKDIR} ${JAVAJARDIR}
 	@${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}.jar ${JAVAJARDIR}/
 	@${ECHO_MSG} " [ DONE ]"
-.if defined(WITH_XQUERY_TOOL)
+.if ${PORT_OPTIONS:MXQUERY_TOOL}
 	@${ECHO_MSG} -n ">> Installing XQuery command-line tool as ${PREFIX}/bin/fire-xquery..."
 	@${INSTALL_SCRIPT} ${WRKDIR}/fire-xquery.sh ${PREFIX}/bin/fire-xquery
 	@${ECHO_MSG} " [ DONE ]"
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@cd ${WRKSRC}/doc/ && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \;
 	@cd ${WRKSRC}/doc/ && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;