diff options
| author | Herve Quiroz <hq@FreeBSD.org> | 2006-07-05 09:48:49 +0000 |
|---|---|---|
| committer | Herve Quiroz <hq@FreeBSD.org> | 2006-07-05 09:48:49 +0000 |
| commit | 88ccac22d2dd43c2d13c425264728704f5ea3d1b (patch) | |
| tree | c05a91343216edbd2917a052949cc4aca797064c /lang/groovy | |
| parent | readd drac checksums (diff) | |
- Update to 1.0-jsr-06 [1]
- Set GROOVY_HOME only when not already defined
- Set JAVA_HOME when not already defined, using feature from javavmwrapper 2.2
Reported by: portscout [1]
Notes
Notes:
svn path=/head/; revision=166975
Diffstat (limited to 'lang/groovy')
| -rw-r--r-- | lang/groovy/Makefile | 8 | ||||
| -rw-r--r-- | lang/groovy/distinfo | 6 | ||||
| -rw-r--r-- | lang/groovy/files/set-groovy_home.sed.in | 4 |
3 files changed, 11 insertions, 7 deletions
diff --git a/lang/groovy/Makefile b/lang/groovy/Makefile index 7e42ac38b896..9fe049b1e641 100644 --- a/lang/groovy/Makefile +++ b/lang/groovy/Makefile @@ -6,18 +6,20 @@ # PORTNAME= groovy -DISTVERSION= 1.0-jsr-05 +DISTVERSION= 1.0-jsr-06 CATEGORIES= lang java MASTER_SITES= http://dist.codehaus.org/groovy/distributions/ MAINTAINER= hq@FreeBSD.org COMMENT= Agile dynamic language for the JVM +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:U} + USE_JAVA= yes JAVA_VERSION= 1.4+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} -DATAFILES= LICENSE.txt conf ${PORTNAME}-${DISTVERSION}.jar lib +DATAFILES= LICENSE.txt conf ${PORTNAME}-${DISTVERSION:U}.jar lib SCRIPTFILES= grok groovy groovyConsole groovyc groovysh startGroovy .if !defined(NOPORTDOCS) @@ -34,7 +36,7 @@ SUB_FILES= set-groovy_home.sed do-install: @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..." - @${INSTALL_DATA} ${WRKSRC}/embeddable/${PORTNAME}-all-${DISTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar + @${INSTALL_DATA} ${WRKSRC}/embeddable/${PORTNAME}-all-${DISTVERSION:U}.jar ${JAVAJARDIR}/${PORTNAME}.jar @${ECHO_MSG} " [ DONE ]" @${ECHO_MSG} -n ">> Installing data files in ${DATADIR}..." @cd ${WRKSRC} \ diff --git a/lang/groovy/distinfo b/lang/groovy/distinfo index e2fd28765a2e..4993a8460abc 100644 --- a/lang/groovy/distinfo +++ b/lang/groovy/distinfo @@ -1,3 +1,3 @@ -MD5 (groovy-1.0-jsr-05.tar.gz) = f98bdbfbfbfc440452e44be146f60d2f -SHA256 (groovy-1.0-jsr-05.tar.gz) = a64931fe7f23cc09384a47f4f9fe4b5e7190def15d0500d91e5e84d93f1849ad -SIZE (groovy-1.0-jsr-05.tar.gz) = 11173958 +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 diff --git a/lang/groovy/files/set-groovy_home.sed.in b/lang/groovy/files/set-groovy_home.sed.in index 9f8d3300a1f2..83c934b91272 100644 --- a/lang/groovy/files/set-groovy_home.sed.in +++ b/lang/groovy/files/set-groovy_home.sed.in @@ -1,3 +1,5 @@ # $FreeBSD$ 14i\ -GROOVY_HOME="${GROOVY_HOME:-"%%DATADIR%%"}" +: ${GROOVY_HOME="%%DATADIR%%"} +14i\ +[ -z "${JAVA_HOME}" ] && JAVA_HOME="`env JAVAVM_DRYRUN=yes %%LOCALBASE%%/bin/java | grep '^JAVA_HOME' | cut -c11-`" |