From 6597df538a2950d036676203b5968432cf06ff02 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Mon, 11 Aug 2003 14:15:58 +0000
Subject: update to 3.3.1

---
 lang/gcc3-java/Makefile         |  6 +++---
 lang/gcc3-java/distinfo         |  7 +++----
 lang/gcc3-java/patches/patch-ba | 16 ----------------
 3 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 lang/gcc3-java/patches/patch-ba

(limited to 'lang/gcc3-java')

diff --git a/lang/gcc3-java/Makefile b/lang/gcc3-java/Makefile
index 171d013f287..d1bce1e0525 100644
--- a/lang/gcc3-java/Makefile
+++ b/lang/gcc3-java/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2003/08/08 09:31:03 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/08/11 14:16:05 drochner Exp $
 #
 
-PKGNAME=		gcc3${GCC3_PKGMODIF}-java-3.3
+PKGNAME=		gcc3${GCC3_PKGMODIF}-java-${GCC_VERSION}
 COMMENT=		GNU Compiler Collection, version 3, Java compiler
 
 INFO_FILES=		gcj.info
 
 .include "../../lang/gcc3-c/buildaddon.mk"
 
-BUILD_DEPENDS+=		gcc3${GCC3_PKGMODIF}-c++-3.3nb1:../../lang/gcc3-c++
+BUILD_DEPENDS+=		gcc3${GCC3_PKGMODIF}-c++-3.3.1:../../lang/gcc3-c++
 CONFIGURE_ARGS+=	--enable-languages="java"
 CONFIGURE_ARGS+=	--with-system-zlib
 # done manually in do-build
diff --git a/lang/gcc3-java/distinfo b/lang/gcc3-java/distinfo
index 9ef25b7b87b..e38654d4f00 100644
--- a/lang/gcc3-java/distinfo
+++ b/lang/gcc3-java/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/07/09 15:23:59 drochner Exp $
+$NetBSD: distinfo,v 1.4 2003/08/11 14:16:05 drochner Exp $
 
-SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a
-Size (gcc-3.3.tar.bz2) = 23447616 bytes
+SHA1 (gcc-3.3.1.tar.bz2) = 65ba4142dbf345d1aac1ed323f64b5f49294aee7
+Size (gcc-3.3.1.tar.bz2) = 23544362 bytes
 SHA1 (patch-aa) = e79f24237d3ece987065b84987a95eb8abc7ded7
-SHA1 (patch-ba) = 9037d2504c5db6458494a18852d57c1ef5c9dcdb
diff --git a/lang/gcc3-java/patches/patch-ba b/lang/gcc3-java/patches/patch-ba
deleted file mode 100644
index 568bbc6a27e..00000000000
--- a/lang/gcc3-java/patches/patch-ba
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2003/07/09 15:23:59 drochner Exp $
-
---- gcc/unroll.c.orig	2003-03-25 20:23:07.000000000 +0000
-+++ gcc/unroll.c
-@@ -792,9 +792,9 @@ unroll_loop (loop, insn_count, strength_
-       /* We must limit the generic test to max_reg_before_loop, because only
- 	 these pseudo registers have valid regno_first_uid info.  */
-       for (r = FIRST_PSEUDO_REGISTER; r < max_reg_before_loop; ++r)
--	if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) <= max_uid_for_loop
-+	if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) < max_uid_for_loop
- 	    && REGNO_FIRST_LUID (r) >= copy_start_luid
--	    && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) <= max_uid_for_loop
-+	    && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) < max_uid_for_loop
- 	    && REGNO_LAST_LUID (r) <= copy_end_luid)
- 	  {
- 	    /* However, we must also check for loop-carried dependencies.
-- 
cgit v1.2.3