diff options
| author | Nicola Vitale <nivit@FreeBSD.org> | 2009-05-30 07:41:06 +0000 |
|---|---|---|
| committer | Nicola Vitale <nivit@FreeBSD.org> | 2009-05-30 07:41:06 +0000 |
| commit | 860735b7adf3d44170c4e603d76db0cd6523bee8 (patch) | |
| tree | cea34a54030baa6774ab884385946763cae8c9fc | |
| parent | Fix the build on recent -CURRENT with the removal of oldusb. (diff) | |
- Update to 1.7.r2
- Add an option to enable line editing in the Rhino shell
- Fix download site for xmlbeans
| -rw-r--r-- | lang/rhino/Makefile | 22 | ||||
| -rw-r--r-- | lang/rhino/distinfo | 6 | ||||
| -rw-r--r-- | lang/rhino/files/rhinosh.in | 2 |
3 files changed, 20 insertions, 10 deletions
diff --git a/lang/rhino/Makefile b/lang/rhino/Makefile index 6f1b2be5db7d..35e61d122aa4 100644 --- a/lang/rhino/Makefile +++ b/lang/rhino/Makefile @@ -6,14 +6,13 @@ # PORTNAME= rhino -DISTVERSION= 1_7R1 -#PORTREVISION= 0 +DISTVERSION= 1_7R2 +PORTREVISION= 0 #PORTEPOCH= 0 -PORTREVISION= 1 CATEGORIES= lang java MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla.org/js/:rhino \ http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/:swingex \ - ${MASTER_SITE_APACHE}:xmlbeans + http://www.apache.org/dist/xmlbeans/binaries/:xmlbeans MASTER_SITE_SUBDIR= xmlbeans/binaries/:xmlbeans DISTFILES= ${PORTNAME}${DISTVERSION}.zip:rhino \ src.zip:swingex \ @@ -24,6 +23,8 @@ EXTRACT_ONLY= ${PORTNAME}${DISTVERSION}.zip MAINTAINER= nivit@FreeBSD.org COMMENT= An implementation of JavaScript written in Java +OPTIONS= LINEDIT "Enable line editing in the Rhino shell" on + ALL_TARGET= jar DATADIR= ${JAVASHAREDIR}/${PORTNAME} @@ -36,7 +37,7 @@ MAKE_ARGS= -Dxmlbeans.url=file://${DISTDIR}/${DIST_SUBDIR}/xmlbeans-2.2.0.zip \ RHINOJAR= ${DATADIR}/${PORTNAME}.jar SUB_FILES= rhinoc rhinodbg rhinosh -SUB_LIST= RHINOJAR=${RHINOJAR} +SUB_LIST= RHINOJAR=${RHINOJAR} JLINEJAR=":${JLINEJAR}" USE_ANT= yes USE_JAVA= yes @@ -52,4 +53,13 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/$${RHINOSCRIPT} ${PREFIX}/bin/; \ done -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if defined(WITH_LINEDIT) +JLINEJAR= ${JAVAJARDIR}/jline.jar +RUN_DEPENDS+= ${JLINEJAR}:${PORTSDIR}/devel/jline +.else +JLINEJAR="" +.endif + +.include <bsd.port.post.mk> diff --git a/lang/rhino/distinfo b/lang/rhino/distinfo index bec75ba64dd6..4c9b7bfddafe 100644 --- a/lang/rhino/distinfo +++ b/lang/rhino/distinfo @@ -1,6 +1,6 @@ -MD5 (rhino/rhino1_7R1.zip) = 613eed8201d37be201805e5048ebb0c3 -SHA256 (rhino/rhino1_7R1.zip) = 084e250d2392369b2548b663e61bcf128baecb2f527e381e9ba89f0148db2c0d -SIZE (rhino/rhino1_7R1.zip) = 2668726 +MD5 (rhino/rhino1_7R2.zip) = 40d0a9abec8169e42920214b37fa8e0e +SHA256 (rhino/rhino1_7R2.zip) = 677f7dc1b67a1587bc03974d5f0720474a56b8f29835e1d860739908df8462dc +SIZE (rhino/rhino1_7R2.zip) = 2996867 MD5 (rhino/src.zip) = ab016c8f81812bb930fc0f7a69e053c5 SHA256 (rhino/src.zip) = 062837ddb18951ace41ba0050aec95a690c00190a6218e5c9591c381035dfa7d SIZE (rhino/src.zip) = 19708 diff --git a/lang/rhino/files/rhinosh.in b/lang/rhino/files/rhinosh.in index 394ab74473e3..c883104509f6 100644 --- a/lang/rhino/files/rhinosh.in +++ b/lang/rhino/files/rhinosh.in @@ -3,4 +3,4 @@ # $FreeBSD$ # # Rhino shell -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%" org.mozilla.javascript.tools.shell.Main $@ +JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%%%JLINEJAR%%" org.mozilla.javascript.tools.shell.Main $@ |