From owner-svn-ports-head@FreeBSD.ORG Wed Jun 11 05:12:14 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5991C71; Wed, 11 Jun 2014 05:12:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 88D3628D3; Wed, 11 Jun 2014 05:12:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5B5CEwV044125; Wed, 11 Jun 2014 05:12:14 GMT (envelope-from nivit@svn.freebsd.org) Received: (from nivit@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5B5CEDb044123; Wed, 11 Jun 2014 05:12:14 GMT (envelope-from nivit@svn.freebsd.org) Message-Id: <201406110512.s5B5CEDb044123@svn.freebsd.org> From: Nicola Vitale Date: Wed, 11 Jun 2014 05:12:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357419 - head/lang/rhino 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.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jun 2014 05:12:14 -0000 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 +.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 - -.if ${PORT_OPTIONS:MLINEDIT} -JLINEJAR= ${JAVAJARDIR}/jline.jar -RUN_DEPENDS+= ${JLINEJAR}:${PORTSDIR}/devel/jline -.else -JLINEJAR="" -.endif - -.include +.include 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