Upgrade avr-libc to version 1.2.5.

avr-libc-1.2.5 is the 5th bugfix release after 1.2.
The following list shortly summarizes the changes in version 1.2.0 compared
to version 1.0.5 of AVR Libc, which was the latest release from the 1.0
release line by the time 1.2.0 was released.

    * Removal of all items marked as deprecated in the past, namely:
          o all header files from the base include directory, as they have
            been moved to the avr/ subdirectory long time ago (e.g. <io.h>
            is now <avr/io.h>),
          o deprecated macros and functions (sbi, cbi, inb, outb, inp, outp,
            inw, outw, BV, PRG_RDB, eeprom_rb, eeprom_rw, eeprom_wb)
          o <avr/timer.h> removed completely, as it was bogus and not really
            useful at all
    * <avr/ina90.h> and <avr/twi.h> have been moved to the new <compat/...>
      include subdirectory,
    * The following new devices are supported:
          o ATmega165
          o ATmega325
          o ATmega3250
          o ATmega645
          o ATmega6450
          o ATmega48
          o ATmega88
          o ATmega168
          o ATtiny13
          o ATtiny2313
          o AT90CAN128
    * realloc() is now implemented,
    * the boot API has been changed in a way that is incompatible with the
      1.0 API,
    * the delay API has two new functions added to allow the specification of
      delays directly in microseconds, or milliseconds,
    * documentation changes: a newer version of Doxygen is used; Unix-style
      manual pages are now generated as part of the documentation; a helper
      script named avr-man can be used to display these manual pages,
    * a single unified Copyright now applies to all files in AVR Libc.

5 files changed, 178 insertions, 176 deletions

diff --git a/cross/avr-libc/Makefile b/cross/avr-libc/Makefile
index 8831e427f11..654b31c5189 100644
--- a/cross/avr-libc/Makefile
+++ b/cross/avr-libc/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2005/03/24 21:12:52 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/15 08:45:54 wennmach Exp $
 
-DISTNAME=		avr-libc-1.0.4
+DISTNAME=		avr-libc-1.2.5
 CATEGORIES=		cross
 MASTER_SITES=		http://people.freebsd.org/~joerg/ \
 			http://savannah.nongnu.org/download/avr-libc/
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		karlj@mdstud.chalmers.se
+MAINTAINER=		wennmach@NetBSD.org
 HOMEPAGE=		http://savannah.nongnu.org/projects/avr-libc
 COMMENT=		C and math library for Atmel AVR 8-bit microcontrollers
 
@@ -18,10 +18,16 @@ BUILD_DEPENDS+=		transfig-*:../../print/transfig
 BUILD_DEPENDS+=		netpbm-*:../../graphics/netpbm
 
 USE_BZIP2=		yes
+USE_TOOLS+=		gmake
 HAS_CONFIGURE=		yes
-CONFIGURE_ENV=		CC=${LOCALBASE}/bin/avr-gcc PREFIX=${PREFIX}
-CONFIGURE_SCRIPT=	./doconf
-CONFIGURE_ARGS=		--disable-versioned-doc --enable-html-doc --enable-doc
+CONFIGURE_ENV+=		CC=${LOCALBASE}/bin/avr-gcc
+CONFIGURE_ENV+=		PREFIX=${PREFIX}
+CONFIGURE_ARGS+=	--enable-doc
+CONFIGURE_ARGS+=	--disable-versioned-doc
+# avr-libc's method to build the man pages seems to be broken
+CONFIGURE_ARGS+=	--disable-man-doc
+CONFIGURE_SCRIPT=	${SRCDIR}/doconf
+SRCDIR=			${WRKDIR}/${DISTNAME}
 
 do-build:
 	(cd ${WRKSRC}; ./domake MAKE=${GMAKE})
diff --git a/cross/avr-libc/PLIST b/cross/avr-libc/PLIST
index 9e507a0705a..5f39d8c4e20 100644
--- a/cross/avr-libc/PLIST
+++ b/cross/avr-libc/PLIST
@@ -1,9 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2004/12/30 18:03:16 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/08/15 08:45:54 wennmach Exp $
+avr/include/ctype.h
+avr/include/errno.h
+avr/include/inttypes.h
+avr/include/math.h
+avr/include/setjmp.h
+avr/include/stdint.h
+avr/include/stdio.h
+avr/include/stdlib.h
+avr/include/string.h
 avr/include/avr/boot.h
 avr/include/avr/crc16.h
 avr/include/avr/delay.h
 avr/include/avr/eeprom.h
