From owner-svn-ports-all@freebsd.org  Wed Nov 11 12:24:02 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B207BA2B627;
 Wed, 11 Nov 2015 12:24:02 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 77D151DB4;
 Wed, 11 Nov 2015 12:24:02 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tABCO1HS087925;
 Wed, 11 Nov 2015 12:24:01 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tABCO1wO087924;
 Wed, 11 Nov 2015 12:24:01 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201511111224.tABCO1wO087924@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Wed, 11 Nov 2015 12:24:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r401240 - head/lang/jruby
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Nov 2015 12:24:02 -0000

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: