From owner-svn-ports-all@freebsd.org Fri Jan 8 14:36:00 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39D4CA681A5; Fri, 8 Jan 2016 14:36:00 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E29EC1999; Fri, 8 Jan 2016 14:35:59 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u08EZx1g065803; Fri, 8 Jan 2016 14:35:59 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u08EZxdC065802; Fri, 8 Jan 2016 14:35:59 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201601081435.u08EZxdC065802@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 8 Jan 2016 14:35:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405557 - 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2016 14:36:00 -0000 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 - -.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