Upgrade to the 21-May-2002 GCC 3.1.1 pre-release snapshot.

3 files changed, 15 insertions, 51 deletions

diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index 07469e53d8e0..9e18e491f248 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-05-06
+SNAPDATE=	2002-05-21
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -81,13 +81,13 @@ CONFIGURE_ARGS+= --enable-threads
 CONFIGURE_ARGS+= --enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
-MAN1=		cpp31.1 g++31.1 g77-31.1 gcc31.1 gcov31.1 \
-		gcj31.1 gcjh31.1 gij.1 \
-		jcf-dump31.1 jv-scan31.1 jv-convert.1
-MAN7=		fsf-funding.7 gfdl.7 gpl.7
+#MAN1=		cpp31.1 g++31.1 g77-31.1 gcc31.1 gcov31.1 \
+#		gcj31.1 gcjh31.1 gij.1 \
+#		jcf-dump31.1 jv-scan31.1 jv-convert.1
+#MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
 .if defined(NETWINDER_SS)
 post-extract:
@@ -131,7 +131,9 @@ post-install:
 .endfor
 .for file in g77
 	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/${file}-31
-	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/${file}-31.1
+	-( ${TEST} -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/${file}-31.1
 .endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
diff --git a/lang/gcc31/distinfo b/lang/gcc31/distinfo
index 0552fba08d41..9b061be7191a 100644
--- a/lang/gcc31/distinfo
+++ b/lang/gcc31/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcc-core-20020506.tar.bz2) = 35bd4607e449305e22e5f8fba0e4422f
-MD5 (gcc-g++-20020506.tar.bz2) = 930ffc8a787934d0863ed6d8e5ea461d
-MD5 (gcc-g77-20020506.tar.bz2) = ab0d61ad4b728e24ea77c7ac63ea37a5
-MD5 (gcc-java-20020506.tar.bz2) = 759e6122d341ada765af31bd22719cfe
-MD5 (gcc-objc-20020506.tar.bz2) = 25ff1148b3103de1672ac90505eb20ac
-MD5 (port_gcc31_2002-05-06.diff) = a08303d83bfa2ae66da8d8b9f8490fac
+MD5 (gcc-core-20020521.tar.bz2) = 0a39955ad0d398e5bb3c160c9f8b3a1e
+MD5 (gcc-g++-20020521.tar.bz2) = 8e99307571a0a5e734830e0831925d6c
+MD5 (gcc-g77-20020521.tar.bz2) = 24ebe07670298fdfc3302716a82402d1
+MD5 (gcc-java-20020521.tar.bz2) = dd1d58e7fa977b369dce957a73770b4e
+MD5 (gcc-objc-20020521.tar.bz2) = 226808b48e9b741f0df17c3df1039a62
+MD5 (port_gcc31_2002-05-21.diff) = 0e11dda435ff64db6534719c3dbaa037
diff --git a/lang/gcc31/files/patch-ar b/lang/gcc31/files/patch-ar
index 8b3f5f6b267c..ebfbb7a6718f 100644
--- a/lang/gcc31/files/patch-ar
+++ b/lang/gcc31/files/patch-ar
@@ -1,43 +1,5 @@
 --- gcc/config/freebsd-spec.h.orig	Tue Nov 20 18:06:45 2001
 +++ gcc/config/freebsd-spec.h	Sat Feb  2 13:37:38 2002
-@@ -48,29 +48,32 @@
-    || !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") 		\
-    || !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker"))
- 
-+/* Place spaces around this string.  We depend on string splicing to produce
-+   the final CPP_PREDEFINES value.  */
-+
- #if FBSD_MAJOR == 6
- #define FBSD_CPP_PREDEFINES \
--  "-D__FreeBSD__=6 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
-+  " -D__FreeBSD__=6 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
- #endif
- 
- #if FBSD_MAJOR == 5
- #define FBSD_CPP_PREDEFINES \
--  "-D__FreeBSD__=5 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
-+  " -D__FreeBSD__=5 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
- #endif
- 
- #if FBSD_MAJOR == 4
- #define FBSD_CPP_PREDEFINES \
--  "-D__FreeBSD__=4 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
-+  " -D__FreeBSD__=4 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
- #endif
- 
- #if FBSD_MAJOR == 3
- #define FBSD_CPP_PREDEFINES \
--  "-D__FreeBSD__=3 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
-+  " -D__FreeBSD__=3 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
- #endif
- 
- #ifndef FBSD_CPP_PREDEFINES
- #define FBSD_CPP_PREDEFINES \
--  "-D__FreeBSD__   -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
-+  " -D__FreeBSD__   -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
- #endif
- 
- /* Provide a CPP_SPEC appropriate for FreeBSD.  We just deal with the GCC 
 @@ -79,7 +82,10 @@
  #define FBSD_CPP_SPEC "							\
    %(cpp_cpu)								\