-avr/include/avr/ina90.h
 avr/include/avr/interrupt.h
 avr/include/avr/io.h
 avr/include/avr/io1200.h
@@ -22,23 +30,35 @@ avr/include/avr/io8534.h
 avr/include/avr/io8535.h
 avr/include/avr/io86r401.h
 avr/include/avr/ioat94k.h
+avr/include/avr/iocan128.h
 avr/include/avr/iom103.h
 avr/include/avr/iom128.h
 avr/include/avr/iom16.h
 avr/include/avr/iom161.h
 avr/include/avr/iom162.h
 avr/include/avr/iom163.h
+avr/include/avr/iom165.h
+avr/include/avr/iom168.h
 avr/include/avr/iom169.h
 avr/include/avr/iom32.h
 avr/include/avr/iom323.h
+avr/include/avr/iom325.h
+avr/include/avr/iom3250.h
+avr/include/avr/iom48.h
 avr/include/avr/iom64.h
+avr/include/avr/iom645.h
+avr/include/avr/iom6450.h
 avr/include/avr/iom8.h
 avr/include/avr/iom8515.h
 avr/include/avr/iom8535.h
+avr/include/avr/iom88.h
+avr/include/avr/iomx8.h
 avr/include/avr/iotn11.h
 avr/include/avr/iotn12.h
+avr/include/avr/iotn13.h
 avr/include/avr/iotn15.h
 avr/include/avr/iotn22.h
+avr/include/avr/iotn2313.h
 avr/include/avr/iotn26.h
 avr/include/avr/iotn28.h
 avr/include/avr/parity.h
@@ -47,27 +67,33 @@ avr/include/avr/portpins.h
 avr/include/avr/sfr_defs.h
 avr/include/avr/signal.h
 avr/include/avr/sleep.h
-avr/include/avr/timer.h
-avr/include/avr/twi.h
 avr/include/avr/wdt.h
-avr/include/ctype.h
-avr/include/eeprom.h
-avr/include/errno.h
-avr/include/ina90.h
-avr/include/interrupt.h
-avr/include/inttypes.h
-avr/include/io.h
-avr/include/math.h
-avr/include/pgmspace.h
-avr/include/progmem.h
-avr/include/setjmp.h
-avr/include/sig-avr.h
-avr/include/stdio.h
-avr/include/stdlib.h
-avr/include/string.h
-avr/include/timer.h
-avr/include/twi.h
-avr/include/wdt.h
+avr/include/compat/ina90.h
+avr/include/compat/twi.h
+avr/lib/crt86401.o
+avr/lib/crtc8534.o
+avr/lib/crts1200.o
+avr/lib/crts2313.o
+avr/lib/crts2323.o
+avr/lib/crts2333.o
+avr/lib/crts2343.o
+avr/lib/crts4414.o
+avr/lib/crts4433.o
+avr/lib/crts4434.o
+avr/lib/crts8515.o
+avr/lib/crts8535.o
+avr/lib/crttn11.o
+avr/lib/crttn12.o
+avr/lib/crttn15.o
+avr/lib/crttn22.o
+avr/lib/crttn26.o
+avr/lib/crttn28.o
+avr/lib/libc.a
+avr/lib/libm.a
+avr/lib/libprintf_flt.a
+avr/lib/libprintf_min.a
+avr/lib/libscanf_flt.a
+avr/lib/libscanf_min.a
 avr/lib/avr3/crt43320.o
 avr/lib/avr3/crt43355.o
 avr/lib/avr3/crt76711.o
@@ -103,130 +129,115 @@ avr/lib/avr5/libprintf_flt.a
 avr/lib/avr5/libprintf_min.a
 avr/lib/avr5/libscanf_flt.a
 avr/lib/avr5/libscanf_min.a
