Update to the 20051223 snapshot of GCC 4.1.0.

Install the .info files of the lang/gcc41 port in a port-specific
subdirectory, and move include/mf-runtime.h into a version specific
directory.   This allows us to remove the conflict with lang/gcc33,
and reduce the clash with lang/gcc42.

Also improve packaging by using @dirrm include/ssp instead of speculative
removal.

4 files changed, 31 insertions, 25 deletions

diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 23028576133..395ca52afde 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -24,7 +24,6 @@ DISTFILES=	\
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
-CONFLICTS=	gcc-4.1.*
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 USE_BISON=	yes
 USE_BZIP2=	yes
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index de37792c164..711eafe6784 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20051216
+PORTREVISION=	20051223
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -26,7 +26,7 @@ LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
 .endif
 
-CONFLICTS=	gcc-3.3.* gcc-4.2.*
+CONFLICTS=	gcc-4.2.*
 LATEST_LINK?=	gcc41${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
@@ -69,7 +69,8 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
-		--with-gxx-include-dir=${TARGLIB}/include/c++/
+		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
+		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
 CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
@@ -90,13 +91,17 @@ MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1
-INFO=		cpp cppinternals gcc gccinstall gccint
+INFO=		gcc${SUFFIX}/cpp \
+		gcc${SUFFIX}/cppinternals \
+		gcc${SUFFIX}/gcc \
+		gcc${SUFFIX}/gccinstall \
+		gcc${SUFFIX}/gccint
 
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 MAN1+=		gfortran${SUFFIX}.1
-INFO+=		gfortran
+INFO+=		gcc${SUFFIX}/gfortran
 PLIST_SUB+=	FORTRAN=""
 .else
 PLIST_SUB+=	FORTRAN="@comment "
@@ -121,7 +126,7 @@ MAN1+=		fastjar${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO+=		gcj fastjar
+INFO+=		gcc${SUFFIX}/gcj gcc${SUFFIX}/fastjar
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
@@ -166,6 +171,8 @@ post-install:
 	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
 	fi
 .endfor
+	${MV} -f ${PREFIX}/include/mf-runtime.h \
+	         ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
 	${RM} -f ${TARGLIB}/*.la
 	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index e872142f40a..3418b076b4c 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-4.1-20051216.tar.bz2) = a0d9d05d7c4b3e6bfbf819677626384a
-SHA256 (gcc-core-4.1-20051216.tar.bz2) = 90e25a54a35961da4de3274f97e6e37124e05249b242c37ce44be727b6dac7c5
-SIZE (gcc-core-4.1-20051216.tar.bz2) = 14793761
-MD5 (gcc-g++-4.1-20051216.tar.bz2) = d2c7c9513bfa3969405fdf5907934f6b
-SHA256 (gcc-g++-4.1-20051216.tar.bz2) = 146400d494f6e65f6e7dd365b5f59be99cb31a0a5b32551f46485828b5f4d02c
-SIZE (gcc-g++-4.1-20051216.tar.bz2) = 3818669
-MD5 (gcc-objc-4.1-20051216.tar.bz2) = fcb6e975ba1dcc2c20768618f2b85d5e
-SHA256 (gcc-objc-4.1-20051216.tar.bz2) = 6e330fc1c58b023b6114aebb50ebfb5f3b8e7f0bea1c2cd333cd3a3ffa1c4de6
-SIZE (gcc-objc-4.1-20051216.tar.bz2) = 190461
-MD5 (gcc-testsuite-4.1-20051216.tar.bz2) = 9ee168dfa8877639416103ef065b7fb4
-SHA256 (gcc-testsuite-4.1-20051216.tar.bz2) = f83780f8bdae8b5a8dcec649791dce70f0d72069c4e84cc40ae2f549f7f79fff
-SIZE (gcc-testsuite-4.1-20051216.tar.bz2) = 3509560
-MD5 (gcc-fortran-4.1-20051216.tar.bz2) = 6547940daa73f431711dc7eecbcceb25
-SHA256 (gcc-fortran-4.1-20051216.tar.bz2) = 7844203d90f1e754eaf8bd0dcca9c7631252a4bfd608205e4087eb833ea2dbb4
-SIZE (gcc-fortran-4.1-20051216.tar.bz2) = 725337
+MD5 (gcc-core-4.1-20051223.tar.bz2) = bd9dc47be4820d97e1b2e88a240aa8b2
+SHA256 (gcc-core-4.1-20051223.tar.bz2) = 68e158abcca1e422351f6bd88b734eb53b8c75287939d8f0eeeab0297a287839
+SIZE (gcc-core-4.1-20051223.tar.bz2) = 14792022
+MD5 (gcc-g++-4.1-20051223.tar.bz2) = 76a340b42c403ed8922c2c453ca9a931
+SHA256 (gcc-g++-4.1-20051223.tar.bz2) = 33ad3ef6c9c757dcd3179a59964abf0c776f69a6f726f381e08f33be4b7c14c5
+SIZE (gcc-g++-4.1-20051223.tar.bz2) = 3819757
+MD5 (gcc-objc-4.1-20051223.tar.bz2) = 49e181732f7e9e103c1eca2a7225991a
+SHA256 (gcc-objc-4.1-20051223.tar.bz2) = 2a8f6f75646ac48b49294f830a75111b3d2f1cd4f8b431436457d2d8b78f8ace
+SIZE (gcc-objc-4.1-20051223.tar.bz2) = 190432
+MD5 (gcc-testsuite-4.1-20051223.tar.bz2) = 6aeb7e1ce49d48f52f10d6ee82c38847
+SHA256 (gcc-testsuite-4.1-20051223.tar.bz2) = be00906d71be23f952af9b7109b54a0fd43d285ca691daf3a529f541b7cba206
+SIZE (gcc-testsuite-4.1-20051223.tar.bz2) = 3511664
+MD5 (gcc-fortran-4.1-20051223.tar.bz2) = 81b1a36d4d5677909f209df2cab836a5
+SHA256 (gcc-fortran-4.1-20051223.tar.bz2) = 22bf51989df3fcbbee8c27f7b064eb962c12b22f0fe09d0f2e506a76dffb4dc4
+SIZE (gcc-fortran-4.1-20051223.tar.bz2) = 725578
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index 85974006f10..819f3f7101c 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -3,18 +3,18 @@ bin/c++%%SUFFIX%%
 bin/cpp%%SUFFIX%%
 bin/g++%%SUFFIX%%
 bin/gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
 bin/gcov%%SUFFIX%%
 bin/%%GNU_HOST%%-c++%%SUFFIX%%
 bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-bin/gccbug%%SUFFIX%%
-include/mf-runtime.h
 include/ssp/ssp.h
 include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
-@unexec rmdir %D/include/ssp 2>/dev/null || true
+@dirrm include/ssp
+info/gcc%%SUFFIX%%/dir
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%