From 810f6e822ee5986b3cf23c63d5bb9ec592030503 Mon Sep 17 00:00:00 2001
From: shannonjr <shannonjr@pkgsrc.org>
Date: Wed, 21 Jul 2004 16:03:33 +0000
Subject: Update from 3.4.1 RC1 to 3.4.1 (release). I do not believe that any
 actual changes to the gcc codebase occurred with this delta.

---
 lang/gcc34/Makefile         | 8 +++-----
 lang/gcc34/distinfo         | 8 ++++----
 lang/gcc34/patches/patch-ca | 8 +++++---
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'lang/gcc34')

diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index a35cff05cab..1583ae9e72f 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2004/07/09 22:04:16 seb Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/21 16:03:33 shannonjr Exp $
 #
 
-DISTNAME=	gcc-${GCC_VERSION}-${GCC_VERSION_DATE}
+DISTNAME=	gcc-${GCC_VERSION}
 PKGNAME=	gcc34-${GCC_VERSION}
 CATEGORIES=	lang
-#MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
-MASTER_SITES=	ftp://gcc.gnu.org/pub/gcc/prerelease-${GCC_VERSION}-${GCC_VERSION_DATE}/
+MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	shannonjr@NetBSD.org
@@ -13,7 +12,6 @@ HOMEPAGE=	http://www.gnu.org/software/gcc/gcc.html
 COMMENT=	This is the gcc 3.4 compiler
 
 GCC_VERSION=		3.4.1
-GCC_VERSION_DATE=	20040625
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo
index c6649f7420f..4c64cd856ad 100644
--- a/lang/gcc34/distinfo
+++ b/lang/gcc34/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.2 2004/07/09 20:20:08 drochner Exp $
+$NetBSD: distinfo,v 1.3 2004/07/21 16:03:33 shannonjr Exp $
 
-SHA1 (gcc-3.4.1-20040625.tar.bz2) = b27df941f0a99c20243400d5571562e710fca020
-Size (gcc-3.4.1-20040625.tar.bz2) = 27194129 bytes
+SHA1 (gcc-3.4.1.tar.bz2) = 04de377eff57e614b089b8946a520de0dac7248e
+Size (gcc-3.4.1.tar.bz2) = 27182385 bytes
 SHA1 (patch-ae) = 9b9e4ec15815626c81936460ce834303381f001c
 SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee
 SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715
 SHA1 (patch-ba) = 6fc03fc155f630329f7dc831eece6b6464b453a6
 SHA1 (patch-bb) = aa088194fb073fcde8d2f558ed55ec36106d60d0
+SHA1 (patch-ca) = 771c14ce8cdd9e631694cd19108419f4003a6c08
 SHA1 (patch-function_c) = 64398f40f62ad4c8b9c8f861b802403a4f5aa3be
 SHA1 (patch-libstdc++-v3_configure_host) = f680066ac285cd9cd3fea6713ce3e8a6d0e1c14c
-SHA1 (patch-ca) = ba2dcfb1a7c78247393f478aa666072ad0640c49
 SHA1 (patch-varasm) = 3dfe9a56ebd464d573104511e63dc3599ab5c834
diff --git a/lang/gcc34/patches/patch-ca b/lang/gcc34/patches/patch-ca
index be74f07ad29..bfd2df0998f 100644
--- a/lang/gcc34/patches/patch-ca
+++ b/lang/gcc34/patches/patch-ca
@@ -1,6 +1,8 @@
---- gcc/configure	Thu Jul  1 17:11:06 2004
-+++ gcc/configure.orig	Thu Jul  1 17:03:23 2004
-@@ -7693,7 +7693,7 @@
+$NetBSD: patch-ca,v 1.2 2004/07/21 16:03:33 shannonjr Exp $
+
+--- gcc/configure.orig	2004-04-18 17:45:10.000000000 -0600
++++ gcc/configure
+@@ -7693,7 +7693,7 @@ _ACEOF
    fi
    LIBICONV=
    if test "$am_cv_lib_iconv" = yes; then
-- 
cgit v1.2.3