From 4816b851c70a4d2dc97addfc12cb3ffd4dec2592 Mon Sep 17 00:00:00 2001
From: gerald <gerald@FreeBSD.org>
Date: Thu, 25 Jan 2007 22:29:59 +0000
Subject: Always build with JAR=no to avoid locating an already installed copy
 of jar and thus not laying down our own in $PREFIX/bin/jar42.

Update to the 20070124 snapshot of GCC 4.2.0 on the way.

PR:		108174
Debugged with:	Stephen Montgomery-Smith <stephen@math.missouri.edu>
Tested by:	Stephen Montgomery-Smith <stephen@math.missouri.edu>, db
---
 lang/gcc42/Makefile |  3 ++-
 lang/gcc42/distinfo | 36 ++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 19 deletions(-)

(limited to 'lang')

diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index ca53ec96f11c..9af6a600b152 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20070117
+PORTREVISION=	20070124
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -106,6 +106,7 @@ 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
+MAKE_ENV+=	JAR=no
 MAN1+=		gcj${SUFFIX}.1 \
 		gcj-dbtool${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index c8f8662174fd..0d8545a493f4 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20070117.tar.bz2) = a5c963976a5211670b7341b05ba7220d
-SHA256 (gcc-core-4.2-20070117.tar.bz2) = 05417ffdff5c1d266a6e58787d2d0a98ee4e1190313b66e376d68b4fb82a22ad
-SIZE (gcc-core-4.2-20070117.tar.bz2) = 15926765
-MD5 (gcc-fortran-4.2-20070117.tar.bz2) = f4754ee1b850dcecc669e909f986ca76
-SHA256 (gcc-fortran-4.2-20070117.tar.bz2) = 66fd8965a48e1c4b0bd5f91a3fb2a35355b3062d69e0de7c2373120bc90e5d2a
-SIZE (gcc-fortran-4.2-20070117.tar.bz2) = 885546
-MD5 (gcc-g++-4.2-20070117.tar.bz2) = f714e35344f2c183c2a487d18564c610
-SHA256 (gcc-g++-4.2-20070117.tar.bz2) = 91138eaaa514ef6e8953bacb5e146c5721eb215062a184757e3a479c185cc9a4
-SIZE (gcc-g++-4.2-20070117.tar.bz2) = 4824220
-MD5 (gcc-objc-4.2-20070117.tar.bz2) = d4cf1c1b3732e3db7f1f3bd64e37f779
-SHA256 (gcc-objc-4.2-20070117.tar.bz2) = 431a5e4f07b7820c1be25d04b2aa5a325cb0a84e5847b4644dd497803b388bcf
-SIZE (gcc-objc-4.2-20070117.tar.bz2) = 191806
-MD5 (gcc-testsuite-4.2-20070117.tar.bz2) = ab8ed357a881d3ee9c52ace0cadeb0e1
-SHA256 (gcc-testsuite-4.2-20070117.tar.bz2) = b9665d05eb1e01380fc9f11432af4c040ebb03d8a230b3433efd95c0a121b3ea
-SIZE (gcc-testsuite-4.2-20070117.tar.bz2) = 3793514
-MD5 (gcc-java-4.2-20070117.tar.bz2) = 655ef71fd613f7b1891d96f93880b3f9
-SHA256 (gcc-java-4.2-20070117.tar.bz2) = 592c458cdabcc0f42fe5606fd666e77b9e6a9f6f99dda83bbb9f0001ff3fc261
-SIZE (gcc-java-4.2-20070117.tar.bz2) = 10410094
+MD5 (gcc-core-4.2-20070124.tar.bz2) = 27f4d164d5ef8c5ef40c88e800e275a3
+SHA256 (gcc-core-4.2-20070124.tar.bz2) = a3047bebf20b7ec70e1509279031015a10b3b95dbb7ee3804f5775143582abfa
+SIZE (gcc-core-4.2-20070124.tar.bz2) = 15924410
+MD5 (gcc-fortran-4.2-20070124.tar.bz2) = 0a0699ba1750745ade095e5e9dbbedbc
+SHA256 (gcc-fortran-4.2-20070124.tar.bz2) = 36972666eb1e0a639d09dc4e7bbf1a6f509a933de2d1dc11fb98dd5f896a1768
+SIZE (gcc-fortran-4.2-20070124.tar.bz2) = 892731
+MD5 (gcc-g++-4.2-20070124.tar.bz2) = b7aea613bf85c05a6771013ba8ceed4a
+SHA256 (gcc-g++-4.2-20070124.tar.bz2) = a5995563b0152ffda25fcc08cc443b38e3ed5b5421b151e9efb1cedf98917c03
+SIZE (gcc-g++-4.2-20070124.tar.bz2) = 4824141
+MD5 (gcc-objc-4.2-20070124.tar.bz2) = b3440e713352dd1a40fc1f1d6a49705e
+SHA256 (gcc-objc-4.2-20070124.tar.bz2) = 9d27b940fcbf3be26baccd379aedb4ea68d74c1b4752a8b9b7cff63e87e2a893
+SIZE (gcc-objc-4.2-20070124.tar.bz2) = 191871
+MD5 (gcc-testsuite-4.2-20070124.tar.bz2) = c2670a2238e73d69c30b3ada1b59a6ac
+SHA256 (gcc-testsuite-4.2-20070124.tar.bz2) = 4a82624bf1ec14420320f33409cb8d39bfd5fcc2e05517f85f4967598e1ddbba
+SIZE (gcc-testsuite-4.2-20070124.tar.bz2) = 3800479
+MD5 (gcc-java-4.2-20070124.tar.bz2) = 34e29aeeeaae135dc9d7a3053d4a79c7
+SHA256 (gcc-java-4.2-20070124.tar.bz2) = 0a5271d2c39809039c1756b0da69f94c87f0a0d1cea0fe619b8f7c3bba085bbf
+SIZE (gcc-java-4.2-20070124.tar.bz2) = 10409028
-- 
cgit