8 files changed, 116 insertions, 142 deletions

diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index 2fed433ac19c..0f7dcae3ca21 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -6,17 +6,13 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	2.95.2
+PORTVERSION=	20010320
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gcc
 PKGNAMEPREFIX=	avr-
 DISTNAME=	gcc-core-${PORTVERSION}
 
-PATCH_SITES=	http://home.overta.ru/users/denisc/gcc/
-PATCHFILES=	${DISTNAME}-avr-patch-1.1.gz
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	joerg@freebsd.org
 
 BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
@@ -34,10 +30,9 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--target=avr
-CONFIGURE_ENV=	CFLAGS="-O -pipe"
 
 MAKE_FLAGS=	LANGUAGES="c"
 
-MAN1=		cccp.1 avr-gcc.1
+MAN1=		cpp.1 avr-gcc.1 gcov.1
 
 .include <bsd.port.mk>
diff --git a/devel/avr-gcc-3/distinfo b/devel/avr-gcc-3/distinfo
index c56bb96a12c7..d72799e8bd50 100644
--- a/devel/avr-gcc-3/distinfo
+++ b/devel/avr-gcc-3/distinfo
@@ -1,2 +1 @@
-MD5 (gcc-core-2.95.2.tar.gz) = 2112ab0eaf621186a6c87a1a8c96c9b6
-MD5 (gcc-core-2.95.2-avr-patch-1.1.gz) = 2fe04c7db44d68627232b2f61c7ef8f7
+MD5 (gcc-core-20010320.tar.gz) = 6b8ea1b6770509bb2e5d01705cd85af4
diff --git a/devel/avr-gcc-3/files/patch-aa b/devel/avr-gcc-3/files/patch-aa
index 32f7da28a8ac..9650bc956f12 100644
--- a/devel/avr-gcc-3/files/patch-aa
+++ b/devel/avr-gcc-3/files/patch-aa
@@ -1,22 +1,12 @@
---- gcc/configure.in.orig	Sat Mar 10 22:07:33 2001
-+++ gcc/configure.in	Sat Mar 10 22:13:54 2001
-@@ -626,7 +626,7 @@
-  			thread_file='posix'
-  		fi
- 		;;
--	alpha*-*-netbsd*)
-+	alpha*-*-netbsd*|alpha*-*-freebsd*)
- 		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
- 		target_cpu_default="MASK_GAS"
- 		tmake_file="alpha/t-crtbe alpha/t-ieee"
---- gcc/configure.orig	Wed Oct 13 09:58:02 1999
-+++ gcc/configure	Thu Mar 15 17:52:27 2001
-@@ -3059,7 +3059,7 @@
-  			thread_file='posix'
-  		fi
- 		;;
--	alpha*-*-netbsd*)
-+	alpha*-*-netbsd*|alpha*-*-freebsd*)
- 		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
- 		target_cpu_default="MASK_GAS"
- 		tmake_file="alpha/t-crtbe alpha/t-ieee"
+--- 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)
+ 
+ INSTALL_DEST = @INSTALL_DEST@
+-install: install_to_$(INSTALL_DEST) install-subdir
++#install: install_to_$(INSTALL_DEST) install-subdir
++install:
+ 
+ install_to_libdir: all
+ 	$(INSTALL_DATA) $(TARGETLIB) $(libdir)$(MULTISUBDIR)/$(TARGETLIB)n
diff --git a/devel/avr-gcc-3/pkg-plist b/devel/avr-gcc-3/pkg-plist
index eeb59d27a142..073bcca67f0f 100644
--- a/devel/avr-gcc-3/pkg-plist
+++ b/devel/avr-gcc-3/pkg-plist
@@ -1,50 +1,43 @@
 avr/bin/gcc
 avr/include/assert.h
 bin/avr-gcc
