diff options
| author | marino <marino@FreeBSD.org> | 2015-11-11 20:24:01 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2015-11-11 20:24:01 +0800 |
| commit | 657d71f606b69f13d5963558e99109a00e4dad1f (patch) | |
| tree | 5b409d0f4f6336c922102a5baeea34447357c468 | |
| parent | 2ac24b83ebf0b08fb92e6b7d8d28b0d381a47202 (diff) | |
| download | freebsd-ports-gnome-657d71f606b69f13d5963558e99109a00e4dad1f.tar.gz freebsd-ports-gnome-657d71f606b69f13d5963558e99109a00e4dad1f.tar.zst freebsd-ports-gnome-657d71f606b69f13d5963558e99109a00e4dad1f.zip | |
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
| -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: |