From owner-svn-ports-head@FreeBSD.ORG  Fri Sep 14 22:13:10 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E45D01065678;
	Fri, 14 Sep 2012 22:13:10 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CFD878FC19;
	Fri, 14 Sep 2012 22:13:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8EMDA1Y019705;
	Fri, 14 Sep 2012 22:13:10 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8EMDAcI019702;
	Fri, 14 Sep 2012 22:13:10 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201209142213.q8EMDAcI019702@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 14 Sep 2012 22:13:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304301 - in head/java/classpath: . files
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Sep 2012 22:13:11 -0000

Author: jkim
Date: Fri Sep 14 22:13:10 2012
New Revision: 304301
URL: http://svn.freebsd.org/changeset/ports/304301

Log:
  Simplify the previous commit a bit.

Modified:
  head/java/classpath/Makefile
  head/java/classpath/files/ecj.sh.in

Modified: head/java/classpath/Makefile
==============================================================================
--- head/java/classpath/Makefile	Fri Sep 14 22:02:09 2012	(r304300)
+++ head/java/classpath/Makefile	Fri Sep 14 22:13:10 2012	(r304301)
@@ -121,8 +121,7 @@ CONFIGURE_ARGS+=	--disable-examples
 .if ${PORT_OPTIONS:MECJ}
 post-patch:
 	@${SED} -e 's|%%ECJ_JAR%%|${DISTDIR}/${ECJ_JAR}|' \
-	    -e 's|%%JAVA_CMD%%|${JAVA_HOME}/bin/java|' < \
-	    ${FILESDIR}/ecj.sh.in > ${WRKDIR}/ecj
+	    -e 's|%%JAVA%%|${JAVA}|' < ${FILESDIR}/ecj.sh.in > ${WRKDIR}/ecj
 	@${CHMOD} 755 ${WRKDIR}/ecj
 .endif
 

Modified: head/java/classpath/files/ecj.sh.in
==============================================================================
--- head/java/classpath/files/ecj.sh.in	Fri Sep 14 22:02:09 2012	(r304300)
+++ head/java/classpath/files/ecj.sh.in	Fri Sep 14 22:13:10 2012	(r304301)
@@ -1,2 +1,2 @@
 #!/bin/sh
-"%%JAVA_CMD%%" -classpath "%%ECJ_JAR%%" org.eclipse.jdt.internal.compiler.batch.Main "${@:--help}"
+"%%JAVA%%" -classpath "%%ECJ_JAR%%" org.eclipse.jdt.internal.compiler.batch.Main "${@:--help}"