From 9a9e58738573298bd08a5da2c17ea7f5c065cf5d Mon Sep 17 00:00:00 2001
From: hq <hq@FreeBSD.org>
Date: Sat, 8 Mar 2008 11:10:39 +0000
Subject: - Update to 1.5.4 - Pass maintainership to submitter

PR:		121457
Submitted by:	Mitchell Smith <mjs@bur.st>
---
 lang/groovy/Makefile | 31 ++++++++++++++-----------------
 lang/groovy/distinfo |  9 ++++++---
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'lang')

diff --git a/lang/groovy/Makefile b/lang/groovy/Makefile
index 84ae295a8fd1..e61b12b1cef6 100644
--- a/lang/groovy/Makefile
+++ b/lang/groovy/Makefile
@@ -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@FreeBSD.org
+MAINTAINER=	mjs@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 @@ do-install:
 	@${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 --git a/lang/groovy/distinfo b/lang/groovy/distinfo
index 4993a8460abc..21f19df2e85b 100644
--- a/lang/groovy/distinfo
+++ b/lang/groovy/distinfo
@@ -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
-- 
cgit