-avr/lib/crt86401.o
-avr/lib/crtc8534.o
-avr/lib/crts1200.o
-avr/lib/crts2313.o
-avr/lib/crts2323.o
-avr/lib/crts2333.o
-avr/lib/crts2343.o
-avr/lib/crts4414.o
-avr/lib/crts4433.o
-avr/lib/crts4434.o
-avr/lib/crts8515.o
-avr/lib/crts8535.o
-avr/lib/crttn11.o
-avr/lib/crttn12.o
-avr/lib/crttn15.o
-avr/lib/crttn22.o
-avr/lib/crttn26.o
-avr/lib/crttn28.o
-avr/lib/libc.a
-avr/lib/libm.a
-avr/lib/libprintf_flt.a
-avr/lib/libprintf_min.a
-avr/lib/libscanf_flt.a
-avr/lib/libscanf_min.a
+bin/avr-man
 share/doc/avr-libc/AUTHORS
 share/doc/avr-libc/LICENSE
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}.pdf
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}.ps
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/FAQ.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/acks.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/annotated.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/assembler.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/classes.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/demo.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/demo_project.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/deprecated.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dir_000000.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dir_000001.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dir_000002.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dir_000003.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dir_000004.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dir_000005.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dir_000006.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dir_000007.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dir_000008.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dir_000009.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dir_000010.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dir_000011.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dir_000012.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dir_000013.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/dox.css
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/doxygen.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/ftv2blank.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/ftv2doc.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/ftv2folderclosed.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/ftv2folderopen.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/ftv2lastnode.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/ftv2link.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/ftv2mlastnode.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/ftv2mnode.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/ftv2node.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/ftv2plastnode.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/ftv2pnode.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/ftv2vertline.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__boot.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__crc.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__eeprom.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__errno.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__interrupts.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__inttypes.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__io.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__math.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__pgmspace.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__sfr.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__sfr__notes.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__sleep.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__stdio.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__stdlib.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__string.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__avr__watchdog.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__ctype.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/group__setjmp.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/index.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/inline_asm.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/install_tools.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/main.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/malloc-std.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/malloc-x1.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/malloc-x2.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/malloc.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/mem_sections.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/modules.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/pages.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/release_method.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/releases.png
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/structdiv__t.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/structldiv__t.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/todo.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/tree.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/twi_demo.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/using_avrprog.html
-share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}/using_tools.html
+share/doc/avr-libc/avr-libc-user-manual.pdf
+share/doc/avr-libc/avr-libc-user-manual.ps
+share/doc/avr-libc/avr-libc-user-manual/FAQ.html
+share/doc/avr-libc/avr-libc-user-manual/acks.html
+share/doc/avr-libc/avr-libc-user-manual/annotated.html
+share/doc/avr-libc/avr-libc-user-manual/assembler.html
+share/doc/avr-libc/avr-libc-user-manual/classes.html
+share/doc/avr-libc/avr-libc-user-manual/demo.png
+share/doc/avr-libc/avr-libc-user-manual/dir_000000.html
+share/doc/avr-libc/avr-libc-user-manual/dir_000001.html
+share/doc/avr-libc/avr-libc-user-manual/dir_000002.html
+share/doc/avr-libc/avr-libc-user-manual/dir_000003.html
+share/doc/avr-libc/avr-libc-user-manual/dir_000004.html
+share/doc/avr-libc/avr-libc-user-manual/dir_000005.html
+share/doc/avr-libc/avr-libc-user-manual/dir_000006.html
+share/doc/avr-libc/avr-libc-user-manual/dir_000007.html
+share/doc/avr-libc/avr-libc-user-manual/dir_000008.html
+share/doc/avr-libc/avr-libc-user-manual/dir_000009.html
+share/doc/avr-libc/avr-libc-user-manual/dir_000010.html
+share/doc/avr-libc/avr-libc-user-manual/dir_000011.html
+share/doc/avr-libc/avr-libc-user-manual/dir_000012.html
+share/doc/avr-libc/avr-libc-user-manual/dir_000013.html
+share/doc/avr-libc/avr-libc-user-manual/dir_000014.html
+share/doc/avr-libc/avr-libc-user-manual/dirs.html
+share/doc/avr-libc/avr-libc-user-manual/dox.css
+share/doc/avr-libc/avr-libc-user-manual/doxygen.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2blank.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2doc.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2folderclosed.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2folderopen.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2lastnode.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2link.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2mlastnode.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2mnode.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2node.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2plastnode.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2pnode.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2vertline.png
+share/doc/avr-libc/avr-libc-user-manual/functions.html
+share/doc/avr-libc/avr-libc-user-manual/functions_vars.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__boot.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__crc.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__delay.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__eeprom.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__errno.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__interrupts.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__inttypes.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__io.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__math.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__parity.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__pgmspace.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__sfr.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__sfr__notes.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__sleep.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__stdint.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__stdio.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__stdlib.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__string.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__watchdog.html
+share/doc/avr-libc/avr-libc-user-manual/group__ctype.html
+share/doc/avr-libc/avr-libc-user-manual/group__demo__project.html
+share/doc/avr-libc/avr-libc-user-manual/group__demos.html
+share/doc/avr-libc/avr-libc-user-manual/group__setjmp.html
+share/doc/avr-libc/avr-libc-user-manual/group__twi__demo.html
+share/doc/avr-libc/avr-libc-user-manual/index.html
+share/doc/avr-libc/avr-libc-user-manual/inline_asm.html
+share/doc/avr-libc/avr-libc-user-manual/install_tools.html
+share/doc/avr-libc/avr-libc-user-manual/main.html
+share/doc/avr-libc/avr-libc-user-manual/malloc-std.png
+share/doc/avr-libc/avr-libc-user-manual/malloc-x1.png
+share/doc/avr-libc/avr-libc-user-manual/malloc-x2.png
+share/doc/avr-libc/avr-libc-user-manual/malloc.html
+share/doc/avr-libc/avr-libc-user-manual/mem_sections.html
+share/doc/avr-libc/avr-libc-user-manual/modules.html
+share/doc/avr-libc/avr-libc-user-manual/pages.html
+share/doc/avr-libc/avr-libc-user-manual/release_method.html
+share/doc/avr-libc/avr-libc-user-manual/releases.png
+share/doc/avr-libc/avr-libc-user-manual/structdiv__t.html
+share/doc/avr-libc/avr-libc-user-manual/structldiv__t.html
+share/doc/avr-libc/avr-libc-user-manual/todo.html
+share/doc/avr-libc/avr-libc-user-manual/tree.html
+share/doc/avr-libc/avr-libc-user-manual/using_avrprog.html
+share/doc/avr-libc/avr-libc-user-manual/using_tools.html
 share/doc/avr-libc/examples/avr-recv.c
