svn commit: r310702 - head/lang/gcc48

[Gerald Pfeifer]

Author: gerald
Date: Sun Jan 20 16:44:04 2013
New Revision: 310702
URL: http://svnweb.freebsd.org/changeset/ports/310702

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 20130113 snapshot of GCC 4.8.0.
  
  PR:		175072

Modified:
  head/lang/gcc48/Makefile
  head/lang/gcc48/distinfo
  head/lang/gcc48/pkg-plist

Modified: head/lang/gcc48/Makefile
==============================================================================
--- head/lang/gcc48/Makefile	Sun Jan 20 16:28:39 2013	(r310701)
+++ head/lang/gcc48/Makefile	Sun Jan 20 16:44:04 2013	(r310702)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	4.8.0.20130106
+PORTVERSION=	4.8.0.20130113
 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 \
@@ -136,10 +135,6 @@ INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj \
 		gcc${SUFFIX}/libffi
 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/gcc48/distinfo
==============================================================================
--- head/lang/gcc48/distinfo	Sun Jan 20 16:28:39 2013	(r310701)
+++ head/lang/gcc48/distinfo	Sun Jan 20 16:44:04 2013	(r310702)
@@ -1,4 +1,2 @@
-SHA256 (gcc-4.8-20130106.tar.bz2) = 5da1212249d54b907bf515a86e99bcf197123c29fac9d1b6f9955cb157ab7a47
-SIZE (gcc-4.8-20130106.tar.bz2) = 81998118
-SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
-SIZE (ecj-4.5.jar) = 1470676
+SHA256 (gcc-4.8-20130113.tar.bz2) = c0435b2813f29be158becff35a7cdf0202f21e25a504dd76f7c001ff2fec9556
+SIZE (gcc-4.8-20130113.tar.bz2) = 82087685

Modified: head/lang/gcc48/pkg-plist
==============================================================================
--- head/lang/gcc48/pkg-plist	Sun Jan 20 16:28:39 2013	(r310701)
+++ head/lang/gcc48/pkg-plist	Sun Jan 20 16:44:04 2013	(r310702)
@@ -50,7 +50,6 @@ share/gcc-%%GCC_VERSION%%/python/libstdc
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.8.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