From 39c205909268dbd5511b66c1156c3e415e6d1016 Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Sun, 21 Oct 2012 18:21:18 +0000
Subject: [PATCH] Forward port inclusion and use of the Eclipse Java compiler.
 [1]

Update to the 20121013 snapshot of GCC 4.7.3.

Submitted by:	jkim [1]
Feature safe:	yes
---
 lang/gcc47/Makefile  | 13 +++++++++++--
 lang/gcc47/distinfo  |  6 ++++--
 lang/gcc47/pkg-plist |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 4dba442b2866..012da0149e00 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	4.7.3.20120929
+PORTVERSION=	4.7.3.20121013
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-DISTNAME=	gcc-${VERSIONSTRING}
+DISTFILES=	gcc-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.7
@@ -97,6 +97,11 @@ INFO+=		gcc${SUFFIX}/libquadmath	\
 .endif
 
 .if ${PORT_OPTIONS:MJAVA}
+ECJ_JAR=	ecj-4.5.jar
+MASTER_SITES+=	${MASTER_SITE_SOURCEWARE:S|$|:ecj|}
+MASTER_SITE_SUBDIR+=	java/:ecj
+DISTFILES+=	${ECJ_JAR}:ecj
+EXTRACT_ONLY=	${DISTFILES:S|${ECJ_JAR}:ecj||}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 LANGUAGES:=	${LANGUAGES},java
@@ -128,6 +133,10 @@ MAN3=		ffi${SUFFIX}.3 \
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
+
+# Prep 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 "
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 5236cf8cb17f..1c2403f79f50 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,2 +1,4 @@
-SHA256 (gcc-4.7-20120929.tar.bz2) = bd816447e81c422564ad2d98cd6255552f0f3ca1d335b43b2c2858f0d0f91efd
-SIZE (gcc-4.7-20120929.tar.bz2) = 78873496
+SHA256 (gcc-4.7-20121013.tar.bz2) = 9da0e37f6f6aa79ee88150dd8c87b4bfca88f77c176fc013529597f6113e7412
+SIZE (gcc-4.7-20121013.tar.bz2) = 78892306
+SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
+SIZE (ecj-4.5.jar) = 1470676
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 52db8b983629..315b2ee05458 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -50,6 +50,7 @@ share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.7.pc
+%%JAVA%%share/java/ecj.jar
 %%JAVA%%share/java/libgcj-%%GCC_VERSION%%.jar
 %%JAVA%%share/java/libgcj-tools-%%GCC_VERSION%%.jar
 @exec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi