From owner-svn-ports-head@FreeBSD.ORG  Fri Sep 14 21:56:21 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 9E73E1065673;
	Fri, 14 Sep 2012 21:56:21 +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 7F7E28FC0C;
	Fri, 14 Sep 2012 21:56:21 +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 q8ELuLfq016902;
	Fri, 14 Sep 2012 21:56:21 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8ELuLri016898;
	Fri, 14 Sep 2012 21:56:21 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201209142156.q8ELuLri016898@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 14 Sep 2012 21:56:21 +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: r304299 - 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 21:56:21 -0000

Author: jkim
Date: Fri Sep 14 21:56:20 2012
New Revision: 304299
URL: http://svn.freebsd.org/changeset/ports/304299

Log:
  Add an option to build with Eclipse Java Compiler.  It also adds
  com.sun.tools.javac implementation in tools.zip.  Turned off by default.

Added:
  head/java/classpath/files/ecj.sh.in   (contents, props changed)
Modified:
  head/java/classpath/Makefile
  head/java/classpath/distinfo

Modified: head/java/classpath/Makefile
==============================================================================
--- head/java/classpath/Makefile	Fri Sep 14 21:36:26 2012	(r304298)
+++ head/java/classpath/Makefile	Fri Sep 14 21:56:20 2012	(r304299)
@@ -12,6 +12,7 @@ CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	A GNU project to create a free Java class library
@@ -55,14 +56,27 @@ INFO=		cp-hacking cp-tools cp-vmintegrat
 
 CONFLICTS=	sablevm-classpath-*
 
-OPTIONS_DEFINE=	CAIRO GCONF GTK2 QT4
+OPTIONS_DEFINE=	CAIRO ECJ GCONF GTK2 QT4
 OPTIONS_DEFAULT=GTK2
 CAIRO_DESC=	Use Gtk+ Cairo based Graphics2D
+ECJ_DESC=	Build with Eclipse Java Compiler
 GTK2_DESC=	Enable Gtk+ AWT peer
 QT4_DESC=	Enable Qt AWT peer
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MECJ}
+ECJ_VERSION=		4.2
+ECJ_DROPDATE=		201206081400
+ECJ_JAR=		ecj-${ECJ_VERSION}.jar
+ECJ_SUBDIR=		R-${ECJ_VERSION}-${ECJ_DROPDATE}
+MASTER_SITES+=		http://download.eclipse.org/eclipse/downloads/drops4/${ECJ_SUBDIR}/:ecj
+DISTFILES+=		${ECJ_JAR}:ecj
+CONFIGURE_ARGS+=	--with-ecj-jar="${DISTDIR}/${ECJ_JAR}"
+CONFIGURE_ENV+=		PATH="${WRKDIR}:${PATH}"
+MAKE_ENV+=		PATH="${WRKDIR}:${PATH}"
+.endif
+
 .if ${PORT_OPTIONS:MGCONF}
 USE_GNOME+=		gconf2
 CONFIGURE_ARGS+=	--enable-default-preferences-peer=gconf
@@ -104,4 +118,12 @@ EXAMPLESDIR=		${DATADIR}/examples
 CONFIGURE_ARGS+=	--disable-examples
 .endif
 
+.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
+	@${CHMOD} 755 ${WRKDIR}/ecj
+.endif
+
 .include <bsd.port.mk>

Modified: head/java/classpath/distinfo
==============================================================================
--- head/java/classpath/distinfo	Fri Sep 14 21:36:26 2012	(r304298)
+++ head/java/classpath/distinfo	Fri Sep 14 21:56:20 2012	(r304299)
@@ -1,2 +1,4 @@
 SHA256 (classpath-0.99.tar.gz) = f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8
 SIZE (classpath-0.99.tar.gz) = 11078232
+SHA256 (ecj-4.2.jar) = 9694970ac1f8a4a2774b7f64f6be535dc46e25dbecb71d36007b8af2bdce1001
+SIZE (ecj-4.2.jar) = 1796149

Added: head/java/classpath/files/ecj.sh.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/classpath/files/ecj.sh.in	Fri Sep 14 21:56:20 2012	(r304299)
@@ -0,0 +1,2 @@
+#!/bin/sh
+"%%JAVA_CMD%%" -classpath "%%ECJ_JAR%%" org.eclipse.jdt.internal.compiler.batch.Main "${@:--help}"