-bin/cpp
-lib/gcc-lib/avr/2.95.2/include/assert.h
-lib/gcc-lib/avr/2.95.2/include/syslimits.h
-lib/gcc-lib/avr/2.95.2/include/stdarg.h
-lib/gcc-lib/avr/2.95.2/include/stddef.h
-lib/gcc-lib/avr/2.95.2/include/varargs.h
-lib/gcc-lib/avr/2.95.2/include/va-alpha.h
-lib/gcc-lib/avr/2.95.2/include/va-h8300.h
-lib/gcc-lib/avr/2.95.2/include/va-i860.h
-lib/gcc-lib/avr/2.95.2/include/va-i960.h
-lib/gcc-lib/avr/2.95.2/include/va-mips.h
-lib/gcc-lib/avr/2.95.2/include/va-m88k.h
-lib/gcc-lib/avr/2.95.2/include/va-mn10200.h
-lib/gcc-lib/avr/2.95.2/include/va-mn10300.h
-lib/gcc-lib/avr/2.95.2/include/va-pa.h
-lib/gcc-lib/avr/2.95.2/include/va-pyr.h
-lib/gcc-lib/avr/2.95.2/include/va-sparc.h
-lib/gcc-lib/avr/2.95.2/include/va-clipper.h
-lib/gcc-lib/avr/2.95.2/include/va-spur.h
-lib/gcc-lib/avr/2.95.2/include/va-m32r.h
-lib/gcc-lib/avr/2.95.2/include/va-sh.h
-lib/gcc-lib/avr/2.95.2/include/va-v850.h
-lib/gcc-lib/avr/2.95.2/include/va-arc.h
-lib/gcc-lib/avr/2.95.2/include/iso646.h
-lib/gcc-lib/avr/2.95.2/include/va-ppc.h
-lib/gcc-lib/avr/2.95.2/include/va-avr.h
-lib/gcc-lib/avr/2.95.2/include/va-c4x.h
-lib/gcc-lib/avr/2.95.2/include/proto.h
-lib/gcc-lib/avr/2.95.2/include/stdbool.h
-lib/gcc-lib/avr/2.95.2/include/limits.h
-lib/gcc-lib/avr/2.95.2/include/float.h
-lib/gcc-lib/avr/2.95.2/include/README
-lib/gcc-lib/avr/2.95.2/include/fixed
-lib/gcc-lib/avr/2.95.2/cc1
-lib/gcc-lib/avr/2.95.2/collect2
-lib/gcc-lib/avr/2.95.2/cpp
-lib/gcc-lib/avr/2.95.2/libgcc.a
-lib/gcc-lib/avr/2.95.2/specs
+bin/avr-cpp
+bin/gccbug
+lib/gcc-lib/avr/3.0/cc1
+lib/gcc-lib/avr/3.0/collect2
+lib/gcc-lib/avr/3.0/specs
+lib/gcc-lib/avr/3.0/cpp0
+lib/gcc-lib/avr/3.0/tradcpp0
+lib/gcc-lib/avr/3.0/libgcc.a
+lib/gcc-lib/avr/3.0/avr3/libgcc.a
+lib/gcc-lib/avr/3.0/avr4/libgcc.a
+lib/gcc-lib/avr/3.0/avr5/libgcc.a
+lib/gcc-lib/avr/3.0/include/assert.h
+lib/gcc-lib/avr/3.0/include/syslimits.h
+lib/gcc-lib/avr/3.0/include/stdarg.h
+lib/gcc-lib/avr/3.0/include/stddef.h
+lib/gcc-lib/avr/3.0/include/varargs.h
+lib/gcc-lib/avr/3.0/include/proto.h
+lib/gcc-lib/avr/3.0/include/stdbool.h
+lib/gcc-lib/avr/3.0/include/iso646.h
+lib/gcc-lib/avr/3.0/include/limits.h
+lib/gcc-lib/avr/3.0/include/float.h
+lib/gcc-lib/avr/3.0/include/README
+lib/gcc-lib/avr/3.0/include/fixed
+share/locale/sv/LC_MESSAGES/gcc.mo
 @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/c-tree.info %D/info/dir
+@unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+info/c-tree.info
+info/c-tree.info-1
+info/c-tree.info-2
+info/c-tree.info-3
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
 info/cpp.info-3
+info/cppinternals.info
 info/gcc.info
 info/gcc.info-1
 info/gcc.info-10
@@ -70,6 +63,11 @@ 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-4
 info/gcc.info-5
 info/gcc.info-6
@@ -78,7 +76,12 @@ 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
-@dirrm lib/gcc-lib/avr/2.95.2/include
-@dirrm lib/gcc-lib/avr/2.95.2
+@exec install-info %D/info/c-tree.info %D/info/dir
+@exec install-info %D/info/cppinternals.info %D/info/dir
+@dirrm lib/gcc-lib/avr/3.0/avr3
+@dirrm lib/gcc-lib/avr/3.0/avr4
+@dirrm lib/gcc-lib/avr/3.0/avr5
+@dirrm lib/gcc-lib/avr/3.0/include
+@dirrm lib/gcc-lib/avr/3.0
 @dirrm lib/gcc-lib/avr
 @dirrm avr/include
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 2fed433ac19c..0f7dcae3ca21 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -6,17 +6,13 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	2.95.2
+PORTVERSION=	20010320
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gcc
 PKGNAMEPREFIX=	avr-
 DISTNAME=	gcc-core-${PORTVERSION}
 
