ports/121457: [patch] port lang/groovy update to version 1.5.4

[Mitchell Smith]

>Number:         121457
>Category:       ports
>Synopsis:       [patch] port lang/groovy update to version 1.5.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 07 04:30:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Mitchell Smith
>Release:        7.0-RELEASE
>Organization:
>Environment:
FreeBSD mjs-dev.staff.onthenet.com.au 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Sun Feb 24 19:59:52 UTC 2008 root at logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
The current stable release of Groovy from http://groovy.codehaus.org/ is 1.5.4, which is several versions ahead of the version currently avaiable in the ports tree.

>How-To-Repeat:

>Fix:
After exchanging emails with the current maintainer of the Groovy port, I have offered to submit an update to the port and take over future maintenance.

The diff included with this problem report is for the latest stable release of Groovy 1.5.4.


Patch attached with submission follows:

diff -ruN groovy.orig/Makefile groovy/Makefile
--- groovy.orig/Makefile	2007-05-20 06:13:39.000000000 +1000
+++ groovy/Makefile	2008-03-07 12:56:29.000000000 +1000
@@ -6,31 +6,28 @@
 #
 
 PORTNAME=	groovy
-DISTVERSION=	1.0-jsr-06
-PORTREVISION=	1
+DISTVERSION=	1.5.4
 CATEGORIES=	lang java
-MASTER_SITES=	http://dist.codehaus.org/groovy/distributions/
+MASTER_SITES=	http://dist.groovy.codehaus.org/distributions/
+DISTNAME=	groovy-${PORTVERSION}
+DISTFILES=	groovy-binary-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	hq at FreeBSD.org
+MAINTAINER=	mjs at Bur.st
 COMMENT=	Agile dynamic language for the JVM
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:U}
 
+USE_ZIP=yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-DATAFILES=	LICENSE.txt conf ${PORTNAME}-${DISTVERSION:U}.jar lib
-SCRIPTFILES=	grok groovy groovyConsole groovyc groovysh startGroovy
+DATAFILES=	ASM-LICENSE.txt LICENSE.txt conf lib
+SCRIPTFILES=	groovy groovyConsole groovyc groovysh java2groovy startGroovy
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	changelog-report.html cvs-usage.html dependencies.html \
-		developer-activity-report.html downloads.html faq.html \
-		file-activity-report.html groovy-jdk.html images index.html \
-		issue-tracking.html jdepend-report.html junit-report.html \
-		license.html mail-lists.html maven-reports.html \
-		pmd-report.html project-info.html style team-list.html xref \
-		xref-test
+DISTFILES+=	groovy-docs-${PORTVERSION}${EXTRACT_SUFX}
+PORTDOCS= html pdf
 .endif
 PLIST_FILES=	${SCRIPTFILES:S,^,bin/,} %%JAVAJARDIR%%/${PORTNAME}.jar
 SUB_FILES=	set-groovy_home.sed
@@ -53,9 +50,9 @@
 	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@cd ${WRKSRC}/docs \
-	  && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+	@cd ${WRKSRC} \
+	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
+	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 
diff -ruN groovy.orig/distinfo groovy/distinfo
--- groovy.orig/distinfo	2006-07-05 19:48:49.000000000 +1000
+++ groovy/distinfo	2008-03-07 12:38:50.000000000 +1000
@@ -1,3 +1,6 @@
-MD5 (groovy-1.0-jsr-06.tar.gz) = 10fefa29c8ea39e74b46d992aa108fa0
-SHA256 (groovy-1.0-jsr-06.tar.gz) = 3b34e85ce2c6f44c891f393ac7b689de4d2de849f13b3a7b7d871706dbc8dbbb
-SIZE (groovy-1.0-jsr-06.tar.gz) = 11293447
+MD5 (groovy-binary-1.5.4.zip) = dbcb0a1d326395768f5653b925779ce4
+SHA256 (groovy-binary-1.5.4.zip) = c9be0a7b0184aa514ce0596642d490694206af48c16d7f45da8618b5f735cbd2
+SIZE (groovy-binary-1.5.4.zip) = 7812093
+MD5 (groovy-docs-1.5.4.zip) = f58a68d70fe7b145463773e4fadb6f98
+SHA256 (groovy-docs-1.5.4.zip) = 1b5c8762bca3cf1ad11dded8c11b55114ae3864c9a01657821660362fbd6c602
+SIZE (groovy-docs-1.5.4.zip) = 8356670


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