Mega-upgrade of the AVR GNU toolchain, step #2:

Upgrade to a development version of GCC 3.2.  New AVR microcontrollers are
introduced with faster pace than new versions of GCC :), so we need the
development version to support recent AVR chips (like the ATmega 128).

Alas, official GCC snapshot tarballs still track the 3.1.x branch, so i
got to CVS checkout and roll my own tarball.

12 files changed, 324 insertions, 200 deletions

diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index 93a7fb70b64..2e69fcee098 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	3.0.1
+PORTVERSION=	3.2-2002-06-28
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-${PORTVERSION}
+#MASTER_SITES=	${MASTER_SITE_GNU}
+#MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-${PORTVERSION}
+#MASTER_SITES=	ftp://gcc.gnu.org/pub/gcc/snapshots/${PORTVERSION}/
+MASTER_SITES=	http://people.freebsd.org/~joerg/
 PKGNAMEPREFIX=	avr-
-DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-g++-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES=	gcc-core+g++-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	joerg@freebsd.org
 
@@ -26,7 +27,7 @@ WRKSRC=		${WRKDIR}/gcc-${PORTVERSION}
 
 # Unfortunately, only some mirrors have it as a .bz2 file, while
 # the original master site still uses .gz.
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 GNU_CONFIGURE=	yes
@@ -35,6 +36,8 @@ CONFIGURE_ARGS=	--target=avr
 
 MAKE_FLAGS=	LANGUAGES="c c++"
 
-MAN1=		cpp.1 avr-gcc.1 avr-g++.1 gcov.1
+# Only few man pages in this snapshot...
+#MAN1=		cpp.1 avr-gcc.1 avr-g++.1 gcov.1
+MAN1=		avr-g++.1
 
 .include <bsd.port.mk>
diff --git a/devel/avr-gcc-3/distinfo b/devel/avr-gcc-3/distinfo
index a5506b660ed..0fa55974014 100644
--- a/devel/avr-gcc-3/distinfo
+++ b/devel/avr-gcc-3/distinfo
@@ -1,2 +1 @@
-MD5 (gcc-core-3.0.1.tar.gz) = 578c6325cf667a5490745cdc11a7ae13
-MD5 (gcc-g++-3.0.1.tar.gz) = a103af4b1b8adef934d8c80d39aa12c1
+MD5 (gcc-core+g++-3.2-2002-06-28.tar.bz2) = fbff197d2e911fb664546b80df65a28d
diff --git a/devel/avr-gcc-3/files/patch-aa b/devel/avr-gcc-3/files/patch-aa
index 9650bc956f1..d8682e14577 100644
--- a/devel/avr-gcc-3/files/patch-aa
+++ b/devel/avr-gcc-3/files/patch-aa
@@ -1,7 +1,7 @@
---- libiberty/Makefile.in.orig	Sat Dec  9 00:16:27 2000
-+++ libiberty/Makefile.in	Thu Apr 19 22:27:57 2001
-@@ -152,7 +152,8 @@
- 	$(RANLIB) $(TARGETLIB)
+--- libiberty/Makefile.in.orig	Tue Jan 22 21:03:29 2002
++++ libiberty/Makefile.in	Tue Jun  4 18:19:26 2002
+@@ -234,7 +234,8 @@
+ @MAINT@	echo stamp > stamp-functions
  
  INSTALL_DEST = @INSTALL_DEST@
 -install: install_to_$(INSTALL_DEST) install-subdir
diff --git a/devel/avr-gcc-3/files/patch-ab b/devel/avr-gcc-3/files/patch-ab
index 60189c6a619..4177fd28988 100644
--- a/devel/avr-gcc-3/files/patch-ab
+++ b/devel/avr-gcc-3/files/patch-ab
@@ -1,11 +1,97 @@
---- Makefile.in.orig	Sun Aug 12 16:44:46 2001
-+++ Makefile.in	Sun Aug 12 16:45:18 2001
-@@ -169,7 +169,7 @@
+--- Makefile.in.orig	Fri Jun 28 09:56:30 2002
++++ Makefile.in	Fri Jun 28 10:53:22 2002
+@@ -186,7 +186,7 @@
  
  # This is set by the configure script to the list of directories which
  # should be built using the target tools.
--TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib librx winsup opcodes bsp libstub cygmon libf2c libchill libobjc
-+TARGET_CONFIGDIRS = libgloss $(SPECIAL_LIBS) newlib librx winsup opcodes bsp libstub cygmon libf2c libchill libobjc
+-TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib winsup opcodes bsp libstub cygmon libf2c libobjc
++TARGET_CONFIGDIRS = libgloss $(SPECIAL_LIBS) newlib winsup opcodes bsp libstub cygmon
  
  # Target libraries are put under this directory:
  # Changed by configure to $(target_alias) if cross.
+@@ -781,81 +781,19 @@
+ 
+ # This is a list of the targets for all of the modules which are compiled
+ # using $(TARGET_FLAGS_TO_PASS).
+-ALL_TARGET_MODULES = \
+-	all-target-libstdc++-v3 \
+-	all-target-newlib \
+-	all-target-libf2c \
+-	all-target-libobjc \
+-	all-target-libtermcap \
+-	all-target-winsup \
+-	all-target-libgloss \
+-	all-target-libiberty \
+-	all-target-gperf \
+-	all-target-examples \
+-	all-target-libstub \
+-	all-target-libffi \
+-	all-target-libjava \
+-	all-target-zlib \
+-	all-target-boehm-gc \
+-	all-target-qthreads \
+-	all-target-bsp \
+-	all-target-cygmon
++ALL_TARGET_MODULES =
+ 
+ # This is a list of the configure targets for all of the modules which
+ # are compiled using the target tools.
+-CONFIGURE_TARGET_MODULES = \
+-	configure-target-libstdc++-v3 \
+-	configure-target-newlib \
+-	configure-target-libf2c \
+-	configure-target-libobjc \
+-	configure-target-libtermcap \
+-	configure-target-winsup \
+-	configure-target-libgloss \
+-	configure-target-libiberty \
+-	configure-target-gperf \
+-	configure-target-examples \
+-	configure-target-libstub \
+-	configure-target-libffi \
+-	configure-target-libjava \
+-	configure-target-zlib \
+-	configure-target-boehm-gc \
+-	configure-target-qthreads \
+-	configure-target-bsp \
+-	configure-target-cygmon
++CONFIGURE_TARGET_MODULES =
+ 
+ # This is a list of the check targets for all of the modules which are
+ # compiled using $(TARGET_FLAGS_TO_PASS).
+-CHECK_TARGET_MODULES = \
+-	check-target-libstdc++-v3 \
+-	check-target-newlib \
+-	check-target-libf2c \
+-	check-target-libobjc \
+-	check-target-winsup \
+-	check-target-libiberty \
+-	check-target-libffi \
+-	check-target-libjava \
+-	check-target-zlib \
+-	check-target-boehm-gc \
+-	check-target-qthreads \
+-	check-target-gperf
++CHECK_TARGET_MODULES =
+ 
+ # This is a list of the install targets for all of the modules which are
+ # compiled using $(TARGET_FLAGS_TO_PASS).
+-INSTALL_TARGET_MODULES = \
+-	install-target-libstdc++-v3 \
+-	install-target-newlib \
+-	install-target-libf2c \
+-	install-target-libobjc \
+-	install-target-libtermcap \
+-	install-target-winsup \
+-	install-target-libgloss \
+-	install-target-libiberty \
+-	install-target-bsp \
+-	install-target-libjava \
+-	install-target-zlib \
+-	install-target-boehm-gc \
+-	install-target-qthreads \
+-	install-target-gperf
++INSTALL_TARGET_MODULES =
+ 
+ # This is a list of the targets for which we can do a clean-{target}.
+ CLEAN_MODULES = \
diff --git a/devel/avr-gcc-3/files/patch-ac b/devel/avr-gcc-3/files/patch-ac
index 0dcd72c3a9e..cec083e3ee8 100644
--- a/devel/avr-gcc-3/files/patch-ac
+++ b/devel/avr-gcc-3/files/patch-ac
@@ -1,6 +1,6 @@
---- configure.in.orig	Sun Aug 12 18:18:37 2001
-+++ configure.in	Sun Aug 12 18:18:13 2001
-@@ -665,6 +665,9 @@
+--- configure.in.orig	Sun May  5 20:56:48 2002
++++ configure.in	Tue Jun  4 18:21:31 2002
+@@ -706,6 +706,9 @@
  	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
      fi
      ;;
