18 files changed, 98 insertions, 42 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 1cc667d80f3a..8232cedc1073 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/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.1.*
+CONFLICTS=	gcc-4.0.* gcc-4.1.*
 LATEST_LINK?=	gcc42${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
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index 85974006f10b..2b8c35f1bc6c 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -15,6 +15,8 @@ include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
+info/gcc%%SUFFIX%%/dir
+@unexec rmdir %D/info/gcc%%SUFFIX%% 2>/dev/null || true
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 7b0c5e940f9b..fd158af88a2d 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -24,7 +24,7 @@ DISTFILES=	\
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
-CONFLICTS=	gcc-4.0.* gcc-4.1.* gcc-4.2.*
+CONFLICTS=	gcc-4.0.* gcc-4.1.*
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 USE_BISON=	yes
 USE_BZIP2=	yes
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index d83d82b8860b..173a120b793e 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -23,7 +23,7 @@ DISTFILES=	\
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
-CONFLICTS=	gcc-4.0.* gcc-4.1.* gcc-4.2.*
+CONFLICTS=	gcc-4.0.* gcc-4.1.*
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
 USE_BISON=	yes
 USE_BZIP2=	yes
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 1cc667d80f3a..8232cedc1073 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/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.1.*
+CONFLICTS=	gcc-4.0.* gcc-4.1.*
 LATEST_LINK?=	gcc42${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
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index 85974006f10b..2b8c35f1bc6c 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -15,6 +15,8 @@ include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
+info/gcc%%SUFFIX%%/dir
+@unexec rmdir %D/info/gcc%%SUFFIX%% 2>/dev/null || true
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 1cc667d80f3a..8232cedc1073 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/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.1.*
+CONFLICTS=	gcc-4.0.* gcc-4.1.*
 LATEST_LINK?=	gcc42${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
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index 85974006f10b..2b8c35f1bc6c 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -15,6 +15,8 @@ include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
+info/gcc%%SUFFIX%%/dir
+@unexec rmdir %D/info/gcc%%SUFFIX%% 2>/dev/null || true
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 1cc667d80f3a..8232cedc1073 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/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.1.*
+CONFLICTS=	gcc-4.0.* gcc-4.1.*
 LATEST_LINK?=	gcc42${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
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index 85974006f10b..2b8c35f1bc6c 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -15,6 +15,8 @@ include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
+info/gcc%%SUFFIX%%/dir
+@unexec rmdir %D/info/gcc%%SUFFIX%% 2>/dev/null || true
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 1cc667d80f3a..8232cedc1073 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/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.1.*
+CONFLICTS=	gcc-4.0.* gcc-4.1.*
 LATEST_LINK?=	gcc42${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
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index 85974006f10b..2b8c35f1bc6c 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -15,6 +15,8 @@ include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
+info/gcc%%SUFFIX%%/dir
+@unexec rmdir %D/info/gcc%%SUFFIX%% 2>/dev/null || true
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 1cc667d80f3a..8232cedc1073 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/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.1.*
+CONFLICTS=	gcc-4.0.* gcc-4.1.*
 LATEST_LINK?=	gcc42${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
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 85974006f10b..2b8c35f1bc6c 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -15,6 +15,8 @@ include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
+info/gcc%%SUFFIX%%/dir
+@unexec rmdir %D/info/gcc%%SUFFIX%% 2>/dev/null || true
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 1cc667d80f3a..8232cedc1073 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/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.1.*
+CONFLICTS=	gcc-4.0.* gcc-4.1.*
 LATEST_LINK?=	gcc42${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
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 85974006f10b..2b8c35f1bc6c 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -15,6 +15,8 @@ include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
+info/gcc%%SUFFIX%%/dir
+@unexec rmdir %D/info/gcc%%SUFFIX%% 2>/dev/null || true
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 1cc667d80f3a..8232cedc1073 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/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.1.*
+CONFLICTS=	gcc-4.0.* gcc-4.1.*
 LATEST_LINK?=	gcc42${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
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 85974006f10b..2b8c35f1bc6c 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -15,6 +15,8 @@ include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
+info/gcc%%SUFFIX%%/dir
+@unexec rmdir %D/info/gcc%%SUFFIX%% 2>/dev/null || true
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%