5 files changed, 63 insertions, 62 deletions

diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 163a306a765b..1c88756199cf 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -7,25 +7,24 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	3.4.3
-PORTREVISION=	20041015
+PORTVERSION=	4.0.0
+PORTREVISION=	20041024
 CATEGORIES=	lang java
-VERSIONSTRING=	3.4-${PORTREVISION}
+VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-g77-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER?=	gerald@FreeBSD.org
-COMMENT?=	GNU Compiler Collection 3.4
+COMMENT?=	GNU Compiler Collection 4.0
 
-LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
+LATEST_LINK?=	gcc40${PKGNAMESUFFIX}
 
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -48,10 +47,12 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-SUFFIX=		34
+SUFFIX=		40
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls \
@@ -71,20 +72,22 @@ CONFIGURE_ARGS+=	--disable-shared
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
+		fastjar${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
-		g77-${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1 \
 		gcj${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
 		gij${SUFFIX}.1 \
+		grmic${SUFFIX}.1 \
+		grmiregistry${SUFFIX}.1 \
 		grepjar${SUFFIX}.1 \
 		jar${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
-INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
+INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
 
 .if defined(WITHOUT_LIBJAVA)
 CONFIGURE_ARGS+=	--disable-libgcj
@@ -117,7 +120,7 @@ check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install: fake-manpages
-.for f in c++ g77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
+.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
 	  ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \
@@ -127,14 +130,11 @@ post-install: fake-manpages
 	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
 	fi
 .endfor
-	${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX}
-	-${MV} -f ${PREFIX}/man/man1/g77${SUFFIX}.1 ${PREFIX}/man/man1/g77-${SUFFIX}.1
 	# These libraries are moved from PREFIX/lib to avoid conflicts with
 	# the stock compiler.
-.for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
+.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_SHLIB}
 	${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
 .endfor
-	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
@@ -158,7 +158,7 @@ post-install: fake-manpages
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
-	@-ncftpls ${SITE} | ${GREP} 'LATEST.*3\.4'
+	@-ncftpls ${SITE} | ${GREP} 'LATEST.*4\.0'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index abc92dc041b4..bf4f6c05a6fc 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,12 +1,10 @@
-MD5 (gcc-core-3.4-20041015.tar.bz2) = 6094f99ce9f3e148cd98d3235d4e6c9a
-SIZE (gcc-core-3.4-20041015.tar.bz2) = 10950334
-MD5 (gcc-g++-3.4-20041015.tar.bz2) = 8a111f43a60f249149868a7c3f3fccc7
-SIZE (gcc-g++-3.4-20041015.tar.bz2) = 2470344
-MD5 (gcc-g77-3.4-20041015.tar.bz2) = 20623464ed54eafd17f8bb31267075bc
-SIZE (gcc-g77-3.4-20041015.tar.bz2) = 892558
-MD5 (gcc-java-3.4-20041015.tar.bz2) = 1126038f6bc1a8661dc9548819f48296
-SIZE (gcc-java-3.4-20041015.tar.bz2) = 4548379
-MD5 (gcc-objc-3.4-20041015.tar.bz2) = 35c683d66f47458ab6858fc228a9b3de
-SIZE (gcc-objc-3.4-20041015.tar.bz2) = 148692
-MD5 (gcc-testsuite-3.4-20041015.tar.bz2) = 95608dcf082112f887cd5aa434155610
-SIZE (gcc-testsuite-3.4-20041015.tar.bz2) = 2621200
+MD5 (gcc-core-4.0-20041024.tar.bz2) = 2a3c0560ff1eb9b5896a0a1c529ff94c
+SIZE (gcc-core-4.0-20041024.tar.bz2) = 12217846
+MD5 (gcc-g++-4.0-20041024.tar.bz2) = 107904c126b527088024749f3e06834b
+SIZE (gcc-g++-4.0-20041024.tar.bz2) = 2532581
+MD5 (gcc-java-4.0-20041024.tar.bz2) = a705f0b0eabc76dc0fe51c67a4de402b
+SIZE (gcc-java-4.0-20041024.tar.bz2) = 5210220
+MD5 (gcc-objc-4.0-20041024.tar.bz2) = 5411b8c6aa1954b5ce138cd22b1a58fa
+SIZE (gcc-objc-4.0-20041024.tar.bz2) = 174140
+MD5 (gcc-testsuite-4.0-20041024.tar.bz2) = 326609873aad2d3ec9bf3a9b7e07955f
+SIZE (gcc-testsuite-4.0-20041024.tar.bz2) = 2892479
diff --git a/lang/gcc45/files/patch-libcpp-internal.h b/lang/gcc45/files/patch-libcpp-internal.h
new file mode 100644
index 000000000000..f8b8cd689c97
--- /dev/null
+++ b/lang/gcc45/files/patch-libcpp-internal.h
@@ -0,0 +1,15 @@
+Index: libcpp/internal.h
+===================================================================
+RCS file: /cvs/gcc/gcc/libcpp/internal.h,v
+retrieving revision 1.7
+diff -u -3 -p -r1.7 internal.h
+--- internal.h	9 Sep 2004 19:16:55 -0000	1.7
++++ internal.h	30 Oct 2004 17:27:31 -0000
+@@ -29,6 +29,7 @@ Foundation, 59 Temple Place - Suite 330,
+ #if defined HAVE_ICONV_H && defined HAVE_ICONV
+ #include <iconv.h>
+ #else
++#undef HAVE_ICONV
+ #define HAVE_ICONV 0
+ typedef int iconv_t;  /* dummy */
+ #endif
diff --git a/lang/gcc45/files/patch-libjava::Makefile.in b/lang/gcc45/files/patch-libjava::Makefile.in
deleted file mode 100644
index 561b2632eb42..000000000000
--- a/lang/gcc45/files/patch-libjava::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libjava/Makefile.in.orig	Tue Aug 31 09:39:04 2004
-+++ libjava/Makefile.in	Tue Aug 31 09:39:46 2004
-@@ -180,7 +180,7 @@
- 
- toolexecmainlib_DATA = libgcj.spec
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libgcj.pc
- 
- jardir = $(datadir)/java
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index 1075b994c0e2..b9f9e044d303 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -1,28 +1,27 @@
 @comment $FreeBSD$
-bin/c++34
-bin/cpp34
-bin/g++34
-bin/g77-34
-bin/gcc34
-bin/gcov34
-bin/%%GNU_HOST%%-c++34
+bin/c++40
+bin/cpp40
+bin/fastjar40
+bin/g++40
+bin/gcc40
+bin/gcov40
+bin/%%GNU_HOST%%-c++40
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
-bin/%%GNU_HOST%%-gcc34
-bin/%%GNU_HOST%%-g++34
-bin/%%GNU_HOST%%-gcj34
-bin/%%GNU_HOST%%-gcjh34
-bin/gccbug34
-bin/gcj34
-bin/gcjh34
-%%LIBJAVA%%bin/gij34
-bin/jv-scan34
-bin/jcf-dump34
-%%LIBJAVA%%bin/jv-convert34
-bin/jar34
-bin/grepjar34
-%%LIBJAVA%%bin/rmic34
-%%LIBJAVA%%bin/rmiregistry34
-%%LIBJAVA%%bin/addr2name.awk34
+bin/%%GNU_HOST%%-gcc40
+bin/%%GNU_HOST%%-g++40
+bin/%%GNU_HOST%%-gcj40
+bin/%%GNU_HOST%%-gcjh40
+bin/gccbug40
+bin/gcj40
+bin/gcjh40
+bin/grepjar40
+%%LIBJAVA%%bin/gij40
+bin/jv-scan40
+bin/jcf-dump40
+%%LIBJAVA%%bin/jv-convert40
+%%LIBJAVA%%bin/rmic40
+%%LIBJAVA%%bin/rmiregistry40
+%%LIBJAVA%%bin/addr2name.awk40
 %%LIBJAVA%%include/ffi.h
 %%LIBJAVA%%include/jni.h
 %%LIBJAVA%%include/jvmpi.h
@@ -37,9 +36,9 @@ bin/grepjar34
 %%LIBJAVA%%lib/lib-org-xml-sax.a
 %%LIBJAVA%%lib/lib-org-w3c-dom.la
 %%LIBJAVA%%lib/lib-org-w3c-dom.a
+include/mf-runtime.h
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jc1
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jvgenmain
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1obj