aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authornivit <nivit@FreeBSD.org>2012-07-06 05:45:01 +0800
committernivit <nivit@FreeBSD.org>2012-07-06 05:45:01 +0800
commitf897da5b3c4c36abaa97f57db7c75d02134ec06f (patch)
tree2225befb8920ed5e8dff85762a1389d4493b3c58 /lang
parent2ce8252fdc5de0ed456efb350c92ac0689417e56 (diff)
downloadfreebsd-ports-gnome-f897da5b3c4c36abaa97f57db7c75d02134ec06f.tar.gz
freebsd-ports-gnome-f897da5b3c4c36abaa97f57db7c75d02134ec06f.tar.zst
freebsd-ports-gnome-f897da5b3c4c36abaa97f57db7c75d02134ec06f.zip
- Update to 1.7.r4
- Remove files/patch-xmlimplsrc+build.xml - Convert to the new options framework - Update MASTER_SITES
Diffstat (limited to 'lang')
-rw-r--r--lang/rhino/Makefile19
-rw-r--r--lang/rhino/distinfo4
-rw-r--r--lang/rhino/files/patch-xmlimplsrc+build.xml22
-rw-r--r--lang/rhino/files/rhinosh.in2
4 files changed, 15 insertions, 32 deletions
diff --git a/lang/rhino/Makefile b/lang/rhino/Makefile
index e6d82cd68264..125c28ddb9f5 100644
--- a/lang/rhino/Makefile
+++ b/lang/rhino/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= rhino
-DISTVERSION= 1_7R3
+DISTVERSION= 1_7R4
CATEGORIES= lang java
-MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla.org/js/:rhino \
+MASTER_SITES= http://cloud.github.com/downloads/mozilla/rhino/:rhino \
http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/:swingex \
- http://www.apache.org/dist/xmlbeans/binaries/:xmlbeans
+ ${MASTER_SITE_APACHE}:xmlbeans
MASTER_SITE_SUBDIR= xmlbeans/binaries/:xmlbeans
DISTFILES= ${PORTNAME}${DISTVERSION}.zip:rhino \
src.zip:swingex \
@@ -23,8 +23,6 @@ COMMENT= An implementation of JavaScript written in Java
LICENSE= MPL
-OPTIONS= LINEDIT "Enable line editing in the Rhino shell" on
-
ALL_TARGET= jar
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
@@ -34,10 +32,17 @@ JAVA_VERSION= 1.5+
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
+
+.include <bsd.port.options.mk>
+
RHINOJAR= ${DATADIR}/${PORTNAME}.jar
SUB_FILES= rhinoc rhinodbg rhinosh
-SUB_LIST= RHINOJAR=${RHINOJAR} JLINEJAR=":${JLINEJAR}"
+SUB_LIST= RHINOJAR=${RHINOJAR} JLINEJAR="${JLINEJAR}"
USE_ANT= yes
USE_JAVA= yes
@@ -55,7 +60,7 @@ do-install:
.include <bsd.port.pre.mk>
-.if defined(WITH_LINEDIT)
+.if ${PORT_OPTIONS:MLINEDIT}
JLINEJAR= ${JAVAJARDIR}/jline.jar
RUN_DEPENDS+= ${JLINEJAR}:${PORTSDIR}/devel/jline
.else
diff --git a/lang/rhino/distinfo b/lang/rhino/distinfo
index 1dd9d880925e..a1bbb17d5538 100644
--- a/lang/rhino/distinfo
+++ b/lang/rhino/distinfo
@@ -1,5 +1,5 @@
-SHA256 (rhino/rhino1_7R3.zip) = 885b46e24fe5af23ad3712c5e08e8d97d6d92a4b89e1be860e8fe88e4a3dacd1
-SIZE (rhino/rhino1_7R3.zip) = 4651597
+SHA256 (rhino/rhino1_7R4.zip) = 9eb08f85bbe7c8e0b9eaffb1cf4984b31fb679f3c8a682acc3bb8ac20626c61e
+SIZE (rhino/rhino1_7R4.zip) = 6481918
SHA256 (rhino/src.zip) = 062837ddb18951ace41ba0050aec95a690c00190a6218e5c9591c381035dfa7d
SIZE (rhino/src.zip) = 19708
SHA256 (rhino/xmlbeans-2.5.0.zip) = e59cde73e71927365536ef2a3c0fd2459ca85be5a9181e79a9447566ffaa3448
diff --git a/lang/rhino/files/patch-xmlimplsrc+build.xml b/lang/rhino/files/patch-xmlimplsrc+build.xml
deleted file mode 100644
index 7a339752778d..000000000000
--- a/lang/rhino/files/patch-xmlimplsrc+build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
---- xmlimplsrc/build.xml.orig 2011-05-09 20:04:38.000000000 +0000
-+++ xmlimplsrc/build.xml 2011-06-29 10:54:38.000000000 +0000
-@@ -147,7 +147,7 @@
- <target name="xmlbeans-get" unless="xmlbeans-zip-present?">
- <property
- name="xmlbeans.url"
-- value="http://www.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"
-+ value="http://www.apache.org/dist/xmlbeans/binaries/xmlbeans-2.5.0.zip"
- />
-
- <mkdir dir="${xmlbeans.tmp}" />
-@@ -157,8 +157,8 @@
- <target name="xmlbeans-unzip" unless="xmlbeans-present?">
- <antcall target="xmlbeans-get" />
- <unzip src="${xmlbeans.zip}" dest="${xmlbeans.tmp}" />
-- <copy tofile="${xbean.jar}" file="${xmlbeans.tmp}/xmlbeans-2.2.0/lib/xbean.jar" />
-- <copy tofile="${jsr173.jar}" file="${xmlbeans.tmp}/xmlbeans-2.2.0/lib/jsr173_1.0_api.jar" />
-+ <copy tofile="${xbean.jar}" file="${xmlbeans.tmp}/xmlbeans-2.5.0/lib/xbean.jar" />
-+ <copy tofile="${jsr173.jar}" file="${xmlbeans.tmp}/xmlbeans-2.5.0/lib/jsr173_1.0_api.jar" />
- <delete dir="${xmlbeans.tmp}" />
- </target>
- </project>
diff --git a/lang/rhino/files/rhinosh.in b/lang/rhino/files/rhinosh.in
index c883104509f6..8fb62b47d453 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%%%%JLINEJAR%%" org.mozilla.javascript.tools.shell.Main $@
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%:%%JLINEJAR%%" org.mozilla.javascript.tools.shell.Main $@