Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Jan 2016 14:35:59 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r405557 - head/textproc/nux
Message-ID:  <201601081435.u08EZxdC065802@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Jan  8 14:35:58 2016
New Revision: 405557
URL: https://svnweb.freebsd.org/changeset/ports/405557

Log:
  - Add NO_ARCH
  - Switch to options helpers

Modified:
  head/textproc/nux/Makefile

Modified: head/textproc/nux/Makefile
==============================================================================
--- head/textproc/nux/Makefile	Fri Jan  8 14:22:14 2016	(r405556)
+++ head/textproc/nux/Makefile	Fri Jan  8 14:35:58 2016	(r405557)
@@ -14,43 +14,34 @@ COMMENT=	Small open-source XQuery extens
 RUN_DEPENDS=	${JAVALIBDIR}/xom.jar:${PORTSDIR}/textproc/xom \
 		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel
 
-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+
 NO_BUILD=	yes
+NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MXQUERY_TOOL}
-RUN_DEPENDS+=	${JAVALIBDIR}/java-getopt.jar:${PORTSDIR}/java/java-getopt
-.endif
-
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
-.if ${PORT_OPTIONS:MXQUERY_TOOL}
-PLIST_FILES+=	bin/fire-xquery
-.endif
-
 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
 
-.if ${PORT_OPTIONS:MXQUERY_TOOL}
-SUB_FILES=	fire-xquery.sh
-.endif
+OPTIONS_DEFINE=		XQUERY_TOOL DOCS
+OPTIONS_DEFAULT=	XQUERY_TOOL
+
+XQUERY_TOOL_DESC=	Install the XQuery command-line tool
+XQUERY_TOOL_RUN_DEPENDS=${JAVALIBDIR}/java-getopt.jar:${PORTSDIR}/java/java-getopt
+XQUERY_TOOL_PLIST_FILES=bin/fire-xquery
+XQUERY_TOOL_SUB_FILES=	fire-xquery.sh
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}
-.if ${PORT_OPTIONS:MXQUERY_TOOL}
+
+do-install-XQUERY_TOOL-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/fire-xquery.sh ${STAGEDIR}${PREFIX}/bin/fire-xquery
-.endif
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601081435.u08EZxdC065802>