diff --git a/devel/avr-gcc-3/pkg-plist b/devel/avr-gcc-3/pkg-plist
index 49599272308..be43d0b1e09 100644
--- a/devel/avr-gcc-3/pkg-plist
+++ b/devel/avr-gcc-3/pkg-plist
@@ -2,86 +2,60 @@ avr/bin/c++
 avr/bin/g++
 avr/bin/gcc
 bin/avr-c++
-bin/avr-c++filt
 bin/avr-cpp
 bin/avr-g++
 bin/avr-gcc
-bin/gccbug
-lib/gcc-lib/avr/3.0.1/avr3/libgcc.a
-lib/gcc-lib/avr/3.0.1/avr4/libgcc.a
-lib/gcc-lib/avr/3.0.1/avr5/libgcc.a
-lib/gcc-lib/avr/3.0.1/cc1
-lib/gcc-lib/avr/3.0.1/cc1plus
-lib/gcc-lib/avr/3.0.1/collect2
-lib/gcc-lib/avr/3.0.1/cpp0
-lib/gcc-lib/avr/3.0.1/include/README
-lib/gcc-lib/avr/3.0.1/include/fixed
-lib/gcc-lib/avr/3.0.1/include/float.h
-lib/gcc-lib/avr/3.0.1/include/iso646.h
-lib/gcc-lib/avr/3.0.1/include/limits.h
-lib/gcc-lib/avr/3.0.1/include/proto.h
-lib/gcc-lib/avr/3.0.1/include/stdarg.h
-lib/gcc-lib/avr/3.0.1/include/stdbool.h
-lib/gcc-lib/avr/3.0.1/include/stddef.h
-lib/gcc-lib/avr/3.0.1/include/syslimits.h
-lib/gcc-lib/avr/3.0.1/include/varargs.h
-lib/gcc-lib/avr/3.0.1/libgcc.a
-lib/gcc-lib/avr/3.0.1/specs
-lib/gcc-lib/avr/3.0.1/tradcpp0
-@unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/gcc.info %D/info/dir
-@unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-info/cpp.info
-info/cpp.info-1
-info/cpp.info-2
-info/cpp.info-3
-info/cpp.info-4
-info/cppinternals.info
-info/gcc.info
-info/gcc.info-1
-info/gcc.info-10
-info/gcc.info-11
-info/gcc.info-12
-info/gcc.info-13
-info/gcc.info-14
-info/gcc.info-15
-info/gcc.info-16
-info/gcc.info-17
-info/gcc.info-18
-info/gcc.info-19
-info/gcc.info-2
-info/gcc.info-20
-info/gcc.info-21
-info/gcc.info-22
-info/gcc.info-23
-info/gcc.info-24
-info/gcc.info-25
-info/gcc.info-26
-info/gcc.info-27
-info/gcc.info-28
-info/gcc.info-29
-info/gcc.info-3
-info/gcc.info-30
-info/gcc.info-31
-info/gcc.info-32
-info/gcc.info-33
-info/gcc.info-34
-info/gcc.info-35
-info/gcc.info-36
-info/gcc.info-37
-info/gcc.info-38
-info/gcc.info-4
-info/gcc.info-5
-info/gcc.info-6
-info/gcc.info-7
-info/gcc.info-8
-info/gcc.info-9
-@exec install-info %D/info/cpp.info %D/info/dir
-@exec install-info %D/info/gcc.info %D/info/dir
-@exec install-info %D/info/cppinternals.info %D/info/dir
-@dirrm lib/gcc-lib/avr/3.0.1/avr3
-@dirrm lib/gcc-lib/avr/3.0.1/avr4
-@dirrm lib/gcc-lib/avr/3.0.1/avr5
-@dirrm lib/gcc-lib/avr/3.0.1/include
-@dirrm lib/gcc-lib/avr/3.0.1
+bin/avr-gcc-3.2
+bin/avr-gccbug
+lib/charset.alias
+lib/gcc-lib/avr/3.2/avr3/libgcc.a
+lib/gcc-lib/avr/3.2/avr4/libgcc.a
+lib/gcc-lib/avr/3.2/avr5/libgcc.a
+lib/gcc-lib/avr/3.2/cc1
+lib/gcc-lib/avr/3.2/cc1plus
+lib/gcc-lib/avr/3.2/collect2
+lib/gcc-lib/avr/3.2/include/README
+lib/gcc-lib/avr/3.2/include/fixed
+lib/gcc-lib/avr/3.2/include/float.h
+lib/gcc-lib/avr/3.2/include/iso646.h
+lib/gcc-lib/avr/3.2/include/limits.h
+lib/gcc-lib/avr/3.2/include/stdarg.h
+lib/gcc-lib/avr/3.2/include/stdbool.h
+lib/gcc-lib/avr/3.2/include/stddef.h
+lib/gcc-lib/avr/3.2/include/syslimits.h
+lib/gcc-lib/avr/3.2/include/varargs.h
+lib/gcc-lib/avr/3.2/install-tools/fix-header
+lib/gcc-lib/avr/3.2/install-tools/fixinc.sh
+lib/gcc-lib/avr/3.2/install-tools/fixincl
+lib/gcc-lib/avr/3.2/install-tools/fixproto
+lib/gcc-lib/avr/3.2/install-tools/gsyslimits.h
+lib/gcc-lib/avr/3.2/install-tools/include/README
+lib/gcc-lib/avr/3.2/install-tools/include/float.h
+lib/gcc-lib/avr/3.2/install-tools/include/iso646.h
+lib/gcc-lib/avr/3.2/install-tools/include/limits.h
+lib/gcc-lib/avr/3.2/install-tools/include/stdarg.h
+lib/gcc-lib/avr/3.2/install-tools/include/stdbool.h
+lib/gcc-lib/avr/3.2/install-tools/include/stddef.h
+lib/gcc-lib/avr/3.2/install-tools/include/varargs.h
+lib/gcc-lib/avr/3.2/install-tools/mkheaders
+lib/gcc-lib/avr/3.2/install-tools/mkheaders.conf
+lib/gcc-lib/avr/3.2/install-tools/mkinstalldirs
+lib/gcc-lib/avr/3.2/libgcc.a
+lib/gcc-lib/avr/3.2/specs
+lib/gcc-lib/avr/3.2/tradcpp0
+share/locale/da/LC_MESSAGES/gcc.mo
+share/locale/el/LC_MESSAGES/gcc.mo
+share/locale/es/LC_MESSAGES/gcc.mo
+share/locale/fr/LC_MESSAGES/gcc.mo
+share/locale/ja/LC_MESSAGES/gcc.mo
+share/locale/nl/LC_MESSAGES/gcc.mo
+share/locale/sv/LC_MESSAGES/gcc.mo
+share/locale/tr/LC_MESSAGES/gcc.mo
+@dirrm lib/gcc-lib/avr/3.2/avr3
+@dirrm lib/gcc-lib/avr/3.2/avr4
+@dirrm lib/gcc-lib/avr/3.2/avr5
+@dirrm lib/gcc-lib/avr/3.2/include
+@dirrm lib/gcc-lib/avr/3.2/install-tools/include
+@dirrm lib/gcc-lib/avr/3.2/install-tools
+@dirrm lib/gcc-lib/avr/3.2
 @dirrm lib/gcc-lib/avr
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 93a7fb70b64..2e69fcee098 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	3.0.1
+PORTVERSION=	3.2-2002-06-28
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-${PORTVERSION}
+#MASTER_SITES=	${MASTER_SITE_GNU}
+#MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-${PORTVERSION}
+#MASTER_SITES=	ftp://gcc.gnu.org/pub/gcc/snapshots/${PORTVERSION}/
+MASTER_SITES=	http://people.freebsd.org/~joerg/
 PKGNAMEPREFIX=	avr-
-DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-g++-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES=	gcc-core+g++-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	joerg@freebsd.org
 
@@ -26,7 +27,7 @@ WRKSRC=		${WRKDIR}/gcc-${PORTVERSION}
 
 # Unfortunately, only some mirrors have it as a .bz2 file, while
 # the original master site still uses .gz.
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 GNU_CONFIGURE=	yes
@@ -35,6 +36,8 @@ CONFIGURE_ARGS=	--target=avr
 
 MAKE_FLAGS=	LANGUAGES="c c++"
 
-MAN1=		cpp.1 avr-gcc.1 avr-g++.1 gcov.1
+# Only few man pages in this snapshot...
+#MAN1=		cpp.1 avr-gcc.1 avr-g++.1 gcov.1
+MAN1=		avr-g++.1
 
 .include <bsd.port.mk>
diff --git a/devel/avr-gcc/distinfo b/devel/avr-gcc/distinfo
index a5506b660ed..0fa55974014 100644
--- a/devel/avr-gcc/distinfo
+++ b/devel/avr-gcc/distinfo
@@ -1,2 +1 @@
-MD5 (gcc-core-3.0.1.tar.gz) = 578c6325cf667a5490745cdc11a7ae13
-MD5 (gcc-g++-3.0.1.tar.gz) = a103af4b1b8adef934d8c80d39aa12c1
+MD5 (gcc-core+g++-3.2-2002-06-28.tar.bz2) = fbff197d2e911fb664546b80df65a28d
diff --git a/devel/avr-gcc/files/patch-aa b/devel/avr-gcc/files/patch-aa
index 9650bc956f1..d8682e14577 100644
--- a/devel/avr-gcc/files/patch-aa
+++ b/devel/avr-gcc/files/patch-aa
@@ -1,7 +1,7 @@
---- libiberty/Makefile.in.orig	Sat Dec  9 00:16:27 2000
-+++ libiberty/Makefile.in	Thu Apr 19 22:27:57 2001
-@@ -152,7 +152,8 @@
- 	$(RANLIB) $(TARGETLIB)
+--- libiberty/Makefile.in.orig	Tue Jan 22 21:03:29 2002
++++ libiberty/Makefile.in	Tue Jun  4 18:19:26 2002
+@@ -234,7 +234,8 @@
+ @MAINT@	echo stamp > stamp-functions
  
  INSTALL_DEST = @INSTALL_DEST@
 -install: install_to_$(INSTALL_DEST) install-subdir