-share/doc/avr-libc/examples/demo/Makefile
-share/doc/avr-libc/examples/demo/demo.bin
-share/doc/avr-libc/examples/demo/demo.c
-share/doc/avr-libc/examples/demo/demo.hex
-share/doc/avr-libc/examples/demo/demo.pdf
-share/doc/avr-libc/examples/demo/demo.srec
 share/doc/avr-libc/examples/io.c
 share/doc/avr-libc/examples/prg
 share/doc/avr-libc/examples/printf.h
 share/doc/avr-libc/examples/progmem.c
 share/doc/avr-libc/examples/send_byte.s
 share/doc/avr-libc/examples/signal.c
+share/doc/avr-libc/examples/demo/Makefile
+share/doc/avr-libc/examples/demo/demo.bin
+share/doc/avr-libc/examples/demo/demo.c
+share/doc/avr-libc/examples/demo/demo.hex
+share/doc/avr-libc/examples/demo/demo.pdf
+share/doc/avr-libc/examples/demo/demo.srec
 share/doc/avr-libc/examples/twitest/Makefile
 share/doc/avr-libc/examples/twitest/twitest.c
-@dirrm share/doc/avr-libc/examples/twitest
+@dirrm avr/include/avr
+@dirrm avr/include/compat
+@dirrm avr/include
+@dirrm avr/lib/avr3
+@dirrm avr/lib/avr4
+@dirrm avr/lib/avr5
+@dirrm share/doc/avr-libc/avr-libc-user-manual
 @dirrm share/doc/avr-libc/examples/demo
+@dirrm share/doc/avr-libc/examples/twitest
 @dirrm share/doc/avr-libc/examples
-@dirrm share/doc/avr-libc/avr-libc-user-manual-${PKGVERSION}
 @dirrm share/doc/avr-libc
