28 files changed, 420 insertions, 420 deletions

diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 31a25d972a6a..da37abebc87d 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-03-27
+SNAPDATE=	2002-04-06
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -35,7 +35,7 @@ LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
 
-CVS_DATE=	${SNAPDATE} 10:41 PST
+CVS_DATE=	${SNAPDATE} 23:35 PST
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
@@ -154,9 +154,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-#.for info in cpp cppinternals g77 gcc gcj
-#	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-#.endfor
+.for info in cpp cppinternals g77 gcc gcj
+	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc-ooo/pkg-plist b/lang/gcc-ooo/pkg-plist
index 87c1e6afd2b9..8be9fd8a3e7a 100644
--- a/lang/gcc-ooo/pkg-plist
+++ b/lang/gcc-ooo/pkg-plist
@@ -1,33 +1,33 @@
 @comment $FreeBSD$
-bin/g++filt31
-bin/g++31
-bin/g77-31
-bin/gcc31
-bin/gcov31
-bin/%%GNU_HOST%%-gcc31
-bin/%%GNU_HOST%%-g++31
+bin/g++filt32
+bin/g++32
+bin/g77-32
+bin/gcc32
+bin/gcov32
+bin/%%GNU_HOST%%-gcc32
+bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
+bin/gcj32
+bin/gcjh32
+bin/jv-scan32
+bin/jcf-dump32
+bin/jar32
+bin/grepjar32
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	exec install-info %D/info/g77.info %D/info/dir
-@comment	exec install-info %D/info/gcc.info %D/info/dir
-@comment	exec install-info %D/info/gcj.info %D/info/dir
+unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+unexec install-info --delete %D/info/gcc.info %D/info/dir
+unexec install-info --delete %D/info/g77.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gcj.info
+exec install-info %D/info/cppinternals.info %D/info/dir
+exec install-info %D/info/g77.info %D/info/dir
+exec install-info %D/info/gcc.info %D/info/dir
+exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 31a25d972a6a..da37abebc87d 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-03-27
+SNAPDATE=	2002-04-06
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -35,7 +35,7 @@ LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
 
-CVS_DATE=	${SNAPDATE} 10:41 PST
+CVS_DATE=	${SNAPDATE} 23:35 PST
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
@@ -154,9 +154,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-#.for info in cpp cppinternals g77 gcc gcj
-#	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-#.endfor
+.for info in cpp cppinternals g77 gcc gcj
+	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index 87c1e6afd2b9..8be9fd8a3e7a 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -1,33 +1,33 @@
 @comment $FreeBSD$
-bin/g++filt31
-bin/g++31
-bin/g77-31
-bin/gcc31
-bin/gcov31
-bin/%%GNU_HOST%%-gcc31
-bin/%%GNU_HOST%%-g++31
+bin/g++filt32
+bin/g++32
+bin/g77-32
+bin/gcc32
+bin/gcov32
+bin/%%GNU_HOST%%-gcc32
+bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
+bin/gcj32
+bin/gcjh32
+bin/jv-scan32
+bin/jcf-dump32
+bin/jar32
+bin/grepjar32
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	exec install-info %D/info/g77.info %D/info/dir
-@comment	exec install-info %D/info/gcc.info %D/info/dir
-@comment	exec install-info %D/info/gcj.info %D/info/dir
+unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+unexec install-info --delete %D/info/gcc.info %D/info/dir
+unexec install-info --delete %D/info/g77.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gcj.info
+exec install-info %D/info/cppinternals.info %D/info/dir
+exec install-info %D/info/g77.info %D/info/dir
+exec install-info %D/info/gcc.info %D/info/dir
+exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 31a25d972a6a..da37abebc87d 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-03-27
+SNAPDATE=	2002-04-06
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -35,7 +35,7 @@ LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
 
