Index: lang/gcc45/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/gcc45/Makefile,v
retrieving revision 1.433
diff -u -r1.433 Makefile
--- lang/gcc45/Makefile	19 Apr 2010 10:43:25 -0000	1.433
+++ lang/gcc45/Makefile	20 Apr 2010 13:57:37 -0000
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.5.1.20100415
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -92,12 +92,17 @@
 		gcc${SUFFIX}/libgomp
 
 .if ! defined(WITHOUT_JAVA)
-DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
+ECJ_JAR=	ecj-4.5.jar
+MASTER_SITES+=	${MASTER_SITE_SOURCEWARE:S|$|:ecj|}
+MASTER_SITE_SUBDIR+=	java/:ecj
+DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
+		${ECJ_JAR}:ecj
+EXTRACT_ONLY=	${DISTFILES:S|${ECJ_JAR}:ecj||}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 # FIXME: we are currently getting weird build failures with libjava on
 # some 4.x and 5.x systems, which the following works around. PR 81788.
-CONFIGURE_ARGS+=--disable-rpath
+CONFIGURE_ARGS+=--disable-rpath --enable-libgcj
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
@@ -126,6 +131,10 @@
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
+
+# Preps the source tree for the gcj build
+post-patch::
+	@${CP} ${DISTDIR}/${ECJ_JAR} ${SRCDIR}/ecj.jar
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
@@ -134,7 +143,8 @@
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 
-post-patch:
+
+post-patch::
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
 
Index: lang/gcc45/distinfo
===================================================================
RCS file: /home/pcvs/ports/lang/gcc45/distinfo,v
retrieving revision 1.306
diff -u -r1.306 distinfo
--- lang/gcc45/distinfo	18 Apr 2010 16:46:04 -0000	1.306
+++ lang/gcc45/distinfo	20 Apr 2010 13:57:37 -0000
@@ -13,3 +13,6 @@
 MD5 (gcc-java-4.5-20100415.tar.bz2) = 3f29ee2371bcb39b3e7c3f49df5e1dcc
 SHA256 (gcc-java-4.5-20100415.tar.bz2) = cf2e73f42230b9a77b11bb82a51c8f9bd4841ef68fa6dcfde564d96d477a8623
 SIZE (gcc-java-4.5-20100415.tar.bz2) = 18542450
+MD5 (ecj-4.5.jar) = d7cd6a27c8801e66cbaa964a039ecfdb
+SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
+SIZE (ecj-4.5.jar) = 1470676
Index: lang/gcc45/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/lang/gcc45/pkg-plist,v
retrieving revision 1.106
diff -u -r1.106 pkg-plist
--- lang/gcc45/pkg-plist	28 Dec 2009 11:39:48 -0000	1.106
+++ lang/gcc45/pkg-plist	20 Apr 2010 13:57:37 -0000
@@ -42,6 +42,7 @@
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.5.pc
+%%JAVA%%share/java/ecj.jar
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar
 %%JAVA%%share/python/aotcompile.py