diff --git a/www/grails/Makefile b/www/grails/Makefile index b186ae4b6c2e..220bb64a5a11 100644 --- a/www/grails/Makefile +++ b/www/grails/Makefile @@ -6,7 +6,7 @@ # PORTNAME= grails -DISTVERSION= 1.2.1 +DISTVERSION= 1.2.2 CATEGORIES= www java MASTER_SITES= http://dist.codehaus.org/grails/ DISTNAME= ${PORTNAME}-${PORTVERSION} @@ -31,7 +31,7 @@ PORTDOCS= api guide index.html css img ref PLIST_FILES= ${SCRIPTFILES:S,^,bin/,} \ ${SCRIPTFILES:S,^,${DATADIR:S,${PREFIX}/,,}/bin/,} PLIST_DIRS= ${DATADIR:S,${PREFIX}/,,}/bin -SUB_FILES= set-grails_home.sed pkg-message +SUB_FILES= edit-startGrails.sed pkg-message do-install: @${ECHO_MSG} -n ">> Installing data files in ${DATADIR}..." @@ -41,7 +41,7 @@ do-install: @${ECHO_MSG} " [ DONE ]" @${ECHO_MSG} -n ">> Installing and symlinking executables..." @${MKDIR} ${DATADIR}/bin - @${REINPLACE_CMD} -f ${WRKDIR}/set-grails_home.sed ${WRKSRC}/bin/startGrails + @${REINPLACE_CMD} -f ${WRKDIR}/edit-startGrails.sed ${WRKSRC}/bin/startGrails .for file in ${SCRIPTFILES} @${ECHO_MSG} -n " ${file}" @${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${DATADIR}/bin/${file} diff --git a/www/grails/distinfo b/www/grails/distinfo index 079f584d94e0..b99219269bcd 100644 --- a/www/grails/distinfo +++ b/www/grails/distinfo @@ -1,3 +1,3 @@ -MD5 (grails-1.2.1.zip) = d82553956c8249906d247172cfea9e55 -SHA256 (grails-1.2.1.zip) = 933a96f324824ebb58a99cb526d597d051941dd52b713cd03d44cc8a4f9ca642 -SIZE (grails-1.2.1.zip) = 48385758 +MD5 (grails-1.2.2.zip) = dcfe25c2425ec86e47dea7722b44c744 +SHA256 (grails-1.2.2.zip) = 9154c603c2ae3aade28c9bd21171c1632ec08817d056e3f80bf0b86220b1b261 +SIZE (grails-1.2.2.zip) = 48488122 diff --git a/www/grails/files/set-grails_home.sed.in b/www/grails/files/edit-startGrails.sed.in similarity index 83% rename from www/grails/files/set-grails_home.sed.in rename to www/grails/files/edit-startGrails.sed.in index a018b404b533..6bd955f86e52 100644 --- a/www/grails/files/set-grails_home.sed.in +++ b/www/grails/files/edit-startGrails.sed.in @@ -3,3 +3,5 @@ : ${GRAILS_HOME="%%DATADIR%%"} 14i\ [ -z "${JAVA_HOME}" ] && JAVA_HOME="`env JAVAVM_DRYRUN=yes %%LOCALBASE%%/bin/java | grep '^JAVA_HOME' | cut -c11-`" +231c\ +\ if [ -n "$GRAILS_OPTS" ]