-CVS_DATE=	${SNAPDATE} 10:41 PST
+CVS_DATE=	${SNAPDATE} 23:35 PST
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
@@ -154,9 +154,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-#.for info in cpp cppinternals g77 gcc gcj
-#	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-#.endfor
+.for info in cpp cppinternals g77 gcc gcj
+	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc33/pkg-plist b/lang/gcc33/pkg-plist
index 87c1e6afd2b9..8be9fd8a3e7a 100644
--- a/lang/gcc33/pkg-plist
+++ b/lang/gcc33/pkg-plist
@@ -1,33 +1,33 @@
 @comment $FreeBSD$
-bin/g++filt31
-bin/g++31
-bin/g77-31
-bin/gcc31
-bin/gcov31
-bin/%%GNU_HOST%%-gcc31
-bin/%%GNU_HOST%%-g++31
+bin/g++filt32
+bin/g++32
+bin/g77-32
+bin/gcc32
+bin/gcov32
+bin/%%GNU_HOST%%-gcc32
+bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
+bin/gcj32
+bin/gcjh32
+bin/jv-scan32
+bin/jcf-dump32
+bin/jar32
+bin/grepjar32
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	exec install-info %D/info/g77.info %D/info/dir
-@comment	exec install-info %D/info/gcc.info %D/info/dir
-@comment	exec install-info %D/info/gcj.info %D/info/dir
+unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+unexec install-info --delete %D/info/gcc.info %D/info/dir
+unexec install-info --delete %D/info/g77.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gcj.info
+exec install-info %D/info/cppinternals.info %D/info/dir
+exec install-info %D/info/g77.info %D/info/dir
+exec install-info %D/info/gcc.info %D/info/dir
+exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 31a25d972a6a..da37abebc87d 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-03-27
+SNAPDATE=	2002-04-06
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -35,7 +35,7 @@ LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
 
-CVS_DATE=	${SNAPDATE} 10:41 PST
+CVS_DATE=	${SNAPDATE} 23:35 PST
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
@@ -154,9 +154,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-#.for info in cpp cppinternals g77 gcc gcj
-#	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-#.endfor
+.for info in cpp cppinternals g77 gcc gcj
+	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist
index 87c1e6afd2b9..8be9fd8a3e7a 100644
--- a/lang/gcc34/pkg-plist
+++ b/lang/gcc34/pkg-plist
@@ -1,33 +1,33 @@
 @comment $FreeBSD$
-bin/g++filt31
-bin/g++31
-bin/g77-31
-bin/gcc31
-bin/gcov31
-bin/%%GNU_HOST%%-gcc31
-bin/%%GNU_HOST%%-g++31
+bin/g++filt32
+bin/g++32
+bin/g77-32
+bin/gcc32
+bin/gcov32
+bin/%%GNU_HOST%%-gcc32
+bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
+bin/gcj32
+bin/gcjh32
+bin/jv-scan32
+bin/jcf-dump32
+bin/jar32
+bin/grepjar32
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	exec install-info %D/info/g77.info %D/info/dir
-@comment	exec install-info %D/info/gcc.info %D/info/dir
-@comment	exec install-info %D/info/gcj.info %D/info/dir
+unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+unexec install-info --delete %D/info/gcc.info %D/info/dir
+unexec install-info --delete %D/info/g77.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gcj.info
+exec install-info %D/info/cppinternals.info %D/info/dir
+exec install-info %D/info/g77.info %D/info/dir
+exec install-info %D/info/gcc.info %D/info/dir
+exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 31a25d972a6a..da37abebc87d 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-03-27
+SNAPDATE=	2002-04-06
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -35,7 +35,7 @@ LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
 
-CVS_DATE=	${SNAPDATE} 10:41 PST
+CVS_DATE=	${SNAPDATE} 23:35 PST
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
@@ -154,9 +154,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-#.for info in cpp cppinternals g77 gcc gcj
-#	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-#.endfor
+.for info in cpp cppinternals g77 gcc gcj
+	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc35/pkg-plist b/lang/gcc35/pkg-plist
index 87c1e6afd2b9..8be9fd8a3e7a 100644
--- a/lang/gcc35/pkg-plist
+++ b/lang/gcc35/pkg-plist
@@ -1,33 +1,33 @@
 @comment $FreeBSD$
