4 files changed, 57 insertions, 57 deletions

diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index 4fcbffb33a7c..b80381b0e6fa 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	3.3.1
-PORTREVISION=	1
+PORTVERSION=	3.3.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITES+=	http://people.freebsd.org/~joerg/:local
@@ -20,31 +19,29 @@ EXTRACT_ONLY=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
 		gcc-g++-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	joerg@freebsd.org
-COMMENT=	FSF GCC 3.3.1 for Atmel AVR 8-bit RISC cross-development
+COMMENT=	FSF GCC 3.x for Atmel AVR 8-bit RISC cross-development
 
 BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
 		avr-ld:${PORTSDIR}/devel/avr-binutils \
 		autoheader:${PORTSDIR}/devel/autoconf
 RUN_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
 		avr-ld:${PORTSDIR}/devel/avr-binutils
-USE_GETTEXT=	yes
 
 WRKSRC=		${WRKDIR}/gcc-${PORTVERSION}
 
-# Unfortunately, only some mirrors have it as a .bz2 file, while
-# the original master site still uses .gz.
 USE_PERL5_BUILD=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--target=avr
 
-MAN_AUX=	gcc-man.2003.09.09.tar.gz
+MAN_AUX=	gcc-man.${PORTVERSION}.tar.gz
 
 MAKE_FLAGS=	LANGUAGES="c c++"
-# get rid of that silly -mcpu=pentiumpro -current is so fond of. :-(
+# get rid of that silly -mcpu=pentiumpro FreeBSD 5+ is so fond of. :-(
 MAKE_ENV=	MACHINE_ARCH=avr
 
 MAN1=		cpp.1 avr-gcc.1 avr-g++.1 gcov.1
@@ -54,7 +51,7 @@ INFO=		cpp gcc gccint cppinternals
 # Since the pod2man in FreeBSD 4-stable's /usr/bin cannot be used, we
 # help out by extracting precompiled manpages there.
 pre-build:
-		if perl -e 'use 1.10 Pod::Man' >/dev/null 2>/dev/null ; \
+		if ${PERL} -e 'use 1.10 Pod::Man' >/dev/null 2>/dev/null ; \
 		then : ; \
 		else \
 			cd ${WRKDIR}/gcc-${PORTVERSION} ; \
diff --git a/devel/avr-gcc-3/distinfo b/devel/avr-gcc-3/distinfo
index d5b8b8921454..0cfeb46f37e3 100644
--- a/devel/avr-gcc-3/distinfo
+++ b/devel/avr-gcc-3/distinfo
@@ -1,3 +1,6 @@
-MD5 (gcc-core-3.3.1.tar.bz2) = 8c113f495402c5ab8bf35133268de561
-MD5 (gcc-g++-3.3.1.tar.bz2) = 0e74dc443140e287f471cd1d607bb663
-MD5 (gcc-man.2003.09.09.tar.gz) = fe6f08f928ccc57459f0f58b6d5ba623
+MD5 (gcc-core-3.3.2.tar.bz2) = 42d1314aaa11a40e4c7c9fcb0f49259a
+SIZE (gcc-core-3.3.2.tar.bz2) = 11258151
+MD5 (gcc-g++-3.3.2.tar.bz2) = b9ae980739e7f9299addc0a3576777e7
+SIZE (gcc-g++-3.3.2.tar.bz2) = 2068257
+MD5 (gcc-man.3.3.2.tar.gz) = 0f028fe521da96f7903060f642bb436f
+SIZE (gcc-man.3.3.2.tar.gz) = 155462
diff --git a/devel/avr-gcc-3/pkg-descr b/devel/avr-gcc-3/pkg-descr
index 695f85290e59..3f1fe8df77e3 100644
--- a/devel/avr-gcc-3/pkg-descr
+++ b/devel/avr-gcc-3/pkg-descr
@@ -1,4 +1,4 @@
-FSF gcc-3.0 for Atmel AVR cross-development
+FSF gcc-3.x for Atmel AVR cross-development
 
 This brings the gcc compiler to the Atmel AVR 8-bit RISC family of
 microcontrollers.
diff --git a/devel/avr-gcc-3/pkg-plist b/devel/avr-gcc-3/pkg-plist
index 2580514f39dc..9beb52d403f5 100644
--- a/devel/avr-gcc-3/pkg-plist
+++ b/devel/avr-gcc-3/pkg-plist
@@ -5,45 +5,45 @@ bin/avr-c++
 bin/avr-cpp
 bin/avr-g++
 bin/avr-gcc
-bin/avr-gcc-3.3.1
+bin/avr-gcc-3.3.2
 bin/avr-gccbug
 lib/charset.alias
-lib/gcc-lib/avr/3.3.1/avr3/libgcc.a
-lib/gcc-lib/avr/3.3.1/avr4/libgcc.a
-lib/gcc-lib/avr/3.3.1/avr5/libgcc.a
-lib/gcc-lib/avr/3.3.1/cc1
-lib/gcc-lib/avr/3.3.1/cc1plus
-lib/gcc-lib/avr/3.3.1/collect2
-lib/gcc-lib/avr/3.3.1/include/README
-lib/gcc-lib/avr/3.3.1/include/fixed
-lib/gcc-lib/avr/3.3.1/include/float.h
-lib/gcc-lib/avr/3.3.1/include/iso646.h
-lib/gcc-lib/avr/3.3.1/include/limits.h
-lib/gcc-lib/avr/3.3.1/include/stdarg.h
-lib/gcc-lib/avr/3.3.1/include/stdbool.h
-lib/gcc-lib/avr/3.3.1/include/stddef.h
-lib/gcc-lib/avr/3.3.1/include/syslimits.h
-lib/gcc-lib/avr/3.3.1/include/unwind.h
-lib/gcc-lib/avr/3.3.1/include/varargs.h
-lib/gcc-lib/avr/3.3.1/install-tools/fix-header
-lib/gcc-lib/avr/3.3.1/install-tools/fixinc.sh
-lib/gcc-lib/avr/3.3.1/install-tools/fixincl
-lib/gcc-lib/avr/3.3.1/install-tools/fixproto
-lib/gcc-lib/avr/3.3.1/install-tools/gsyslimits.h
-lib/gcc-lib/avr/3.3.1/install-tools/include/README
-lib/gcc-lib/avr/3.3.1/install-tools/include/float.h
-lib/gcc-lib/avr/3.3.1/install-tools/include/iso646.h
-lib/gcc-lib/avr/3.3.1/install-tools/include/limits.h
-lib/gcc-lib/avr/3.3.1/install-tools/include/stdarg.h
-lib/gcc-lib/avr/3.3.1/install-tools/include/stdbool.h
-lib/gcc-lib/avr/3.3.1/install-tools/include/stddef.h
-lib/gcc-lib/avr/3.3.1/install-tools/include/unwind.h
-lib/gcc-lib/avr/3.3.1/install-tools/include/varargs.h
-lib/gcc-lib/avr/3.3.1/install-tools/mkheaders
-lib/gcc-lib/avr/3.3.1/install-tools/mkheaders.conf
-lib/gcc-lib/avr/3.3.1/install-tools/mkinstalldirs
-lib/gcc-lib/avr/3.3.1/libgcc.a
-lib/gcc-lib/avr/3.3.1/specs
+lib/gcc-lib/avr/3.3.2/avr3/libgcc.a
+lib/gcc-lib/avr/3.3.2/avr4/libgcc.a
+lib/gcc-lib/avr/3.3.2/avr5/libgcc.a
+lib/gcc-lib/avr/3.3.2/cc1
+lib/gcc-lib/avr/3.3.2/cc1plus
+lib/gcc-lib/avr/3.3.2/collect2
+lib/gcc-lib/avr/3.3.2/include/README
+lib/gcc-lib/avr/3.3.2/include/fixed
+lib/gcc-lib/avr/3.3.2/include/float.h
+lib/gcc-lib/avr/3.3.2/include/iso646.h
+lib/gcc-lib/avr/3.3.2/include/limits.h
+lib/gcc-lib/avr/3.3.2/include/stdarg.h
+lib/gcc-lib/avr/3.3.2/include/stdbool.h
+lib/gcc-lib/avr/3.3.2/include/stddef.h
+lib/gcc-lib/avr/3.3.2/include/syslimits.h
+lib/gcc-lib/avr/3.3.2/include/unwind.h
+lib/gcc-lib/avr/3.3.2/include/varargs.h
+lib/gcc-lib/avr/3.3.2/install-tools/fix-header
+lib/gcc-lib/avr/3.3.2/install-tools/fixinc.sh
+lib/gcc-lib/avr/3.3.2/install-tools/fixincl
+lib/gcc-lib/avr/3.3.2/install-tools/fixproto
+lib/gcc-lib/avr/3.3.2/install-tools/gsyslimits.h
+lib/gcc-lib/avr/3.3.2/install-tools/include/README
+lib/gcc-lib/avr/3.3.2/install-tools/include/float.h
+lib/gcc-lib/avr/3.3.2/install-tools/include/iso646.h
+lib/gcc-lib/avr/3.3.2/install-tools/include/limits.h
+lib/gcc-lib/avr/3.3.2/install-tools/include/stdarg.h
+lib/gcc-lib/avr/3.3.2/install-tools/include/stdbool.h
+lib/gcc-lib/avr/3.3.2/install-tools/include/stddef.h
+lib/gcc-lib/avr/3.3.2/install-tools/include/unwind.h
+lib/gcc-lib/avr/3.3.2/install-tools/include/varargs.h
+lib/gcc-lib/avr/3.3.2/install-tools/mkheaders
+lib/gcc-lib/avr/3.3.2/install-tools/mkheaders.conf
+lib/gcc-lib/avr/3.3.2/install-tools/mkinstalldirs
+lib/gcc-lib/avr/3.3.2/libgcc.a
+lib/gcc-lib/avr/3.3.2/specs
 share/locale/be/LC_MESSAGES/gcc.mo
 share/locale/da/LC_MESSAGES/gcc.mo
 share/locale/de/LC_MESSAGES/gcc.mo
@@ -54,11 +54,11 @@ 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.3.1/avr3
-@dirrm lib/gcc-lib/avr/3.3.1/avr4
-@dirrm lib/gcc-lib/avr/3.3.1/avr5
-@dirrm lib/gcc-lib/avr/3.3.1/include
-@dirrm lib/gcc-lib/avr/3.3.1/install-tools/include
-@dirrm lib/gcc-lib/avr/3.3.1/install-tools
-@dirrm lib/gcc-lib/avr/3.3.1
+@dirrm lib/gcc-lib/avr/3.3.2/avr3
+@dirrm lib/gcc-lib/avr/3.3.2/avr4
+@dirrm lib/gcc-lib/avr/3.3.2/avr5
+@dirrm lib/gcc-lib/avr/3.3.2/include
+@dirrm lib/gcc-lib/avr/3.3.2/install-tools/include
+@dirrm lib/gcc-lib/avr/3.3.2/install-tools
+@dirrm lib/gcc-lib/avr/3.3.2
 @dirrm lib/gcc-lib/avr