From e87e3d893f84b202d199372ab7dec2ad9abb7411 Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Wed, 6 Sep 2006 19:32:44 +0000
Subject: Update to the 20060906 snapshot of GCC 4.2.0.  This is getting pretty
 close to the start of the GCC 4.2 release branch, and removes another
 namespace pollution issue.

---
 lang/gcc/Makefile  |  4 ++--
 lang/gcc/distinfo  | 36 ++++++++++++++++++------------------
 lang/gcc/pkg-plist |  1 -
 3 files changed, 20 insertions(+), 21 deletions(-)

(limited to 'lang/gcc')

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 352a40b4a086..fcf03fed6d74 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060826
+PORTREVISION=	20060906
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -103,7 +103,7 @@ PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
 .if ! defined(WITHOUT_JAVA)
-CONFLICTS=	gcc-4.1.*
+CONFLICTS+=	gcc-4.1.*
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 84585acc5e97..806058e3c737 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20060826.tar.bz2) = 17143463c4945ef18044f45f5be92a7f
-SHA256 (gcc-core-4.2-20060826.tar.bz2) = 8ef3aff4a6dceef1ba5d8fdab8df8624b7be7ed6fa3ae1e08b2c22cf8176c711
-SIZE (gcc-core-4.2-20060826.tar.bz2) = 15742144
-MD5 (gcc-g++-4.2-20060826.tar.bz2) = b5c4245646ad84f464634e46da376560
-SHA256 (gcc-g++-4.2-20060826.tar.bz2) = a2c943848cf9f256135e4401aa0867f4bc5bf44049ea2dc7e475483a67ff527b
-SIZE (gcc-g++-4.2-20060826.tar.bz2) = 4734841
-MD5 (gcc-objc-4.2-20060826.tar.bz2) = a76f859aadfef285026b876299e4c675
-SHA256 (gcc-objc-4.2-20060826.tar.bz2) = a16fc5850a8bedbce09057da34cd49d003c6d8057264988a7eb37a5b99b33204
-SIZE (gcc-objc-4.2-20060826.tar.bz2) = 192075
-MD5 (gcc-testsuite-4.2-20060826.tar.bz2) = 3a840bb3b3b580ac8dd8cd9884fa0383
-SHA256 (gcc-testsuite-4.2-20060826.tar.bz2) = ee5c82c8f7ca202c5349bca9ae5075bb0b2b296e77a10e9d8f79a210add55905
-SIZE (gcc-testsuite-4.2-20060826.tar.bz2) = 3737362
-MD5 (gcc-fortran-4.2-20060826.tar.bz2) = b8c51970cad74c802a512fca6311ddd2
-SHA256 (gcc-fortran-4.2-20060826.tar.bz2) = 873593b6cc0e8efbf3eb064f7ffc12bdec0cff45301f50bfb04826b049902e11
-SIZE (gcc-fortran-4.2-20060826.tar.bz2) = 834165
-MD5 (gcc-java-4.2-20060826.tar.bz2) = f0490db6c2b87480775e6af2f02a92e2
-SHA256 (gcc-java-4.2-20060826.tar.bz2) = 994048a55d88e124e2ecd7d99695d694c391873676aa58e63b7971497f86f727
-SIZE (gcc-java-4.2-20060826.tar.bz2) = 10393627
+MD5 (gcc-core-4.2-20060906.tar.bz2) = d2b9fc8e612a003be9d490b78b128ae9
+SHA256 (gcc-core-4.2-20060906.tar.bz2) = 01f262669da9d15843a516a6d39ba5e430dbd12ec573bb3709105f73ebc524e7
+SIZE (gcc-core-4.2-20060906.tar.bz2) = 15770647
+MD5 (gcc-g++-4.2-20060906.tar.bz2) = 738a2e987ba3c73dca681657ee33c8d2
+SHA256 (gcc-g++-4.2-20060906.tar.bz2) = 510a1663356cefefde8b8027e93737090b96a49631f8b4196677ad9e6f27b7f0
+SIZE (gcc-g++-4.2-20060906.tar.bz2) = 4735653
+MD5 (gcc-objc-4.2-20060906.tar.bz2) = f5ebdddb7d15484da95457e10b8babbd
+SHA256 (gcc-objc-4.2-20060906.tar.bz2) = dbe1c9c7be88aef4835ce4f5a30458c1ee7088bc36ae796f4cfb1da443f7121f
+SIZE (gcc-objc-4.2-20060906.tar.bz2) = 191967
+MD5 (gcc-testsuite-4.2-20060906.tar.bz2) = 2283880f3081f819f8ab41c8fa628be0
+SHA256 (gcc-testsuite-4.2-20060906.tar.bz2) = 54c51a4d0296f5072ee178587024cc7b68285cf8638aa934080285c329f612de
+SIZE (gcc-testsuite-4.2-20060906.tar.bz2) = 3750303
+MD5 (gcc-fortran-4.2-20060906.tar.bz2) = 0b13b49808787b9359d707034aecf682
+SHA256 (gcc-fortran-4.2-20060906.tar.bz2) = 8843c636d8b95cadd5d52ae2571739ec1fa09c279de3987d29c3d183a9b45657
+SIZE (gcc-fortran-4.2-20060906.tar.bz2) = 834798
+MD5 (gcc-java-4.2-20060906.tar.bz2) = 5419044a1d5657a8d0a835472d828ea1
+SHA256 (gcc-java-4.2-20060906.tar.bz2) = 79d26c70502979be44c76762d861c885a39d0a5e5045e414d604a20f8d0d6987
+SIZE (gcc-java-4.2-20060906.tar.bz2) = 10398173
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index b6abf26b89c4..fe2ba33ce2cd 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -9,7 +9,6 @@ bin/%%GNU_HOST%%-c++%%SUFFIX%%
 bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-include/omp.h
 info/gcc%%SUFFIX%%/dir
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0