-bin/g++filt31
-bin/g++31
-bin/g77-31
-bin/gcc31
-bin/gcov31
-bin/%%GNU_HOST%%-gcc31
-bin/%%GNU_HOST%%-g++31
+bin/g++filt32
+bin/g++32
+bin/g77-32
+bin/gcc32
+bin/gcov32
+bin/%%GNU_HOST%%-gcc32
+bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
+bin/gcj32
+bin/gcjh32
+bin/jv-scan32
+bin/jcf-dump32
+bin/jar32
+bin/grepjar32
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	exec install-info %D/info/g77.info %D/info/dir
-@comment	exec install-info %D/info/gcc.info %D/info/dir
-@comment	exec install-info %D/info/gcj.info %D/info/dir
+unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+unexec install-info --delete %D/info/gcc.info %D/info/dir
+unexec install-info --delete %D/info/g77.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gcj.info
+exec install-info %D/info/cppinternals.info %D/info/dir
+exec install-info %D/info/g77.info %D/info/dir
+exec install-info %D/info/gcc.info %D/info/dir
+exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 31a25d972a6a..da37abebc87d 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-03-27
+SNAPDATE=	2002-04-06
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -35,7 +35,7 @@ LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
 
-CVS_DATE=	${SNAPDATE} 10:41 PST
+CVS_DATE=	${SNAPDATE} 23:35 PST
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
@@ -154,9 +154,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-#.for info in cpp cppinternals g77 gcc gcj
-#	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-#.endfor
+.for info in cpp cppinternals g77 gcc gcj
+	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index 87c1e6afd2b9..8be9fd8a3e7a 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -1,33 +1,33 @@
 @comment $FreeBSD$
-bin/g++filt31
-bin/g++31
-bin/g77-31
-bin/gcc31
-bin/gcov31
-bin/%%GNU_HOST%%-gcc31
-bin/%%GNU_HOST%%-g++31
+bin/g++filt32
+bin/g++32
+bin/g77-32
+bin/gcc32
+bin/gcov32
+bin/%%GNU_HOST%%-gcc32
+bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
+bin/gcj32
+bin/gcjh32
+bin/jv-scan32
+bin/jcf-dump32
+bin/jar32
+bin/grepjar32
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	exec install-info %D/info/g77.info %D/info/dir
-@comment	exec install-info %D/info/gcc.info %D/info/dir
-@comment	exec install-info %D/info/gcj.info %D/info/dir
+unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+unexec install-info --delete %D/info/gcc.info %D/info/dir
+unexec install-info --delete %D/info/g77.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gcj.info
+exec install-info %D/info/cppinternals.info %D/info/dir
+exec install-info %D/info/g77.info %D/info/dir
+exec install-info %D/info/gcc.info %D/info/dir
+exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 31a25d972a6a..da37abebc87d 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-03-27
+SNAPDATE=	2002-04-06
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -35,7 +35,7 @@ LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
 
-CVS_DATE=	${SNAPDATE} 10:41 PST
+CVS_DATE=	${SNAPDATE} 23:35 PST
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
@@ -154,9 +154,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-#.for info in cpp cppinternals g77 gcc gcj
-#	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-#.endfor
+.for info in cpp cppinternals g77 gcc gcj
+	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index 87c1e6afd2b9..8be9fd8a3e7a 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -1,33 +1,33 @@
 @comment $FreeBSD$
-bin/g++filt31
-bin/g++31
-bin/g77-31
-bin/gcc31
-bin/gcov31
-bin/%%GNU_HOST%%-gcc31
-bin/%%GNU_HOST%%-g++31
+bin/g++filt32
+bin/g++32
+bin/g77-32
+bin/gcc32
+bin/gcov32
+bin/%%GNU_HOST%%-gcc32
+bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
+bin/gcj32
+bin/gcjh32
+bin/jv-scan32
+bin/jcf-dump32
+bin/jar32
+bin/grepjar32
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	exec install-info %D/info/g77.info %D/info/dir
-@comment	exec install-info %D/info/gcc.info %D/info/dir
-@comment	exec install-info %D/info/gcj.info %D/info/dir
+unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+unexec install-info --delete %D/info/gcc.info %D/info/dir
+unexec install-info --delete %D/info/g77.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gcj.info
+exec install-info %D/info/cppinternals.info %D/info/dir
+exec install-info %D/info/g77.info %D/info/dir
+exec install-info %D/info/gcc.info %D/info/dir
+exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 31a25d972a6a..da37abebc87d 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-03-27
+SNAPDATE=	2002-04-06
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -35,7 +35,7 @@ LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
 
-CVS_DATE=	${SNAPDATE} 10:41 PST
+CVS_DATE=	${SNAPDATE} 23:35 PST
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
@@ -154,9 +154,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-#.for info in cpp cppinternals g77 gcc gcj
-#	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-#.endfor
+.for info in cpp cppinternals g77 gcc gcj
+	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index 87c1e6afd2b9..8be9fd8a3e7a 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -1,33 +1,33 @@
 @comment $FreeBSD$
-bin/g++filt31
-bin/g++31
-bin/g77-31
-bin/gcc31
-bin/gcov31
-bin/%%GNU_HOST%%-gcc31
-bin/%%GNU_HOST%%-g++31
+bin/g++filt32
+bin/g++32
+bin/g77-32
+bin/gcc32
+bin/gcov32
+bin/%%GNU_HOST%%-gcc32
+bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
+bin/gcj32
+bin/gcjh32
+bin/jv-scan32
+bin/jcf-dump32
+bin/jar32
+bin/grepjar32
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	exec install-info %D/info/g77.info %D/info/dir
-@comment	exec install-info %D/info/gcc.info %D/info/dir
-@comment	exec install-info %D/info/gcj.info %D/info/dir
+unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+unexec install-info --delete %D/info/gcc.info %D/info/dir
+unexec install-info --delete %D/info/g77.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gcj.info
+exec install-info %D/info/cppinternals.info %D/info/dir
+exec install-info %D/info/g77.info %D/info/dir
+exec install-info %D/info/gcc.info %D/info/dir
+exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 31a25d972a6a..da37abebc87d 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-03-27
+SNAPDATE=	2002-04-06
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -35,7 +35,7 @@ LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
 
-CVS_DATE=	${SNAPDATE} 10:41 PST
+CVS_DATE=	${SNAPDATE} 23:35 PST
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
@@ -154,9 +154,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-#.for info in cpp cppinternals g77 gcc gcj
-#	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-#.endfor
+.for info in cpp cppinternals g77 gcc gcj
+	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index 87c1e6afd2b9..8be9fd8a3e7a 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -1,33 +1,33 @@
 @comment $FreeBSD$
-bin/g++filt31
-bin/g++31
-bin/g77-31
-bin/gcc31
-bin/gcov31
-bin/%%GNU_HOST%%-gcc31
-bin/%%GNU_HOST%%-g++31
+bin/g++filt32
+bin/g++32
+bin/g77-32
+bin/gcc32
+bin/gcov32
+bin/%%GNU_HOST%%-gcc32
+bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
+bin/gcj32
+bin/gcjh32
+bin/jv-scan32
+bin/jcf-dump32
+bin/jar32
+bin/grepjar32
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	exec install-info %D/info/g77.info %D/info/dir
-@comment	exec install-info %D/info/gcc.info %D/info/dir
-@comment	exec install-info %D/info/gcj.info %D/info/dir
+unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+unexec install-info --delete %D/info/gcc.info %D/info/dir
+unexec install-info --delete %D/info/g77.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gcj.info
+exec install-info %D/info/cppinternals.info %D/info/dir
+exec install-info %D/info/g77.info %D/info/dir
+exec install-info %D/info/gcc.info %D/info/dir
+exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 31a25d972a6a..da37abebc87d 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-03-27
+SNAPDATE=	2002-04-06
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -35,7 +35,7 @@ LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
 
-CVS_DATE=	${SNAPDATE} 10:41 PST
+CVS_DATE=	${SNAPDATE} 23:35 PST
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
@@ -154,9 +154,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-#.for info in cpp cppinternals g77 gcc gcj
-#	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-#.endfor
+.for info in cpp cppinternals g77 gcc gcj
+	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index 87c1e6afd2b9..8be9fd8a3e7a 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -1,33 +1,33 @@
 @comment $FreeBSD$