diff --git a/devel/avr-gcc/files/patch-ab b/devel/avr-gcc/files/patch-ab
index 60189c6a619..4177fd28988 100644
--- a/devel/avr-gcc/files/patch-ab
+++ b/devel/avr-gcc/files/patch-ab
@@ -1,11 +1,97 @@
---- Makefile.in.orig	Sun Aug 12 16:44:46 2001
-+++ Makefile.in	Sun Aug 12 16:45:18 2001
-@@ -169,7 +169,7 @@
+--- Makefile.in.orig	Fri Jun 28 09:56:30 2002
++++ Makefile.in	Fri Jun 28 10:53:22 2002
+@@ -186,7 +186,7 @@
  
  # This is set by the configure script to the list of directories which
  # should be built using the target tools.
--TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib librx winsup opcodes bsp libstub cygmon libf2c libchill libobjc
-+TARGET_CONFIGDIRS = libgloss $(SPECIAL_LIBS) newlib librx winsup opcodes bsp libstub cygmon libf2c libchill libobjc
+-TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib winsup opcodes bsp libstub cygmon libf2c libobjc
++TARGET_CONFIGDIRS = libgloss $(SPECIAL_LIBS) newlib winsup opcodes bsp libstub cygmon
  
  # Target libraries are put under this directory:
  # Changed by configure to $(target_alias) if cross.
