ports/158438: Update lang/rhino to 1.7R3

[Pedro Giffuni]

>Number:         158438
>Category:       ports
>Synopsis:       Update lang/rhino to 1.7R3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 29 16:10:13 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Pedro Giffuni
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD mogwai.giffuni.net 9.0-CURRENT FreeBSD 9.0-CURRENT #6: Sat Apr 30 01:37:57 PDT 2011     root at build9x64.pcbsd.org:/usr/obj/pcbsd-build90/fbsd-source/9.0/sys/PCBSD  amd64

>Description:
- Minor update
- Add license.
- xmlbeans-2.2.0 is not available anymore on the mastersite, so I
  updated the version to 2.5.0 by hand. This could've been done by
  REINPLACE instead of the patch but it works as is, so I left it
  as an optional exercise for the maintainer. ;-).


>How-To-Repeat:

>Fix:
Patch attached.

Patch attached with submission follows:

diff -ruN rhino.orig/Makefile rhino/Makefile
--- rhino.orig/Makefile	2011-06-29 10:34:10.000000000 +0000
+++ rhino/Makefile	2011-06-29 10:42:31.000000000 +0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rhino
-DISTVERSION=	1_7R2
+DISTVERSION=	1_7R3
 PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	lang java
@@ -16,13 +16,15 @@
 MASTER_SITE_SUBDIR=	xmlbeans/binaries/:xmlbeans
 DISTFILES=	${PORTNAME}${DISTVERSION}.zip:rhino \
 		src.zip:swingex \
-		xmlbeans-2.2.0.zip:xmlbeans
+		xmlbeans-2.5.0.zip:xmlbeans
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${PORTNAME}${DISTVERSION}.zip
 
 MAINTAINER=	nivit at FreeBSD.org
 COMMENT=	An implementation of JavaScript written in Java
 
+LICENSE=	MPL
+
 OPTIONS=	LINEDIT	"Enable line editing in the Rhino shell" on
 
 ALL_TARGET=	jar
@@ -31,7 +33,7 @@
 
 JAVA_VERSION=	1.5+
 
-MAKE_ARGS=	-Dxmlbeans.url=file://${DISTDIR}/${DIST_SUBDIR}/xmlbeans-2.2.0.zip \
+MAKE_ARGS=	-Dxmlbeans.url=file://${DISTDIR}/${DIST_SUBDIR}/xmlbeans-2.5.0.zip \
 		-Dswing-ex-url=file://${DISTDIR}/${DIST_SUBDIR}/src.zip
 
 RHINOJAR=	${DATADIR}/${PORTNAME}.jar
diff -ruN rhino.orig/distinfo rhino/distinfo
--- rhino.orig/distinfo	2011-06-29 10:34:10.000000000 +0000
+++ rhino/distinfo	2011-06-29 10:39:53.000000000 +0000
@@ -1,9 +1,6 @@
-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/rhino1_7R3.zip) = 885b46e24fe5af23ad3712c5e08e8d97d6d92a4b89e1be860e8fe88e4a3dacd1
+SIZE (rhino/rhino1_7R3.zip) = 4651597
 SHA256 (rhino/src.zip) = 062837ddb18951ace41ba0050aec95a690c00190a6218e5c9591c381035dfa7d
 SIZE (rhino/src.zip) = 19708
-MD5 (rhino/xmlbeans-2.2.0.zip) = f279d25e2dccbb524e406543c38b4aae
-SHA256 (rhino/xmlbeans-2.2.0.zip) = 93632a33292340898015074156cfc2904794c26f310cc9cbe7a00524534360dd
-SIZE (rhino/xmlbeans-2.2.0.zip) = 3720924
+SHA256 (rhino/xmlbeans-2.5.0.zip) = e59cde73e71927365536ef2a3c0fd2459ca85be5a9181e79a9447566ffaa3448
+SIZE (rhino/xmlbeans-2.5.0.zip) = 3793583
diff -ruN rhino.orig/files/patch-xmlimplsrc+build.xml rhino/files/patch-xmlimplsrc+build.xml
--- rhino.orig/files/patch-xmlimplsrc+build.xml	1970-01-01 00:00:00.000000000 +0000
+++ rhino/files/patch-xmlimplsrc+build.xml	2011-06-29 10:55:06.000000000 +0000
@@ -0,0 +1,22 @@
+--- 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>


>Release-Note:
>Audit-Trail:
>Unformatted: