Date: Wed, 11 Jun 2014 05:12:14 +0000 (UTC) From: Nicola Vitale <nivit@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357419 - head/lang/rhino Message-ID: <201406110512.s5B5CEDb044123@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nivit Date: Wed Jun 11 05:12:13 2014 New Revision: 357419 URL: http://svnweb.freebsd.org/changeset/ports/357419 QAT: https://qat.redports.org/buildarchive/r357419/ Log: - Remove leading, undefined article from COMMENT - Use options helpers - Add support for stage dir - Update link of WWW site Modified: head/lang/rhino/Makefile head/lang/rhino/pkg-descr Modified: head/lang/rhino/Makefile ============================================================================== --- head/lang/rhino/Makefile Wed Jun 11 04:41:55 2014 (r357418) +++ head/lang/rhino/Makefile Wed Jun 11 05:12:13 2014 (r357419) @@ -15,7 +15,7 @@ DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${PORTNAME}${DISTVERSION}.zip MAINTAINER= nivit@FreeBSD.org -COMMENT= An implementation of JavaScript written in Java +COMMENT= Implementation of JavaScript written in Java LICENSE= MPL @@ -25,44 +25,39 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} JAVA_VERSION= 1.6+ +LINEDIT_DESC= Enable line editing in the Rhino shell +LINEDIT_RUN_DEPENDS= ${JLINEJAR}:${PORTSDIR}/devel/jline +LINEDIT_USE= java=yes ant=yes + MAKE_ARGS= -Dxmlbeans.url=file://${DISTDIR}/${DIST_SUBDIR}/xmlbeans-2.5.0.zip \ -Dswing-ex-url=file://${DISTDIR}/${DIST_SUBDIR}/src.zip -OPTIONS_DEFINE= LINEDIT -LINEDIT_DESC= Enable line editing in the Rhino shell - OPTIONS_DEFAULT= LINEDIT +OPTIONS_DEFINE= LINEDIT USES= zip -NO_STAGE= yes .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MLINEDIT} +JLINEJAR= ${JAVAJARDIR}/jline.jar +.else +JLINEJAR="" +.endif + RHINOJAR= ${DATADIR}/${PORTNAME}.jar SUB_FILES= rhinoc rhinodbg rhinosh SUB_LIST= RHINOJAR=${RHINOJAR} JLINEJAR="${JLINEJAR}" -USE_ANT= yes -USE_JAVA= yes - WRKSRC= ${WRKDIR}/${PORTNAME}${DISTVERSION} do-install: - @${MKDIR} ${DATADIR}; \ - ${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}${DISTVERSION}/js.jar ${RHINOJAR}; \ + @${MKDIR} ${STAGEDIR}${DATADIR}; \ + ${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}${DISTVERSION}/js.jar ${STAGEDIR}${RHINOJAR}; \ RHINOSCRIPTS="${SUB_FILES}"; \ for RHINOSCRIPT in $${RHINOSCRIPTS}; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$${RHINOSCRIPT} ${PREFIX}/bin/; \ + ${INSTALL_SCRIPT} ${WRKDIR}/$${RHINOSCRIPT} ${STAGEDIR}${PREFIX}/bin/; \ done -.include <bsd.port.pre.mk> - -.if ${PORT_OPTIONS:MLINEDIT} -JLINEJAR= ${JAVAJARDIR}/jline.jar -RUN_DEPENDS+= ${JLINEJAR}:${PORTSDIR}/devel/jline -.else -JLINEJAR="" -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/lang/rhino/pkg-descr ============================================================================== --- head/lang/rhino/pkg-descr Wed Jun 11 04:41:55 2014 (r357418) +++ head/lang/rhino/pkg-descr Wed Jun 11 05:12:13 2014 (r357419) @@ -14,4 +14,4 @@ Rhino contains into Java class files * A JavaScript debugger for scripts executed with Rhino -WWW: http://www.mozilla.org/rhino/ +WWW: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Rhino
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406110512.s5B5CEDb044123>