+@@ -781,81 +781,19 @@
+ 
+ # This is a list of the targets for all of the modules which are compiled
+ # using $(TARGET_FLAGS_TO_PASS).
+-ALL_TARGET_MODULES = \
+-	all-target-libstdc++-v3 \
+-	all-target-newlib \
+-	all-target-libf2c \
+-	all-target-libobjc \
+-	all-target-libtermcap \
+-	all-target-winsup \
+-	all-target-libgloss \
+-	all-target-libiberty \
+-	all-target-gperf \
+-	all-target-examples \
+-	all-target-libstub \
+-	all-target-libffi \
+-	all-target-libjava \
+-	all-target-zlib \
+-	all-target-boehm-gc \
+-	all-target-qthreads \
+-	all-target-bsp \
+-	all-target-cygmon
++ALL_TARGET_MODULES =
+ 
+ # This is a list of the configure targets for all of the modules which
+ # are compiled using the target tools.
+-CONFIGURE_TARGET_MODULES = \
+-	configure-target-libstdc++-v3 \
+-	configure-target-newlib \
+-	configure-target-libf2c \
+-	configure-target-libobjc \
+-	configure-target-libtermcap \
+-	configure-target-winsup \
+-	configure-target-libgloss \
+-	configure-target-libiberty \
+-	configure-target-gperf \
+-	configure-target-examples \
+-	configure-target-libstub \
+-	configure-target-libffi \
+-	configure-target-libjava \
+-	configure-target-zlib \
+-	configure-target-boehm-gc \
+-	configure-target-qthreads \
+-	configure-target-bsp \
+-	configure-target-cygmon
++CONFIGURE_TARGET_MODULES =
+ 
+ # This is a list of the check targets for all of the modules which are
+ # compiled using $(TARGET_FLAGS_TO_PASS).
+-CHECK_TARGET_MODULES = \
+-	check-target-libstdc++-v3 \
+-	check-target-newlib \
+-	check-target-libf2c \
+-	check-target-libobjc \
+-	check-target-winsup \
+-	check-target-libiberty \
+-	check-target-libffi \
+-	check-target-libjava \
+-	check-target-zlib \
+-	check-target-boehm-gc \
+-	check-target-qthreads \
+-	check-target-gperf
++CHECK_TARGET_MODULES =
+ 
+ # This is a list of the install targets for all of the modules which are
+ # compiled using $(TARGET_FLAGS_TO_PASS).
+-INSTALL_TARGET_MODULES = \
+-	install-target-libstdc++-v3 \
+-	install-target-newlib \
+-	install-target-libf2c \
+-	install-target-libobjc \
+-	install-target-libtermcap \
+-	install-target-winsup \
+-	install-target-libgloss \
+-	install-target-libiberty \
+-	install-target-bsp \
+-	install-target-libjava \
+-	install-target-zlib \
+-	install-target-boehm-gc \
+-	install-target-qthreads \
+-	install-target-gperf
++INSTALL_TARGET_MODULES =
+ 
+ # This is a list of the targets for which we can do a clean-{target}.
+ CLEAN_MODULES = \
diff --git a/devel/avr-gcc/files/patch-ac b/devel/avr-gcc/files/patch-ac
index 0dcd72c3a9e..cec083e3ee8 100644
--- a/devel/avr-gcc/files/patch-ac
+++ b/devel/avr-gcc/files/patch-ac
@@ -1,6 +1,6 @@
---- configure.in.orig	Sun Aug 12 18:18:37 2001
-+++ configure.in	Sun Aug 12 18:18:13 2001
-@@ -665,6 +665,9 @@
+--- configure.in.orig	Sun May  5 20:56:48 2002
++++ configure.in	Tue Jun  4 18:21:31 2002
+@@ -706,6 +706,9 @@
  	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
      fi
      ;;
