- Rename jar based on version

- Tweak ecj.sh to handle version and compilation
- bump PORTREVISION

Submitted by:	jkim@, glewis@, pitpalme+unix@gmail.com (emails)
Feature safe:	yes

2 files changed, 6 insertions, 5 deletions

diff --git a/java/eclipse-ecj/Makefile b/java/eclipse-ecj/Makefile
index 0b5b8b9e2056..8104e3d31d5a 100644
--- a/java/eclipse-ecj/Makefile
+++ b/java/eclipse-ecj/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ecj
 PORTVERSION=	3.7.2
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	ECLIPSE
 MASTER_SITE_SUBDIR=	R-${PORTVERSION}-${DROPDATE}
@@ -24,16 +25,16 @@ EXTRACT_AFTER_ARGS=	-C ${WRKDIR}
 
 USE_ANT=	yes
 USE_JAVA=	yes
-BUILD_WRKSRC=	${WRKDIR}
 SUB_FILES=	ecj.sh
-SUB_LIST=	JAVAC=${JAVAC}
+SUB_LIST=	PORTVERSION=${PORTVERSION}
+NO_WRKSUBDIR=	yes
 
 DROPDATE=	201202080800
 PLIST_FILES=	bin/${PORTNAME}.sh \
-		%%JAVAJARDIR%%/${PORTNAME}.jar
+		%%JAVAJARDIR%%/${PORTNAME}-${PORTVERSION}.jar
 
 do-install:
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.jar ${JAVAJARDIR}/${PORTNAME}.jar
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.jar ${JAVAJARDIR}/${PORTNAME}-${PORTVERSION}.jar
 	${INSTALL_SCRIPT} ${WRKDIR}/ecj.sh ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/java/eclipse-ecj/files/ecj.sh.in b/java/eclipse-ecj/files/ecj.sh.in
index 9fe6061baabd..825e0a840bb8 100644
--- a/java/eclipse-ecj/files/ecj.sh.in
+++ b/java/eclipse-ecj/files/ecj.sh.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-%%JAVAC%% -classpath %%JAVAJARDIR%%/ecj.jar $1
+%%LOCALBASE%%/bin/java -classpath %%JAVAJARDIR%%/ecj-%%PORTVERSION%%.jar org.eclipse.jdt.internal.compiler.batch.Main ${@:--help}