-@dirrm avr/lib/avr5
-@dirrm avr/lib/avr4
-@dirrm avr/lib/avr3
-@dirrm avr/include/avr
-@dirrm avr/include
diff --git a/cross/avr-libc/distinfo b/cross/avr-libc/distinfo
index bcb34344291..03d9231f4ee 100644
--- a/cross/avr-libc/distinfo
+++ b/cross/avr-libc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 10:16:52 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/08/15 08:45:54 wennmach Exp $
 
-SHA1 (avr-libc-1.0.4.tar.bz2) = 2642cc3f6a4cb4886155280265a44d45190aff22
-RMD160 (avr-libc-1.0.4.tar.bz2) = b0a444fe5e492571cab6fa3685497268a0eb2fa1
-Size (avr-libc-1.0.4.tar.bz2) = 302725 bytes
-SHA1 (patch-aa) = 0d1ee96b71812d9d46a30c436318380ed5350c75
+SHA1 (avr-libc-1.2.5.tar.bz2) = 2750aa701f9c91a364e625caf07c0e71bcc20d67
+RMD160 (avr-libc-1.2.5.tar.bz2) = daa06bb5b2d6675d2f240c007293d59510b089f8
+Size (avr-libc-1.2.5.tar.bz2) = 319622 bytes
+SHA1 (patch-ab) = 0a130048451dee029ed3e07a3cde2819905d79f5
diff --git a/cross/avr-libc/patches/patch-aa b/cross/avr-libc/patches/patch-aa
deleted file mode 100644
index 0a29a000bfc..00000000000
--- a/cross/avr-libc/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/12/30 18:03:16 kristerw Exp $
-
---- doc/api/Makefile.in.orig	2004-12-07 14:45:04.000000000 +0100
-+++ doc/api/Makefile.in
-@@ -128,7 +128,7 @@ avrlib_basedir = @avrlib_basedir@
- 
- MAINTAINERCLEANFILES = Makefile.in stamp-vti
- 
--CLEANFILES = *.html *.pdf *.ma *.mas *.ps doxygen-pdf.config                        *.png *.eps fix_png fix_anchors fix_javascript
-+CLEANFILES = *.html *.pdf *.ma *.mas *.ps doxygen-pdf.config                        *.png *.eps fix_png fix_anchors
- 
- 
- EXTRA_DIST = dox.css dox_html_header dox_html_footer                        main_page.dox                        assembler.dox                        inline_asm.dox                        interrupts.dox                        acknowledge.dox                        malloc.dox                        $(IMAGE_SRC)                        sections.dox                        sfr.dox                        tools-install.dox                        using-avrprog.dox                        using-tools.dox                        faq.dox                        rel-method.dox                        unjs.pl
-@@ -287,7 +287,7 @@ demo:
- ps: demo $(TARGET_DOX_PS)
- 
- # Rule for generating html output.
--html: demo $(TARGET_DOX_HTML) fix_png fix_anchors fix_javascript
-+html: demo $(TARGET_DOX_HTML) fix_png fix_anchors
- 
- # Make the background color of the png's transparent.
- fix_png: $(wildcard $(USER_MANUAL)/*.png)
-@@ -400,7 +400,6 @@ latex_pdf_src/refman.tex: doxygen-pdf.co
- 
- doxygen-pdf.config: doxygen.config
- 	sed \
--		-e '/USE_PDFLATEX/s/NO/YES/' \
- 		-e '/LATEX_OUTPUT/s/latex_src/latex_pdf_src/' \
- 		-e '/GENERATE_HTML/s/YES/NO/' \
- 		-e '/GENERATE_MAN/s/YES/NO/' \
diff --git a/cross/avr-libc/patches/patch-ab b/cross/avr-libc/patches/patch-ab
new file mode 100644
index 00000000000..5cd1b4b3de5
--- /dev/null
+++ b/cross/avr-libc/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2005/08/15 08:45:54 wennmach Exp $
+
+CC might also be just "cc".
+
+--- doconf.orig	2005-08-12 11:14:31.000000000 +0200
++++ doconf	2005-08-12 11:15:01.000000000 +0200
+@@ -63,7 +63,7 @@
+ 
+ local_CC=${CC}
+ 
+-if [ "x$local_CC" = xgcc ]
++if [ "x$local_CC" = xgcc -o "x$local_CC" = xcc ]
+ then
+ 	# Configuring avr-libc will fail is CC=gcc, so force it to avr-gcc.
+ 	local_CC=avr-gcc