svn commit: r401240 - head/lang/jruby

John Marino marino at FreeBSD.org
Wed Nov 11 12:24:02 UTC 2015


Author: marino
Date: Wed Nov 11 12:24:01 2015
New Revision: 401240
URL: https://svnweb.freebsd.org/changeset/ports/401240

Log:
  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

Modified:
  head/lang/jruby/Makefile

Modified: head/lang/jruby/Makefile
==============================================================================
--- head/lang/jruby/Makefile	Wed Nov 11 12:20:12 2015	(r401239)
+++ head/lang/jruby/Makefile	Wed Nov 11 12:24:01 2015	(r401240)
@@ -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:


More information about the svn-ports-all mailing list