Update to the 20060310 snapshot of GCC 4.1, which basically is GCC 4.1.0

plus only a few patches.

The spamming of $PREFIX/include/ssp is now finally gone after my reports
upstream, which allows us to restrict the conflict with gcc-4.2.* to the
case where we build Java.

Convert the build-time dependency on math/mpfr to a full one, since the
Fortran frontend also needs this at run time.

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

Remove bogus USE_X11 (which was not used by default nor any other port).

No longer hardcode the version number in LATEST_LINK.

3 files changed, 23 insertions, 35 deletions

diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 45fcdef98c93..a3a6f5a94f80 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.1.0
-PORTREVISION=	20060217
+PORTVERSION=	4.1.1
+PORTREVISION=	20060310
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -22,12 +22,12 @@ MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.1
 
 .if defined(WITH_FORTRAN)
-LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
-BUILD_DEPENDS=	${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4 \
+		mpfr.1:${PORTSDIR}/math/mpfr
 .endif
 
-CONFLICTS=	gcc-4.2.*
-LATEST_LINK?=	gcc41${PKGNAMESUFFIX}
+SUFFIX=		41
+LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -36,7 +36,6 @@ USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 .if defined(WITH_JAVA_AWT)
 USE_GNOME=	gtk20
-USE_X11=	yes
 .endif
 
 PATCH_WRKSRC=	${SRCDIR}
@@ -60,7 +59,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-SUFFIX=		41
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
@@ -73,17 +71,11 @@ CONFIGURE_ARGS+=	--disable-nls \
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
 CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
-WANT_SHAREDLIBS=yes	# We need this at the moment.
 .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 \
@@ -107,6 +99,7 @@ PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
 .if ! defined(WITHOUT_JAVA)
+CONFLICTS=	gcc-4.1.*
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 EXTRA_PATCHES=	${FILESDIR}/java-patch-hier
 # FIXME: we are currently getting weird build failures with libjava on
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index a767621e441a..2cec1133548f 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.1-20060217.tar.bz2) = ed51133b35ef12e3b208211d3771158d
-SHA256 (gcc-core-4.1-20060217.tar.bz2) = 9145799f76fa5dd47b9fe94085c96f2dca306ae8884bde291d3af2cef4e144bf
-SIZE (gcc-core-4.1-20060217.tar.bz2) = 14806089
-MD5 (gcc-g++-4.1-20060217.tar.bz2) = bc9263c304427d28cf8943fc2f340cc4
-SHA256 (gcc-g++-4.1-20060217.tar.bz2) = ba4e37d340ba5ad096c246ec647befbb699c52d693d9c33c1ec2e84030ac2280
-SIZE (gcc-g++-4.1-20060217.tar.bz2) = 3831966
-MD5 (gcc-objc-4.1-20060217.tar.bz2) = 8eecebdf18db8207dfbd5a41be472b6f
-SHA256 (gcc-objc-4.1-20060217.tar.bz2) = 0dfbdf803618b3d94bb07c2d7484281887045b577e1c3fc47717cd0464a68012
-SIZE (gcc-objc-4.1-20060217.tar.bz2) = 190739
-MD5 (gcc-testsuite-4.1-20060217.tar.bz2) = 224e7c6967b02d38fc46dd9424ef1658
-SHA256 (gcc-testsuite-4.1-20060217.tar.bz2) = 5d66931c2a06d969d00efec95a8a74e9f2a98c833ef91688317e8e1dd105199c
-SIZE (gcc-testsuite-4.1-20060217.tar.bz2) = 3514955
-MD5 (gcc-fortran-4.1-20060217.tar.bz2) = 8811617ab3a772ea722d831894d7ca89
-SHA256 (gcc-fortran-4.1-20060217.tar.bz2) = 8c240631a4abdbe31e5dcb20fbac3721005cfd3e63af469459c7e21217e2a70b
-SIZE (gcc-fortran-4.1-20060217.tar.bz2) = 745993
+MD5 (gcc-core-4.1-20060310.tar.bz2) = 39e148a1aacfcbb25cacac0ebe2f6e6a
+SHA256 (gcc-core-4.1-20060310.tar.bz2) = 1b25fe81f7e20f567cdad3b34222aa6dd904155fcccb8a52aef40f424d5e30d6
+SIZE (gcc-core-4.1-20060310.tar.bz2) = 14810907
+MD5 (gcc-g++-4.1-20060310.tar.bz2) = 25f29acee38c8cc120f2a364e79387ae
+SHA256 (gcc-g++-4.1-20060310.tar.bz2) = 457cbe9e8a360c95ecad3605e58ed05d96b802a1c0cd16ab3f0601550a9c3a5c
+SIZE (gcc-g++-4.1-20060310.tar.bz2) = 3831427
+MD5 (gcc-objc-4.1-20060310.tar.bz2) = 472aaf21e17ccb3061b6e5c0f9fe7fb5
+SHA256 (gcc-objc-4.1-20060310.tar.bz2) = 096ef76e5bf49eca8991a182c132c01d36a841a731ebc2f15f76a0dafa648957
+SIZE (gcc-objc-4.1-20060310.tar.bz2) = 190707
+MD5 (gcc-testsuite-4.1-20060310.tar.bz2) = 2f23d112ebd51ed6c5d72eca6075a865
+SHA256 (gcc-testsuite-4.1-20060310.tar.bz2) = 8223a012921753c7a7af1ff982eec52537105c3b4bcbb663c55c479e8ffacf06
+SIZE (gcc-testsuite-4.1-20060310.tar.bz2) = 3526101
+MD5 (gcc-fortran-4.1-20060310.tar.bz2) = fac529c7a997fe4ee83a795f4e66cc12
+SHA256 (gcc-fortran-4.1-20060310.tar.bz2) = 57ccff69d3c90d3d6d943bc9b6c20a632c9c90ddbbe384ae2bac3718c1d462ba
+SIZE (gcc-fortran-4.1-20060310.tar.bz2) = 752125
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index 819f3f7101c8..5fdc2d7941d0 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -9,11 +9,6 @@ bin/%%GNU_HOST%%-c++%%SUFFIX%%
 bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-include/ssp/ssp.h
-include/ssp/string.h
-include/ssp/stdio.h
-include/ssp/unistd.h
-@dirrm include/ssp
 info/gcc%%SUFFIX%%/dir
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%