-bin/g++filt31
-bin/g++31
-bin/g77-31
-bin/gcc31
-bin/gcov31
-bin/%%GNU_HOST%%-gcc31
-bin/%%GNU_HOST%%-g++31
+bin/g++filt32
+bin/g++32
+bin/g77-32
+bin/gcc32
+bin/gcov32
+bin/%%GNU_HOST%%-gcc32
+bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
+bin/gcj32
+bin/gcjh32
+bin/jv-scan32
+bin/jcf-dump32
+bin/jar32
+bin/grepjar32
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	exec install-info %D/info/g77.info %D/info/dir
-@comment	exec install-info %D/info/gcc.info %D/info/dir
-@comment	exec install-info %D/info/gcj.info %D/info/dir
+unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+unexec install-info --delete %D/info/gcc.info %D/info/dir
+unexec install-info --delete %D/info/g77.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gcj.info
+exec install-info %D/info/cppinternals.info %D/info/dir
+exec install-info %D/info/g77.info %D/info/dir
+exec install-info %D/info/gcc.info %D/info/dir
+exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 31a25d972a6a..da37abebc87d 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-03-27
+SNAPDATE=	2002-04-06
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -35,7 +35,7 @@ LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
 
-CVS_DATE=	${SNAPDATE} 10:41 PST
+CVS_DATE=	${SNAPDATE} 23:35 PST
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
@@ -154,9 +154,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-#.for info in cpp cppinternals g77 gcc gcj
-#	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-#.endfor
+.for info in cpp cppinternals g77 gcc gcj
+	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index 87c1e6afd2b9..8be9fd8a3e7a 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -1,33 +1,33 @@
 @comment $FreeBSD$
-bin/g++filt31
-bin/g++31
-bin/g77-31
-bin/gcc31
-bin/gcov31
-bin/%%GNU_HOST%%-gcc31
-bin/%%GNU_HOST%%-g++31
+bin/g++filt32
+bin/g++32
+bin/g77-32
+bin/gcc32
+bin/gcov32
+bin/%%GNU_HOST%%-gcc32
+bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
+bin/gcj32
+bin/gcjh32
+bin/jv-scan32
+bin/jcf-dump32
+bin/jar32
+bin/grepjar32
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	exec install-info %D/info/g77.info %D/info/dir
-@comment	exec install-info %D/info/gcc.info %D/info/dir
-@comment	exec install-info %D/info/gcj.info %D/info/dir
+unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+unexec install-info --delete %D/info/gcc.info %D/info/dir
+unexec install-info --delete %D/info/g77.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gcj.info
+exec install-info %D/info/cppinternals.info %D/info/dir
+exec install-info %D/info/g77.info %D/info/dir
+exec install-info %D/info/gcc.info %D/info/dir
+exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 31a25d972a6a..da37abebc87d 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-03-27
+SNAPDATE=	2002-04-06
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -35,7 +35,7 @@ LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
 
-CVS_DATE=	${SNAPDATE} 10:41 PST
+CVS_DATE=	${SNAPDATE} 23:35 PST
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
@@ -154,9 +154,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-#.for info in cpp cppinternals g77 gcc gcj
-#	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-#.endfor
+.for info in cpp cppinternals g77 gcc gcj
+	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 87c1e6afd2b9..8be9fd8a3e7a 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -1,33 +1,33 @@
 @comment $FreeBSD$
