svn commit: r304301 - in head/java/classpath: . files

[Jung-uk Kim]

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}"