Update to the 20051220 snapshot of GCC 3.4.6.

Install the .info files of the lang/gcc34 port in a port-specific
subdirectory, which allows us to remove the conflicts with lang/gcc40
and lang/gcc41 and also removes the hidden conflict with lang/gcc33.

Also, convert pkg-plist to use a new substitution (%%SUFFIX%%) instead
of hardcoding the version number 34.

5 files changed, 41 insertions, 34 deletions

diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 173a120b793..c3ad37bb5d0 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -8,13 +8,12 @@
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.6
-PORTREVISION=	20051206
+PORTREVISION=	20051220
 CATEGORIES=	lang
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-DISTFILES=	\
-		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
+DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g77-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -23,7 +22,6 @@ DISTFILES=	\
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
-CONFLICTS=	gcc-4.0.* gcc-4.1.*
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -57,7 +55,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=:
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
@@ -71,13 +70,19 @@ CXXFLAGS+=	-fPIC
 .endif
 .endif
 ALL_TARGET=	bootstrap-lean
-PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
+		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		g77-${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1
-INFO=		cpp cppinternals g77 gcc gccinstall gccint
+INFO=		gcc${SUFFIX}/cpp \
+		gcc${SUFFIX}/cppinternals \
+		gcc${SUFFIX}/g77 \
+		gcc${SUFFIX}/gcc \
+		gcc${SUFFIX}/gccinstall \
+		gcc${SUFFIX}/gccint
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo
index fabc431bbe9..93e3b2602ae 100644
--- a/lang/gcc34/distinfo
+++ b/lang/gcc34/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-3.4-20051206.tar.bz2) = 4480d642086a499044becd2f4b03fd74
-SHA256 (gcc-core-3.4-20051206.tar.bz2) = 047766e559ebf4b63ad1845e3e87b53baef99b5adeed90a8d270040f6c2d1621
-SIZE (gcc-core-3.4-20051206.tar.bz2) = 11379559
-MD5 (gcc-g++-3.4-20051206.tar.bz2) = 92b2fd6ef99834cf642f1f09c5ee94c0
-SHA256 (gcc-g++-3.4-20051206.tar.bz2) = 14c558ce5ba3fc1f6c8e444efb6f5da278100c52a286d59db53fb97d0a58d84a
-SIZE (gcc-g++-3.4-20051206.tar.bz2) = 2556633
-MD5 (gcc-g77-3.4-20051206.tar.bz2) = 86a1073b6ceef48e911f72f9d635e51e
-SHA256 (gcc-g77-3.4-20051206.tar.bz2) = 08aa2deacee5892a7c3905844c4ed45199c59c2f50a3524437c085b22342e75b
-SIZE (gcc-g77-3.4-20051206.tar.bz2) = 915578
-MD5 (gcc-objc-3.4-20051206.tar.bz2) = e08e804838ddd7842c75e2ffec2a8fec
-SHA256 (gcc-objc-3.4-20051206.tar.bz2) = 2d1f9579dc99975b19d1a1e0261b439c45214a1c9bc89c92358e2ccb884f9d7a
-SIZE (gcc-objc-3.4-20051206.tar.bz2) = 148691
-MD5 (gcc-testsuite-3.4-20051206.tar.bz2) = 57e90f3e19a076d3fdd2de6d3fbb6bb4
-SHA256 (gcc-testsuite-3.4-20051206.tar.bz2) = 689df2c626b1efb8119b8bff00325920a8732927f5158c70bd2db0ebbdcfa379
-SIZE (gcc-testsuite-3.4-20051206.tar.bz2) = 2774525
+MD5 (gcc-core-3.4-20051220.tar.bz2) = 7ce4316f132f037b286e762f1957abf6
+SHA256 (gcc-core-3.4-20051220.tar.bz2) = 3b62448bb1f7697f927d9bdb734824bf87e71f808b5d12620ac99c07cb79d510
+SIZE (gcc-core-3.4-20051220.tar.bz2) = 11378262
+MD5 (gcc-g++-3.4-20051220.tar.bz2) = aea9f99632411e78ee04dd02fca79634
+SHA256 (gcc-g++-3.4-20051220.tar.bz2) = 59e135a3849481c67aa59c0996267b3cab70c7eaf1707b7a823ac5a8cd391225
+SIZE (gcc-g++-3.4-20051220.tar.bz2) = 2556370
+MD5 (gcc-g77-3.4-20051220.tar.bz2) = 17c1af478b4b33075c1f34f78a610b3d
+SHA256 (gcc-g77-3.4-20051220.tar.bz2) = 85f8e400341ea1c1dacdf8334b2b94c342c9db1245b708a8e604d4543de820a6
+SIZE (gcc-g77-3.4-20051220.tar.bz2) = 915617
+MD5 (gcc-objc-3.4-20051220.tar.bz2) = 216efc1d6db23afb0f3568cc2a25b5d3
+SHA256 (gcc-objc-3.4-20051220.tar.bz2) = cf273a04d1f77ab833cf4397981b8d835d5255c2eb1533107a6715c92158f839
+SIZE (gcc-objc-3.4-20051220.tar.bz2) = 149151
+MD5 (gcc-testsuite-3.4-20051220.tar.bz2) = 2525ae6e90000e430afbdd9314ac705a
+SHA256 (gcc-testsuite-3.4-20051220.tar.bz2) = 0f4bab5015185e5662cacc5a2f0915be9f7bef38b317c5f359833703e07320a4
+SIZE (gcc-testsuite-3.4-20051220.tar.bz2) = 2779691
diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist
index fb5fc06542f..173fcfa78bb 100644
--- a/lang/gcc34/pkg-plist
+++ b/lang/gcc34/pkg-plist
@@ -1,15 +1,15 @@
 @comment $FreeBSD$
-bin/c++34
-bin/cpp34
-bin/g++34
-bin/g77-34
-bin/gcc34
-bin/gcov34
-bin/%%GNU_HOST%%-c++34
+bin/c++%%SUFFIX%%
+bin/cpp%%SUFFIX%%
+bin/g++%%SUFFIX%%
+bin/g77-%%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%%-gcc34
-bin/%%GNU_HOST%%-g++34
-bin/gccbug34
+bin/%%GNU_HOST%%-gcc%%SUFFIX%%
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771
@@ -22,4 +22,6 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
 @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%
 @unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true
 @unexec rmdir %D/libexec/gcc 2>/dev/null || true
+info/gcc%%SUFFIX%%/dir
+@unexec rmdir %D/info/gcc%%SUFFIX%% 2>/dev/null || true
 @comment Insert PLIST.lib here
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 9a23c870df9..c5014af51b4 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
 .endif
 
-CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.1.*
+CONFLICTS=	gcc-3.3.* gcc-4.1.*
 LATEST_LINK?=	gcc40${PKGNAMESUFFIX}
 USE_BISON=	yes
 USE_BZIP2=	yes
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 34abff554de..a7af46c6cf5 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -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-3.4.* gcc-4.0.* gcc-4.2.*
+CONFLICTS=	gcc-3.3.* gcc-4.0.* gcc-4.2.*
 LATEST_LINK?=	gcc41${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes