Index: lang/gcc45/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/gcc45/Makefile,v
retrieving revision 1.431
diff -u -r1.431 Makefile
--- lang/gcc45/Makefile	2 Apr 2010 09:15:47 -0000	1.431
+++ lang/gcc45/Makefile	9 Apr 2010 01:51:38 -0000
@@ -8,6 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.5.0.20100401
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -91,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 \
@@ -125,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 "
@@ -133,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.305
diff -u -r1.305 distinfo
--- lang/gcc45/distinfo	2 Apr 2010 09:15:48 -0000	1.305
+++ lang/gcc45/distinfo	9 Apr 2010 01:51:38 -0000
@@ -13,3 +13,6 @@
 MD5 (gcc-java-4.5-20100401.tar.bz2) = be4813559dc36dbdb1e47d38d9c9c161
 SHA256 (gcc-java-4.5-20100401.tar.bz2) = bd6f6f139f07dd013a5bb7e588dfc35ffffba2fe47477224b1e920e060118605
 SIZE (gcc-java-4.5-20100401.tar.bz2) = 18541903
+MD5 (ecj-4.5.jar) = d7cd6a27c8801e66cbaa964a039ecfdb
+SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
+SIZE (ecj-4.5.jar) = 1470676