Update to the 20060316 snapshot of GCC 4.0.4.

Now that GCC 4.1.0 has been released, remove support for the Fortran
frontend which was still quite immature in the 4.0 series compared to
what we now have in the the 4.1 series.

Always build both shared and static libraries instead of having these as
two exclusive options defaulting to the former.

Do not strip some of the the binaries any longer.

No longer hardcode the version number in LATEST_LINK.

4 files changed, 18 insertions, 50 deletions

diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 55910dd5a3a9..74897f679121 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.0.3
-PORTREVISION=	20060216
+PORTVERSION=	4.0.4
+PORTREVISION=	20060316
 CATEGORIES=	lang
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -17,19 +17,12 @@ DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.if defined(WITH_FORTRAN)
-DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.0
 
-.if defined(WITH_FORTRAN)
-LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
-BUILD_DEPENDS=	${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
-.endif
-
-LATEST_LINK?=	gcc40${PKGNAMESUFFIX}
+SUFFIX=		40
+LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -50,7 +43,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-SUFFIX=		40
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
@@ -61,18 +53,10 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
-.if defined(WITH_FORTRAN)
-CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
-.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
-.if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+=	--enable-shared
+ALL_TARGET=	bootstrap-lean
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	${TARGLIB}
-.else
-CONFIGURE_ARGS+=	--disable-shared
-.endif
-ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
@@ -85,14 +69,6 @@ INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint
 
-.if defined(WITH_FORTRAN)
-MAN1+=	gfortran${SUFFIX}.1
-INFO+=	gcc${SUFFIX}/gfortran
-PLIST_SUB+=	FORTRAN=""
-.else
-PLIST_SUB+=	FORTRAN="@comment "
-.endif
-
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 
@@ -121,9 +97,6 @@ post-install:
 	done
 .for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
 	# 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}; \
-	fi
 	if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
 	  ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo
index 81818a78f783..b9790b963d70 100644
--- a/lang/gcc40/distinfo
+++ b/lang/gcc40/distinfo
@@ -1,15 +1,12 @@
-MD5 (gcc-core-4.0-20060216.tar.bz2) = 19440e3670f429fce44027b6f5e22b4e
-SHA256 (gcc-core-4.0-20060216.tar.bz2) = c0113fad0bece383cc6da1138f120805cd1ba2e6a2bc3c51dc63c36f59b94f6a
-SIZE (gcc-core-4.0-20060216.tar.bz2) = 13768903
-MD5 (gcc-g++-4.0-20060216.tar.bz2) = 9d24e9dadf968b743d9e517d02d433ba
-SHA256 (gcc-g++-4.0-20060216.tar.bz2) = 7180d0dcb068a87060abbbbaad4ee2ceda01f20dcae68dd16d7e101aa0d0ddf0
-SIZE (gcc-g++-4.0-20060216.tar.bz2) = 2710775
-MD5 (gcc-objc-4.0-20060216.tar.bz2) = 7daae548696149de79eb15d4af08ab78
-SHA256 (gcc-objc-4.0-20060216.tar.bz2) = ea41e7b9329d70efd751e85e54e1bc2822147b75b766c0066ce517869b867f32
-SIZE (gcc-objc-4.0-20060216.tar.bz2) = 179894
-MD5 (gcc-testsuite-4.0-20060216.tar.bz2) = c66676c52fd120821ebb29cfca4b95a3
-SHA256 (gcc-testsuite-4.0-20060216.tar.bz2) = 91d01be01b86d24aa2bb8bf8a5cffb656e89798006418f941a01d90ca6334730
-SIZE (gcc-testsuite-4.0-20060216.tar.bz2) = 3246901
-MD5 (gcc-fortran-4.0-20060216.tar.bz2) = d2100a72bbe6e1b66e7bc3f8ec040ce2
-SHA256 (gcc-fortran-4.0-20060216.tar.bz2) = f6957b5d6a377e802ec26fed3901b717aff2df04e08d7e25bc2364fd33d26ddb
-SIZE (gcc-fortran-4.0-20060216.tar.bz2) = 637119
+MD5 (gcc-core-4.0-20060316.tar.bz2) = 6bf4bd80bd2e836cac5d7c95c7aa703e
+SHA256 (gcc-core-4.0-20060316.tar.bz2) = 50885ec700150b73d66e8604d02d00089c69f2b928f96e022c1a7d0a8191d6f7
+SIZE (gcc-core-4.0-20060316.tar.bz2) = 13773373
+MD5 (gcc-g++-4.0-20060316.tar.bz2) = 722eb384c65739fc9a2bfac348387267
+SHA256 (gcc-g++-4.0-20060316.tar.bz2) = cd227bde03676fb5c9e1856d067e2371d47c3c3f00c8a80ae7493b8beb521ad5
+SIZE (gcc-g++-4.0-20060316.tar.bz2) = 2714588
+MD5 (gcc-objc-4.0-20060316.tar.bz2) = d1f976d96c080d3f4bf3a58759da44ab
+SHA256 (gcc-objc-4.0-20060316.tar.bz2) = 89f477980867cb0e12d7426fb95b7fb9c01614c9babc83d0e63e5e7371c7c3fd
+SIZE (gcc-objc-4.0-20060316.tar.bz2) = 180276
+MD5 (gcc-testsuite-4.0-20060316.tar.bz2) = 0caac9dd10c6d3b80a6619b4022e7967
+SHA256 (gcc-testsuite-4.0-20060316.tar.bz2) = cd8e88324a0407916f52fb8a160a0539b64161f84f71feda5c190126719cbcc2
+SIZE (gcc-testsuite-4.0-20060316.tar.bz2) = 3250989
diff --git a/lang/gcc40/pkg-descr b/lang/gcc40/pkg-descr
index 773220bcf716..b0aa32c8a8e2 100644
--- a/lang/gcc40/pkg-descr
+++ b/lang/gcc40/pkg-descr
@@ -1,4 +1,4 @@
-GCC, the GNU Compiler Collection includes C, C++, and Fortran.
+GCC, the GNU Compiler Collection includes C, C++, and Objective-C.
 
 This port installs the various front ends as gcc40, g++40, and
 so forth into the ${PREFIX}/bin directory.
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index a66850e5d75a..af92003847f0 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -10,6 +10,4 @@ bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
 info/gcc%%SUFFIX%%/dir
-%%FORTRAN%%bin/gfortran%%SUFFIX%%
-%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 @comment Insert PLIST.lib here