-bin/g++filt31
-bin/g++31
-bin/g77-31
-bin/gcc31
-bin/gcov31
-bin/%%GNU_HOST%%-gcc31
-bin/%%GNU_HOST%%-g++31
+bin/g++filt32
+bin/g++32
+bin/g77-32
+bin/gcc32
+bin/gcov32
+bin/%%GNU_HOST%%-gcc32
+bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
+bin/gcj32
+bin/gcjh32
+bin/jv-scan32
+bin/jcf-dump32
+bin/jar32
+bin/grepjar32
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	exec install-info %D/info/g77.info %D/info/dir
-@comment	exec install-info %D/info/gcc.info %D/info/dir
-@comment	exec install-info %D/info/gcj.info %D/info/dir
+unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+unexec install-info --delete %D/info/gcc.info %D/info/dir
+unexec install-info --delete %D/info/g77.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gcj.info
+exec install-info %D/info/cppinternals.info %D/info/dir
+exec install-info %D/info/g77.info %D/info/dir
+exec install-info %D/info/gcc.info %D/info/dir
+exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 31a25d972a6a..da37abebc87d 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-03-27
+SNAPDATE=	2002-04-06
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -35,7 +35,7 @@ LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
 
-CVS_DATE=	${SNAPDATE} 10:41 PST
+CVS_DATE=	${SNAPDATE} 23:35 PST
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
@@ -154,9 +154,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-#.for info in cpp cppinternals g77 gcc gcj
-#	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-#.endfor
+.for info in cpp cppinternals g77 gcc gcj
+	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 87c1e6afd2b9..8be9fd8a3e7a 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -1,33 +1,33 @@
 @comment $FreeBSD$
-bin/g++filt31
-bin/g++31
-bin/g77-31
-bin/gcc31
-bin/gcov31
-bin/%%GNU_HOST%%-gcc31
-bin/%%GNU_HOST%%-g++31
+bin/g++filt32
+bin/g++32
+bin/g77-32
+bin/gcc32
+bin/gcov32
+bin/%%GNU_HOST%%-gcc32
+bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
+bin/gcj32
+bin/gcjh32
+bin/jv-scan32
+bin/jcf-dump32
+bin/jar32
+bin/grepjar32
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	exec install-info %D/info/g77.info %D/info/dir
-@comment	exec install-info %D/info/gcc.info %D/info/dir
-@comment	exec install-info %D/info/gcj.info %D/info/dir
+unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+unexec install-info --delete %D/info/gcc.info %D/info/dir
+unexec install-info --delete %D/info/g77.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gcj.info
+exec install-info %D/info/cppinternals.info %D/info/dir
+exec install-info %D/info/g77.info %D/info/dir
+exec install-info %D/info/gcc.info %D/info/dir
+exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 31a25d972a6a..da37abebc87d 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-03-27
+SNAPDATE=	2002-04-06
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -35,7 +35,7 @@ LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
 
-CVS_DATE=	${SNAPDATE} 10:41 PST
+CVS_DATE=	${SNAPDATE} 23:35 PST
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
@@ -154,9 +154,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-#.for info in cpp cppinternals g77 gcc gcj
-#	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-#.endfor
+.for info in cpp cppinternals g77 gcc gcj
+	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 87c1e6afd2b9..8be9fd8a3e7a 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -1,33 +1,33 @@
 @comment $FreeBSD$
-bin/g++filt31
-bin/g++31
-bin/g77-31
-bin/gcc31
-bin/gcov31
-bin/%%GNU_HOST%%-gcc31
-bin/%%GNU_HOST%%-g++31
+bin/g++filt32
+bin/g++32
+bin/g77-32
+bin/gcc32
+bin/gcov32
+bin/%%GNU_HOST%%-gcc32
+bin/%%GNU_HOST%%-g++32
 bin/gccbug-%%SNAPVER%%
-bin/gcj31
-bin/gcjh31
-bin/jv-scan31
-bin/jcf-dump31
-bin/jar31
-bin/grepjar31
+bin/gcj32
+bin/gcjh32
+bin/jv-scan32
+bin/jcf-dump32
+bin/jar32
+bin/grepjar32
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	exec install-info %D/info/g77.info %D/info/dir
-@comment	exec install-info %D/info/gcc.info %D/info/dir
-@comment	exec install-info %D/info/gcj.info %D/info/dir
+unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+unexec install-info --delete %D/info/gcc.info %D/info/dir
+unexec install-info --delete %D/info/g77.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gcj.info
+exec install-info %D/info/cppinternals.info %D/info/dir
+exec install-info %D/info/g77.info %D/info/dir
+exec install-info %D/info/gcc.info %D/info/dir
+exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%