5 files changed, 15 insertions, 56 deletions

diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index c645d11d62e6..20133cacb3e8 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	3.3.2002.09.01
+PORTVERSION=	3.3.2002.10.01
 CATEGORIES=	devel
 #MASTER_SITES=	${MASTER_SITE_GNU}
 #MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -19,8 +19,6 @@ EXTRACT_ONLY=	gcc-core+g++-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	joerg@freebsd.org
 
-BROKEN=		"pkg-plist is incorrect"
-
 BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
 		avr-ld:${PORTSDIR}/devel/avr-binutils \
 		autoheader:${PORTSDIR}/devel/autoconf \
@@ -39,9 +37,11 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--target=avr
 
-MAN_AUX=	gcc-man.2002.09.01.gz
+MAN_AUX=	gcc-man.2002.10.01.gz
 
 MAKE_FLAGS=	LANGUAGES="c c++"
+# get rid of that silly -mcpu=pentiumpro -current is so fond of. :-(
+MAKE_ENV=	MACHINE_ARCH=avr
 
 MAN1=		cpp.1 avr-gcc.1 avr-g++.1 gcov.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
diff --git a/devel/avr-gcc/distinfo b/devel/avr-gcc/distinfo
index d7c10e6f6ed8..31c07a4701af 100644
--- a/devel/avr-gcc/distinfo
+++ b/devel/avr-gcc/distinfo
@@ -1,2 +1,2 @@
-MD5 (gcc-core+g++-3.3.2002.09.01.tar.bz2) = 6424c3b48736fc0c126374bc44cbbe57
-MD5 (gcc-man.2002.09.01.gz) = 6712fd9a90730fda4d4ae483037731e0
+MD5 (gcc-core+g++-3.3.2002.10.01.tar.bz2) = 6ccdbd6133a4884d07ba9a86f6ec7ffb
+MD5 (gcc-man.2002.10.01.gz) = 5840b17b749722425acc3f371b9688d9
diff --git a/devel/avr-gcc/files/patch-ab b/devel/avr-gcc/files/patch-ab
index c20f2aa1c9c7..307e0574744f 100644
--- a/devel/avr-gcc/files/patch-ab
+++ b/devel/avr-gcc/files/patch-ab
@@ -1,15 +1,6 @@
---- Makefile.in.orig	Mon Aug 12 15:13:39 2002
-+++ Makefile.in	Mon Aug 12 15:31:13 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 winsup opcodes libf2c libobjc
-+TARGET_CONFIGDIRS = libgloss $(SPECIAL_LIBS) newlib winsup opcodes
- 
- # Target libraries are put under this directory:
- # Changed by configure to $(target_alias) if cross.
-@@ -755,74 +755,19 @@
+--- Makefile.in.orig	Tue Oct  1 21:56:45 2002
++++ Makefile.in	Wed Oct  2 13:19:05 2002
+@@ -753,74 +753,19 @@
  
  # This is a list of the targets for all of the modules which are compiled
  # using $(TARGET_FLAGS_TO_PASS).
@@ -28,7 +19,7 @@
 -	all-target-libjava \
 -	all-target-zlib \
 -	all-target-boehm-gc \
--	all-target-qthreads
+-	all-target-qthreads 
 +ALL_TARGET_MODULES =
  
  # This is a list of the configure targets for all of the modules which
@@ -48,7 +39,7 @@
 -	configure-target-libjava \
 -	configure-target-zlib \
 -	configure-target-boehm-gc \
--	configure-target-qthreads
+-	configure-target-qthreads 
 +CONFIGURE_TARGET_MODULES =
  
  # This is a list of the check targets for all of the modules which are
@@ -60,12 +51,12 @@
 -	check-target-libobjc \
 -	check-target-winsup \
 -	check-target-libiberty \
+-	check-target-gperf \
 -	check-target-libffi \
 -	check-target-libjava \
 -	check-target-zlib \
 -	check-target-boehm-gc \
--	check-target-qthreads \
--	check-target-gperf
+-	check-target-qthreads 
 +CHECK_TARGET_MODULES =
  
  # This is a list of the install targets for all of the modules which are
@@ -79,11 +70,11 @@
 -	install-target-winsup \
 -	install-target-libgloss \
 -	install-target-libiberty \
+-	install-target-gperf \
 -	install-target-libjava \
 -	install-target-zlib \
 -	install-target-boehm-gc \
--	install-target-qthreads \
--	install-target-gperf
+-	install-target-qthreads 
 +INSTALL_TARGET_MODULES =
  
  # This is a list of the targets for which we can do a clean-{target}.
diff --git a/devel/avr-gcc/files/patch-ad b/devel/avr-gcc/files/patch-ad
deleted file mode 100644
index 52f922b28531..000000000000
--- a/devel/avr-gcc/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc/cp/Make-lang.in.orig	Tue Jun  4 09:09:54 2002
-+++ gcc/cp/Make-lang.in	Mon Jun 17 23:16:10 2002
-@@ -50,7 +50,8 @@
- DEMANGLER_CROSS_NAME = `echo c++filt|sed '$(program_transform_cross_name)'`
- 
- # The name to use for the demangler program.
--DEMANGLER_PROG = c++filt$(exeext)
-+#DEMANGLER_PROG = c++filt$(exeext)
-+DEMANGLER_PROG =
- 
- #
- # Define the names for selecting c++ in LANGUAGES.
diff --git a/devel/avr-gcc/files/patch-no-c++-excepts b/devel/avr-gcc/files/patch-no-c++-excepts
deleted file mode 100644
index d738b8228f20..000000000000
--- a/devel/avr-gcc/files/patch-no-c++-excepts
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: gcc/config/avr/avr.h
-===================================================================
-RCS file: /cvsroot/gcc/gcc/gcc/config/avr/avr.h,v
-retrieving revision 1.66
-diff -u -r1.66 avr.h
---- gcc/config/avr/avr.h	11 Aug 2002 18:48:50 -0000	1.66
-+++ gcc/config/avr/avr.h	28 Aug 2002 21:12:06 -0000
-@@ -2523,6 +2523,12 @@
- 
-    Do not define this macro if it does not need to do anything.  */
- 
-+#define CC1PLUS_SPEC "%{!frtti:-fno-rtti} \
-+    %{!fenforce-eh-specs:-fno-enforce-eh-specs} \
-+    %{!fexceptions:-fno-exceptions}"
-+/* A C string constant that tells the GNU CC drvier program options to
-+   pass to `cc1plus'. */
-+
- #define ASM_SPEC "%{mmcu=*:-mmcu=%*}"
- /* A C string constant that tells the GNU CC driver program options to
-    pass to the assembler.  It can also specify how to translate