svn commit: r310720 - head/lang/gcc47

[Gerald Pfeifer]

Author: gerald
Date: Sun Jan 20 22:32:38 2013
New Revision: 310720
URL: http://svnweb.freebsd.org/changeset/ports/310720

Log:
  Use the new lang/gcc-ecj45 port when building the Java frontend
  instead of including a pre-built version of the Eclipse Java Compiler
  (ECJ) ourselves. [1]
  
  On the way, update to the 20130119 snapshot of GCC 4.7.3.
  
  PR:		175072 [1]

Modified:
  head/lang/gcc47/Makefile
  head/lang/gcc47/distinfo

Modified: head/lang/gcc47/Makefile
==============================================================================
--- head/lang/gcc47/Makefile	Sun Jan 20 21:52:54 2013	(r310719)
+++ head/lang/gcc47/Makefile	Sun Jan 20 22:32:38 2013	(r310720)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	4.7.3.20121208
+PORTVERSION=	4.7.3.20130119
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -98,13 +98,12 @@ 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
+ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
+BUILD_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45 \
+		zip:${PORTSDIR}/archivers/zip
+RUN_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
+CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
 LANGUAGES:=	${LANGUAGES},java
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
@@ -134,10 +133,6 @@ 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 "

Modified: head/lang/gcc47/distinfo
==============================================================================
--- head/lang/gcc47/distinfo	Sun Jan 20 21:52:54 2013	(r310719)
+++ head/lang/gcc47/distinfo	Sun Jan 20 22:32:38 2013	(r310720)
@@ -1,4 +1,2 @@
-SHA256 (gcc-4.7-20121208.tar.bz2) = 4ab4ffb1b601fd9e878adae4c41f46f311e06648b2be30109ea8a32c67d50b1b
-SIZE (gcc-4.7-20121208.tar.bz2) = 78906669
-SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
-SIZE (ecj-4.5.jar) = 1470676
+SHA256 (gcc-4.7-20130119.tar.bz2) = 2998f93ee19835a33e32978cb5f2d3be715b8d7ba4164f298d3b050f928e4128
+SIZE (gcc-4.7-20130119.tar.bz2) = 78918084