-PATCH_SITES=	http://home.overta.ru/users/denisc/gcc/
-PATCHFILES=	${DISTNAME}-avr-patch-1.1.gz
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	joerg@freebsd.org
 
 BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
@@ -34,10 +30,9 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--target=avr
-CONFIGURE_ENV=	CFLAGS="-O -pipe"
 
 MAKE_FLAGS=	LANGUAGES="c"
 
-MAN1=		cccp.1 avr-gcc.1
+MAN1=		cpp.1 avr-gcc.1 gcov.1
 
 .include <bsd.port.mk>
diff --git a/devel/avr-gcc/distinfo b/devel/avr-gcc/distinfo
index c56bb96a12c7..d72799e8bd50 100644
--- a/devel/avr-gcc/distinfo
+++ b/devel/avr-gcc/distinfo
@@ -1,2 +1 @@
-MD5 (gcc-core-2.95.2.tar.gz) = 2112ab0eaf621186a6c87a1a8c96c9b6
-MD5 (gcc-core-2.95.2-avr-patch-1.1.gz) = 2fe04c7db44d68627232b2f61c7ef8f7
+MD5 (gcc-core-20010320.tar.gz) = 6b8ea1b6770509bb2e5d01705cd85af4
diff --git a/devel/avr-gcc/files/patch-aa b/devel/avr-gcc/files/patch-aa
index 32f7da28a8ac..9650bc956f12 100644
--- a/devel/avr-gcc/files/patch-aa
+++ b/devel/avr-gcc/files/patch-aa
@@ -1,22 +1,12 @@
---- gcc/configure.in.orig	Sat Mar 10 22:07:33 2001
-+++ gcc/configure.in	Sat Mar 10 22:13:54 2001
-@@ -626,7 +626,7 @@
-  			thread_file='posix'
-  		fi
- 		;;
--	alpha*-*-netbsd*)
-+	alpha*-*-netbsd*|alpha*-*-freebsd*)
- 		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
- 		target_cpu_default="MASK_GAS"
- 		tmake_file="alpha/t-crtbe alpha/t-ieee"
---- gcc/configure.orig	Wed Oct 13 09:58:02 1999
-+++ gcc/configure	Thu Mar 15 17:52:27 2001
-@@ -3059,7 +3059,7 @@
-  			thread_file='posix'
-  		fi
- 		;;
--	alpha*-*-netbsd*)
-+	alpha*-*-netbsd*|alpha*-*-freebsd*)
- 		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
- 		target_cpu_default="MASK_GAS"
- 		tmake_file="alpha/t-crtbe alpha/t-ieee"
+--- 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)
+ 
+ INSTALL_DEST = @INSTALL_DEST@
+-install: install_to_$(INSTALL_DEST) install-subdir
++#install: install_to_$(INSTALL_DEST) install-subdir
++install:
+ 
+ install_to_libdir: all
+ 	$(INSTALL_DATA) $(TARGETLIB) $(libdir)$(MULTISUBDIR)/$(TARGETLIB)n
diff --git a/devel/avr-gcc/pkg-plist b/devel/avr-gcc/pkg-plist
index eeb59d27a142..073bcca67f0f 100644
--- a/devel/avr-gcc/pkg-plist
+++ b/devel/avr-gcc/pkg-plist
@@ -1,50 +1,43 @@
 avr/bin/gcc
 avr/include/assert.h
 bin/avr-gcc
