8 files changed, 36 insertions, 46 deletions

diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index 40e316b33309..b7d7eef9d5c8 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -5,21 +5,11 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2001-03-20
-SNAPVER=	${SNAPDATE:S/-//g}
-
 PORTNAME=	gcc
-PORTVERSION=	${SNAPVER}
+PORTVERSION=	3.0
 CATEGORIES=	devel
-#MASTER_SITES=	${MASTER_SITE_GNU}
-#MASTER_SITE_SUBDIR=	gcc
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
-PKGNAMEPREFIX=	avr-
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTNAME=	gcc-core-${PORTVERSION}
 
 MAINTAINER=	joerg@freebsd.org
diff --git a/devel/avr-gcc-3/distinfo b/devel/avr-gcc-3/distinfo
index d72799e8bd50..9627930e7ad3 100644
--- a/devel/avr-gcc-3/distinfo
+++ b/devel/avr-gcc-3/distinfo
@@ -1 +1 @@
-MD5 (gcc-core-20010320.tar.gz) = 6b8ea1b6770509bb2e5d01705cd85af4
+MD5 (gcc-core-3.0.tar.gz) = 7c92ef3beeac09fd00ccd56c17ba12c9
diff --git a/devel/avr-gcc-3/files/patch-ab b/devel/avr-gcc-3/files/patch-ab
new file mode 100644
index 000000000000..60189c6a6192
--- /dev/null
+++ b/devel/avr-gcc-3/files/patch-ab
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Aug 12 16:44:46 2001
++++ Makefile.in	Sun Aug 12 16:45:18 2001
+@@ -169,7 +169,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 libraries are put under this directory:
+ # Changed by configure to $(target_alias) if cross.
diff --git a/devel/avr-gcc-3/pkg-plist b/devel/avr-gcc-3/pkg-plist
index 073bcca67f0f..f7653b4af4bc 100644
--- a/devel/avr-gcc-3/pkg-plist
+++ b/devel/avr-gcc-3/pkg-plist
@@ -1,8 +1,6 @@
 avr/bin/gcc
-avr/include/assert.h
 bin/avr-gcc
 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
@@ -12,7 +10,6 @@ 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
@@ -24,15 +21,10 @@ 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
@@ -68,6 +60,9 @@ 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
@@ -84,4 +79,3 @@ info/gcc.info-9
 @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 40e316b33309..b7d7eef9d5c8 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -5,21 +5,11 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2001-03-20
-SNAPVER=	${SNAPDATE:S/-//g}
-
 PORTNAME=	gcc
-PORTVERSION=	${SNAPVER}
+PORTVERSION=	3.0
 CATEGORIES=	devel
-#MASTER_SITES=	${MASTER_SITE_GNU}
-#MASTER_SITE_SUBDIR=	gcc
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
-PKGNAMEPREFIX=	avr-
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTNAME=	gcc-core-${PORTVERSION}
 
 MAINTAINER=	joerg@freebsd.org
diff --git a/devel/avr-gcc/distinfo b/devel/avr-gcc/distinfo
index d72799e8bd50..9627930e7ad3 100644
--- a/devel/avr-gcc/distinfo
+++ b/devel/avr-gcc/distinfo
@@ -1 +1 @@
-MD5 (gcc-core-20010320.tar.gz) = 6b8ea1b6770509bb2e5d01705cd85af4
+MD5 (gcc-core-3.0.tar.gz) = 7c92ef3beeac09fd00ccd56c17ba12c9
diff --git a/devel/avr-gcc/files/patch-ab b/devel/avr-gcc/files/patch-ab
new file mode 100644
index 000000000000..60189c6a6192
--- /dev/null
+++ b/devel/avr-gcc/files/patch-ab
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Aug 12 16:44:46 2001
++++ Makefile.in	Sun Aug 12 16:45:18 2001
+@@ -169,7 +169,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 libraries are put under this directory:
+ # Changed by configure to $(target_alias) if cross.
diff --git a/devel/avr-gcc/pkg-plist b/devel/avr-gcc/pkg-plist
index 073bcca67f0f..f7653b4af4bc 100644
--- a/devel/avr-gcc/pkg-plist
+++ b/devel/avr-gcc/pkg-plist
@@ -1,8 +1,6 @@
 avr/bin/gcc
-avr/include/assert.h
 bin/avr-gcc
 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
@@ -12,7 +10,6 @@ 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
@@ -24,15 +21,10 @@ 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
@@ -68,6 +60,9 @@ 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
@@ -84,4 +79,3 @@ info/gcc.info-9
 @dirrm lib/gcc-lib/avr/3.0/include
 @dirrm lib/gcc-lib/avr/3.0
 @dirrm lib/gcc-lib/avr
-@dirrm avr/include