3 files changed, 18 insertions, 10 deletions

diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 54b79317c9c8..741e916da3b4 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITES+=	http://people.freebsd.org/~joerg/:local
diff --git a/devel/avr-gcc/files/patch-newdevices b/devel/avr-gcc/files/patch-newdevices
index 734e61a092bc..b034533fb235 100644
--- a/devel/avr-gcc/files/patch-newdevices
+++ b/devel/avr-gcc/files/patch-newdevices
@@ -1,10 +1,13 @@
 diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
---- ../gcc-3.4.5.orig/gcc/config/avr/avr.c	Wed Dec 14 23:11:50 2005
-+++ ./gcc/config/avr/avr.c	Wed Dec 14 23:14:22 2005
-@@ -175,6 +175,15 @@
+--- ../gcc-3.4.5.orig/gcc/config/avr/avr.c	Wed Jan  4 22:38:40 2006
++++ ./gcc/config/avr/avr.c	Wed Jan  4 22:44:07 2006
+@@ -175,6 +175,18 @@
    { "at90c8534", 2, "__AVR_AT90C8534__" },
    { "at90s8535", 2, "__AVR_AT90S8535__" },
    { "at86rf401", 2, "__AVR_AT86RF401__" },
++  { "attiny261", 2, "__AVR_ATtiny261__" },
++  { "attiny461", 2, "__AVR_ATtiny461__" },
++  { "attiny861", 2, "__AVR_ATtiny861__" },
 +    /* Classic + MOVW, <= 8K.  */
 +  { "attiny13",   2, "__AVR_ATtiny13__" },
 +  { "attiny2313", 2, "__AVR_ATtiny2313__" },  
@@ -17,7 +20,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
      /* Classic, > 8K.  */
    { "avr3",      3, NULL },
    { "atmega103", 3, "__AVR_ATmega103__" },
-@@ -185,19 +194,42 @@
+@@ -185,19 +197,42 @@
      /* Enhanced, <= 8K.  */
    { "avr4",      4, NULL },
    { "atmega8",   4, "__AVR_ATmega8__" },
@@ -61,8 +64,8 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
      /* Assembler only.  */
    { "avr1",      1, NULL },
 diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
---- ../gcc-3.4.5.orig/gcc/config/avr/avr.h	Wed Dec 14 23:11:46 2005
-+++ ./gcc/config/avr/avr.h	Wed Dec 14 23:15:30 2005
+--- ../gcc-3.4.5.orig/gcc/config/avr/avr.h	Wed Jan  4 22:38:36 2006
++++ ./gcc/config/avr/avr.h	Wed Jan  4 22:45:00 2006
 @@ -2351,12 +2351,13 @@
     Do not define this macro if it does not need to do anything.  */
  
@@ -70,7 +73,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
 -%{mmcu=at90s1200|mmcu=attiny1*|mmcu=attiny28:-m avr1} \
 -%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401:-m avr2}\
 +%{mmcu=at90s1200|mmcu=attiny11|mmcu=attiny12|mmcu=attiny15|mmcu=attiny28:-m avr1} \
-+%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401|mmcu=attiny13|mmcu=attiny2313|mmcu=attiny24|mmcu=attiny44|mmcu=attiny84|mmcu=attiny25|mmcu=attiny45|mmcu=attiny85:-m avr2}\
++%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401|mmcu=attiny13|mmcu=attiny2313|mmcu=attiny24|mmcu=attiny44|mmcu=attiny84|mmcu=attiny25|mmcu=attiny45|mmcu=attiny85|mmcu=attiny261|mmcu=attiny461|mmcu=attiny861:-m avr2}\
  %{mmcu=atmega103|mmcu=atmega603|mmcu=at43*|mmcu=at76*:-m avr3}\
 -%{mmcu=atmega8*:-m avr4}\
 -%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega64|mmcu=atmega128|mmcu=at94k:-m avr5}\
@@ -100,7 +103,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
  /* Another C string constant that tells the GCC driver program how
     and when to place a reference to `libgcc.a' into the linker
     command line.  This constant is placed both before and after the
-@@ -2421,23 +2422,54 @@
+@@ -2421,23 +2422,57 @@
  %{mmcu=at90c8534:crtc8534.o%s} \
  %{mmcu=at90s8535:crts8535.o%s} \
  %{mmcu=at86rf401:crt86401.o%s} \
@@ -112,6 +115,9 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
 +%{mmcu=attiny25:crttn25.o%s} \
 +%{mmcu=attiny45:crttn45.o%s} \
 +%{mmcu=attiny85:crttn85.o%s} \
++%{mmcu=attiny261:crttn261.o%s} \
++%{mmcu=attiny461:crttn461.o%s} \
++%{mmcu=attiny861:crttn861.o%s} \
  %{mmcu=atmega103|mmcu=avr3:crtm103.o%s} \
  %{mmcu=atmega603:crtm603.o%s} \
  %{mmcu=at43usb320:crt43320.o%s} \
@@ -157,7 +163,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
  #define EXTRA_SPECS {"crt_binutils", CRT_BINUTILS_SPECS},
 diff -ur ../gcc-3.4.5.orig/gcc/config/avr/t-avr ./gcc/config/avr/t-avr
 --- ../gcc-3.4.5.orig/gcc/config/avr/t-avr	Mon Apr 25 06:17:34 2005
-+++ ./gcc/config/avr/t-avr	Wed Dec 14 23:13:03 2005
++++ ./gcc/config/avr/t-avr	Wed Jan  4 22:43:26 2006
 @@ -46,12 +46,27 @@
  	mmcu?avr3=mmcu?at43usb320 mmcu?avr3=mmcu?at43usb355 \
  	mmcu?avr3=mmcu?at76c711 \
diff --git a/devel/avr-gcc/pkg-descr b/devel/avr-gcc/pkg-descr
index fdb759b14332..bfa484c5cf92 100644
--- a/devel/avr-gcc/pkg-descr
+++ b/devel/avr-gcc/pkg-descr
@@ -12,7 +12,8 @@ Locally hack added: recognizes 0bXXX binary constants
 Locally added support for the following AVR devices:
 
   ATtiny13/ATtiny2313             ATtiny24/ATtiny44/ATtiny84
-  ATmega48/ATmega88/ATmega168     ATtiny25/ATtiny45/ATtiny85
+  ATtiny25/ATtiny45/ATtiny85      ATtiny261/ATtiny461/ATtiny861
+  ATmega48/ATmega88/ATmega168
   ATmega164/ATmega324/ATmega644   ATmega165
   ATmega325/ATmega3250/ATmega645/ATmega6450
   ATmega329/ATmega3290/ATmega649/ATmega6490