diff --git a/devel/avr-gcc/pkg-plist b/devel/avr-gcc/pkg-plist
index 49599272308..be43d0b1e09 100644
--- a/devel/avr-gcc/pkg-plist
+++ b/devel/avr-gcc/pkg-plist
@@ -2,86 +2,60 @@ avr/bin/c++
 avr/bin/g++
 avr/bin/gcc
 bin/avr-c++
-bin/avr-c++filt
 bin/avr-cpp
 bin/avr-g++
 bin/avr-gcc
-bin/gccbug
-lib/gcc-lib/avr/3.0.1/avr3/libgcc.a
-lib/gcc-lib/avr/3.0.1/avr4/libgcc.a
-lib/gcc-lib/avr/3.0.1/avr5/libgcc.a
-lib/gcc-lib/avr/3.0.1/cc1
-lib/gcc-lib/avr/3.0.1/cc1plus
-lib/gcc-lib/avr/3.0.1/collect2
-lib/gcc-lib/avr/3.0.1/cpp0
-lib/gcc-lib/avr/3.0.1/include/README
-lib/gcc-lib/avr/3.0.1/include/fixed
-lib/gcc-lib/avr/3.0.1/include/float.h
-lib/gcc-lib/avr/3.0.1/include/iso646.h
-lib/gcc-lib/avr/3.0.1/include/limits.h
-lib/gcc-lib/avr/3.0.1/include/proto.h
-lib/gcc-lib/avr/3.0.1/include/stdarg.h
-lib/gcc-lib/avr/3.0.1/include/stdbool.h
-lib/gcc-lib/avr/3.0.1/include/stddef.h
-lib/gcc-lib/avr/3.0.1/include/syslimits.h
-lib/gcc-lib/avr/3.0.1/include/varargs.h
-lib/gcc-lib/avr/3.0.1/libgcc.a
-lib/gcc-lib/avr/3.0.1/specs
-lib/gcc-lib/avr/3.0.1/tradcpp0
-@unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/gcc.info %D/info/dir
-@unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-info/cpp.info
-info/cpp.info-1
-info/cpp.info-2
-info/cpp.info-3
-info/cpp.info-4
-info/cppinternals.info
-info/gcc.info
-info/gcc.info-1
-info/gcc.info-10
-info/gcc.info-11
-info/gcc.info-12
-info/gcc.info-13
-info/gcc.info-14
-info/gcc.info-15
-info/gcc.info-16
-info/gcc.info-17
-info/gcc.info-18
-info/gcc.info-19
-info/gcc.info-2
-info/gcc.info-20
-info/gcc.info-21
-info/gcc.info-22
-info/gcc.info-23
-info/gcc.info-24
-info/gcc.info-25
-info/gcc.info-26
-info/gcc.info-27
-info/gcc.info-28
-info/gcc.info-29
-info/gcc.info-3
-info/gcc.info-30
-info/gcc.info-31
-info/gcc.info-32
-info/gcc.info-33
-info/gcc.info-34
-info/gcc.info-35
-info/gcc.info-36
-info/gcc.info-37
-info/gcc.info-38
-info/gcc.info-4
-info/gcc.info-5
-info/gcc.info-6
-info/gcc.info-7
-info/gcc.info-8
-info/gcc.info-9
-@exec install-info %D/info/cpp.info %D/info/dir
-@exec install-info %D/info/gcc.info %D/info/dir
-@exec install-info %D/info/cppinternals.info %D/info/dir
-@dirrm lib/gcc-lib/avr/3.0.1/avr3
-@dirrm lib/gcc-lib/avr/3.0.1/avr4
-@dirrm lib/gcc-lib/avr/3.0.1/avr5
-@dirrm lib/gcc-lib/avr/3.0.1/include
-@dirrm lib/gcc-lib/avr/3.0.1
+bin/avr-gcc-3.2
+bin/avr-gccbug
+lib/charset.alias
+lib/gcc-lib/avr/3.2/avr3/libgcc.a
+lib/gcc-lib/avr/3.2/avr4/libgcc.a
+lib/gcc-lib/avr/3.2/avr5/libgcc.a
+lib/gcc-lib/avr/3.2/cc1
+lib/gcc-lib/avr/3.2/cc1plus
+lib/gcc-lib/avr/3.2/collect2
+lib/gcc-lib/avr/3.2/include/README
+lib/gcc-lib/avr/3.2/include/fixed
+lib/gcc-lib/avr/3.2/include/float.h
+lib/gcc-lib/avr/3.2/include/iso646.h
+lib/gcc-lib/avr/3.2/include/limits.h
+lib/gcc-lib/avr/3.2/include/stdarg.h
+lib/gcc-lib/avr/3.2/include/stdbool.h
+lib/gcc-lib/avr/3.2/include/stddef.h
+lib/gcc-lib/avr/3.2/include/syslimits.h
+lib/gcc-lib/avr/3.2/include/varargs.h
+lib/gcc-lib/avr/3.2/install-tools/fix-header
+lib/gcc-lib/avr/3.2/install-tools/fixinc.sh
+lib/gcc-lib/avr/3.2/install-tools/fixincl
+lib/gcc-lib/avr/3.2/install-tools/fixproto
+lib/gcc-lib/avr/3.2/install-tools/gsyslimits.h
+lib/gcc-lib/avr/3.2/install-tools/include/README
+lib/gcc-lib/avr/3.2/install-tools/include/float.h
+lib/gcc-lib/avr/3.2/install-tools/include/iso646.h
+lib/gcc-lib/avr/3.2/install-tools/include/limits.h
+lib/gcc-lib/avr/3.2/install-tools/include/stdarg.h
+lib/gcc-lib/avr/3.2/install-tools/include/stdbool.h
+lib/gcc-lib/avr/3.2/install-tools/include/stddef.h
+lib/gcc-lib/avr/3.2/install-tools/include/varargs.h
+lib/gcc-lib/avr/3.2/install-tools/mkheaders
+lib/gcc-lib/avr/3.2/install-tools/mkheaders.conf
+lib/gcc-lib/avr/3.2/install-tools/mkinstalldirs
+lib/gcc-lib/avr/3.2/libgcc.a
+lib/gcc-lib/avr/3.2/specs
+lib/gcc-lib/avr/3.2/tradcpp0
+share/locale/da/LC_MESSAGES/gcc.mo
+share/locale/el/LC_MESSAGES/gcc.mo
+share/locale/es/LC_MESSAGES/gcc.mo
+share/locale/fr/LC_MESSAGES/gcc.mo
+share/locale/ja/LC_MESSAGES/gcc.mo
+share/locale/nl/LC_MESSAGES/gcc.mo
+share/locale/sv/LC_MESSAGES/gcc.mo
+share/locale/tr/LC_MESSAGES/gcc.mo
+@dirrm lib/gcc-lib/avr/3.2/avr3
+@dirrm lib/gcc-lib/avr/3.2/avr4
+@dirrm lib/gcc-lib/avr/3.2/avr5
+@dirrm lib/gcc-lib/avr/3.2/include
+@dirrm lib/gcc-lib/avr/3.2/install-tools/include
+@dirrm lib/gcc-lib/avr/3.2/install-tools
+@dirrm lib/gcc-lib/avr/3.2
 @dirrm lib/gcc-lib/avr