ports/184970: [PATCH] lang/groovy: update to 2.2.1

[Radim Kolar]

>Number:         184970
>Category:       ports
>Synopsis:       [PATCH] lang/groovy: update to 2.2.1
>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:   Wed Dec 18 16:31:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Radim Kolar
>Release:        FreeBSD 10.0-RC1 i386
>Organization:
>Environment:
System: FreeBSD fbsd9.localdomain 10.0-RC1 FreeBSD 10.0-RC1 #0 r259101: Tue Dec 10 19:27:11 CET
>Description:
updated to 2.2.1
added support for staging

Port maintainer (mjs at Bur.st) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- groovy-2.2.1.patch begins here ---
diff -ruN /usr/ports/lang/groovy/Makefile ./Makefile
--- /usr/ports/lang/groovy/Makefile	2013-09-20 21:53:09.000000000 +0200
+++ ./Makefile	2013-12-18 16:47:33.975437064 +0100
@@ -2,10 +2,9 @@
 # $FreeBSD: lang/groovy/Makefile 327741 2013-09-20 19:53:09Z bapt $
 
 PORTNAME=	groovy
-DISTVERSION=	2.0.5
+DISTVERSION=	2.2.1
 CATEGORIES=	lang java
 MASTER_SITES=	http://dist.groovy.codehaus.org/distributions/
-DISTNAME=	groovy-${PORTVERSION}
 DISTFILES=	groovy-binary-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	mjs at Bur.st
@@ -23,7 +22,6 @@
 DATAFILES=	ANTLR-LICENSE.txt ASM-LICENSE.txt CLI-LICENSE.txt JSR223-LICENSE.txt LICENSE.txt conf lib
 SCRIPTFILES=	groovy groovyConsole groovyc groovysh java2groovy startGroovy
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -34,26 +32,26 @@
 SUB_FILES=	set-groovy_home.sed
 
 do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
-	@${INSTALL_DATA} ${WRKSRC}/embeddable/${PORTNAME}-all-${DISTVERSION:U}.jar ${JAVAJARDIR}/${PORTNAME}.jar
+	@${ECHO_MSG} -n ">> Staging JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
+	@${INSTALL_DATA} ${WRKSRC}/embeddable/${PORTNAME}-all-${DISTVERSION:U}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 	@${ECHO_MSG} " [ DONE ]"
-	@${ECHO_MSG} -n ">> Installing data files in ${DATADIR}..."
+	@${ECHO_MSG} -n ">> Staging data files in ${DATADIR}..."
 	@cd ${WRKSRC} \
-	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \; \
-	  && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
+	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${STAGEDIR}${DATADIR}/{} \; \
+	  && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
-	@${ECHO_MSG} -n ">> Installing executables in ${PREFIX}/bin..."
+	@${ECHO_MSG} -n ">> Staging executables in ${PREFIX}/bin..."
 	@${REINPLACE_CMD} -f ${WRKDIR}/set-groovy_home.sed ${WRKSRC}/bin/startGroovy
 .for file in ${SCRIPTFILES}
 	@${ECHO_MSG} -n " ${file}"
-	@${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${PREFIX}/bin/
+	@${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
 .if ${PORT_OPTIONS:MDOCS}
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
+	@${ECHO_MSG} -n ">> Staging documentation in ${DOCSDIR}..."
 	@cd ${WRKSRC} \
-	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
-	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
+	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 
diff -ruN /usr/ports/lang/groovy/distinfo ./distinfo
--- /usr/ports/lang/groovy/distinfo	2012-12-29 01:05:40.000000000 +0100
+++ ./distinfo	2013-12-18 16:01:34.565767108 +0100
@@ -1,4 +1,4 @@
-SHA256 (groovy-binary-2.0.5.zip) = 1d0d6b8054a2347c2a53e3dbb6f96502fd4762837daff6c86decddf0bb3496c0
-SIZE (groovy-binary-2.0.5.zip) = 28341029
-SHA256 (groovy-docs-2.0.5.zip) = 067820d5da7aadc19469199370c2b1de22b585d78fd3c588db546658d3e41c54
-SIZE (groovy-docs-2.0.5.zip) = 17600013
+SHA256 (groovy-binary-2.2.1.zip) = 11262c2a0883018d4c68d353479a84bf32a694706437a31b23e17e3f2db695dc
+SIZE (groovy-binary-2.2.1.zip) = 29669397
+SHA256 (groovy-docs-2.2.1.zip) = 6eae39c07a6d2cf492105bd782090ced4e1542f714c478ddd5644fc5529d337a
+SIZE (groovy-docs-2.2.1.zip) = 27031538
--- groovy-2.2.1.patch ends here ---

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