-bin/cpp
-lib/gcc-lib/avr/2.95.2/include/assert.h
-lib/gcc-lib/avr/2.95.2/include/syslimits.h
-lib/gcc-lib/avr/2.95.2/include/stdarg.h
-lib/gcc-lib/avr/2.95.2/include/stddef.h
-lib/gcc-lib/avr/2.95.2/include/varargs.h
-lib/gcc-lib/avr/2.95.2/include/va-alpha.h
-lib/gcc-lib/avr/2.95.2/include/va-h8300.h
-lib/gcc-lib/avr/2.95.2/include/va-i860.h
-lib/gcc-lib/avr/2.95.2/include/va-i960.h
-lib/gcc-lib/avr/2.95.2/include/va-mips.h
-lib/gcc-lib/avr/2.95.2/include/va-m88k.h
-lib/gcc-lib/avr/2.95.2/include/va-mn10200.h
-lib/gcc-lib/avr/2.95.2/include/va-mn10300.h
-lib/gcc-lib/avr/2.95.2/include/va-pa.h
-lib/gcc-lib/avr/2.95.2/include/va-pyr.h
-lib/gcc-lib/avr/2.95.2/include/va-sparc.h
-lib/gcc-lib/avr/2.95.2/include/va-clipper.h
-lib/gcc-lib/avr/2.95.2/include/va-spur.h
-lib/gcc-lib/avr/2.95.2/include/va-m32r.h
-lib/gcc-lib/avr/2.95.2/include/va-sh.h
-lib/gcc-lib/avr/2.95.2/include/va-v850.h
-lib/gcc-lib/avr/2.95.2/include/va-arc.h
-lib/gcc-lib/avr/2.95.2/include/iso646.h
-lib/gcc-lib/avr/2.95.2/include/va-ppc.h
-lib/gcc-lib/avr/2.95.2/include/va-avr.h
-lib/gcc-lib/avr/2.95.2/include/va-c4x.h
-lib/gcc-lib/avr/2.95.2/include/proto.h
-lib/gcc-lib/avr/2.95.2/include/stdbool.h
-lib/gcc-lib/avr/2.95.2/include/limits.h
-lib/gcc-lib/avr/2.95.2/include/float.h
-lib/gcc-lib/avr/2.95.2/include/README
-lib/gcc-lib/avr/2.95.2/include/fixed
-lib/gcc-lib/avr/2.95.2/cc1
-lib/gcc-lib/avr/2.95.2/collect2
-lib/gcc-lib/avr/2.95.2/cpp
-lib/gcc-lib/avr/2.95.2/libgcc.a
-lib/gcc-lib/avr/2.95.2/specs
+bin/avr-cpp
+bin/gccbug
+lib/gcc-lib/avr/3.0/cc1
+lib/gcc-lib/avr/3.0/collect2
+lib/gcc-lib/avr/3.0/specs
+lib/gcc-lib/avr/3.0/cpp0
+lib/gcc-lib/avr/3.0/tradcpp0
+lib/gcc-lib/avr/3.0/libgcc.a
+lib/gcc-lib/avr/3.0/avr3/libgcc.a
+lib/gcc-lib/avr/3.0/avr4/libgcc.a
+lib/gcc-lib/avr/3.0/avr5/libgcc.a
+lib/gcc-lib/avr/3.0/include/assert.h
+lib/gcc-lib/avr/3.0/include/syslimits.h
+lib/gcc-lib/avr/3.0/include/stdarg.h
+lib/gcc-lib/avr/3.0/include/stddef.h
+lib/gcc-lib/avr/3.0/include/varargs.h
+lib/gcc-lib/avr/3.0/include/proto.h
+lib/gcc-lib/avr/3.0/include/stdbool.h
+lib/gcc-lib/avr/3.0/include/iso646.h
+lib/gcc-lib/avr/3.0/include/limits.h
+lib/gcc-lib/avr/3.0/include/float.h
+lib/gcc-lib/avr/3.0/include/README
+lib/gcc-lib/avr/3.0/include/fixed
+share/locale/sv/LC_MESSAGES/gcc.mo
 @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/c-tree.info %D/info/dir
+@unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+info/c-tree.info
+info/c-tree.info-1
+info/c-tree.info-2
+info/c-tree.info-3
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
 info/cpp.info-3
+info/cppinternals.info
 info/gcc.info
 info/gcc.info-1
 info/gcc.info-10
@@ -70,6 +63,11 @@ 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-4
 info/gcc.info-5
 info/gcc.info-6
@@ -78,7 +76,12 @@ 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
-@dirrm lib/gcc-lib/avr/2.95.2/include
-@dirrm lib/gcc-lib/avr/2.95.2
+@exec install-info %D/info/c-tree.info %D/info/dir
+@exec install-info %D/info/cppinternals.info %D/info/dir
+@dirrm lib/gcc-lib/avr/3.0/avr3
+@dirrm lib/gcc-lib/avr/3.0/avr4
+@dirrm lib/gcc-lib/avr/3.0/avr5
+@dirrm lib/gcc-lib/avr/3.0/include
+@dirrm lib/gcc-lib/avr/3.0
 @dirrm lib/gcc-lib/avr
 @dirrm avr/include