diff options
| author | John Marino <marino@FreeBSD.org> | 2015-11-11 12:24:01 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2015-11-11 12:24:01 +0000 |
| commit | c73191f87a10de7a0860222b864cc2ec95db39a5 (patch) | |
| tree | 5b409d0f4f6336c922102a5baeea34447357c468 | |
| parent | Update to 0.1.1 (diff) | |
lang/jruby: Don't redefine WRKDIR
This port was establishing WRKDIR over bpm. The reason why wasn't good;
There is a home-grown pattern replacement in the port. I replaced the
custom sed command with REINPLACE_CMD as minimally as I could, and then
removed the WRKDIR redefinition.
Approved by: just fix it
Diffstat (limited to '')
| -rw-r--r-- | lang/jruby/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile index 8e99c2dde244..c10c3d4438aa 100644 --- a/lang/jruby/Makefile +++ b/lang/jruby/Makefile @@ -20,10 +20,9 @@ NO_BUILD= yes USE_JAVA= yes JAVA_VERSION= 1.6+ -WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work JRUBY_HOME?= ${PREFIX}/share/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -REPLACE_FILES= ${WRKSRC}/bin/jruby +REPLACE_FILES= bin/jruby REPLACE_LIST= JAVA_HOME=${JAVA_HOME} REPLACE_LIST_TEMP= ${REPLACE_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} SHEBANG_FILES= rake spec spec_translator Rakefile '*.rb' @@ -54,9 +53,8 @@ post-patch: .for target in ${REPLACE_FILES} @${ECHO_MSG} -n ">> Customizing `basename ${target}`..." - @${SED} ${REPLACE_LIST_TEMP} ${target} > ${WRKDIR}/`basename ${target}` + @${REINPLACE_CMD} -i "" ${REPLACE_LIST_TEMP} ${WRKSRC}/${target} @${ECHO_MSG} " [ DONE ]" - @${MV} ${WRKDIR}/`basename ${target}` ${target} .endfor do-install: |