From 50818aaf507f32d9c6945506349e571dd5ca5fb2 Mon Sep 17 00:00:00 2001
From: Greg Larkin <glarkin@FreeBSD.org>
Date: Fri, 8 Jan 2010 16:18:57 +0000
Subject: - Moved fetching of ecj.jar from the post-patch target using the  
 contrib/download_ecj script to the fetch phase using extra MASTER_SITES   and
 DISTFILES. Pointyhat does not allow fetching outside of the   fetch phase,
 and the size and checksums of ecj.jar need to be recorded   in distinfo.

Reported by:	pointyhat (pav)
Approved by:	gerald (via private email)
---
 lang/gcc42/Makefile                          | 10 ++++++++--
 lang/gcc42/distinfo                          |  3 +++
 lang/gcc42/files/patch-contrib__download_ecj | 28 ----------------------------
 3 files changed, 11 insertions(+), 30 deletions(-)
 delete mode 100644 lang/gcc42/files/patch-contrib__download_ecj

(limited to 'lang/gcc42')

diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 84280b7a836e..48481cc42f24 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -79,7 +79,12 @@ INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/libgomp
 
 .if ! defined(WITHOUT_JAVA)
-DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
+ECJ_JAR=	ecj-4.3.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
@@ -99,8 +104,9 @@ MAN1+=		gcj${SUFFIX}.1 \
 INFO+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 
+# Preps the source tree for the gcj build
 post-patch::
-	@cd ${SRCDIR} && ${CHMOD} 755 ./contrib/download_ecj && ./contrib/download_ecj
+	@${CP} ${DISTDIR}/${ECJ_JAR} ${SRCDIR}/ecj.jar
 
 .else
 CONFIGURE_ARGS+=--disable-libgcj
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index f3cce8056893..d9353ecc52f5 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -7,6 +7,9 @@ SIZE (gcc-g++-4.2-20090325.tar.bz2) = 4826743
 MD5 (gcc-objc-4.2-20090325.tar.bz2) = 4f90a23bf249df24682e5fc1d4042a23
 SHA256 (gcc-objc-4.2-20090325.tar.bz2) = ed7489522fbfb9ed6be9a028e3fe73018d406e206f4dd9d79b892c4b04bd3366
 SIZE (gcc-objc-4.2-20090325.tar.bz2) = 196233
+MD5 (ecj-4.3.jar) = fd299f26c02268878b5d6c0e86f57c43
+SHA256 (ecj-4.3.jar) = 9de193ea393ed50d868b730bad6916f7a8ef4ba80216f8606d3e1a0dd886e74b
+SIZE (ecj-4.3.jar) = 1377431
 MD5 (gcc-java-4.2-20090325.tar.bz2) = 8559d9452a0ae29b935214b71baf5dfd
 SHA256 (gcc-java-4.2-20090325.tar.bz2) = b5f3c1088e89d605bfee5dbfd25c77dd94b4c583ea7ff4a4c347899a76ce682e
 SIZE (gcc-java-4.2-20090325.tar.bz2) = 10405140
diff --git a/lang/gcc42/files/patch-contrib__download_ecj b/lang/gcc42/files/patch-contrib__download_ecj
deleted file mode 100644
index 799a70c85a73..000000000000
--- a/lang/gcc42/files/patch-contrib__download_ecj
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./contrib/download_ecj.orig	2009-12-10 13:52:02.000000000 -0500
-+++ ./contrib/download_ecj	2009-12-10 13:52:02.000000000 -0500
-@@ -0,0 +1,25 @@
-+#! /bin/sh
-+
-+#
-+# Download the ecj jar file needed by gcj.
-+# Run this from the top level of the gcc source tree and the libjava
-+# build will do the right thing.
-+#
-+# (C) 2006 Free Software Foundation
-+#
-+# This script is Free Software, and it can be copied, distributed and
-+# modified as defined in the GNU General Public License.  A copy of
-+# its license can be downloaded from http://www.gnu.org/copyleft/gpl.html
-+#
-+
-+ftp -n sourceware.org << EOF
-+verbose
-+hash
-+user ftp ''
-+cd /pub/java
-+binary
-+get ecj-latest.jar
-+EOF
-+
-+mv ecj-latest.jar ecj.jar
-+
-- 
cgit v1.2.3