4 files changed, 36 insertions, 27 deletions

diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index a0fff4400497..c0380c36cda3 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	avr-libc
-PORTVERSION=	1.4.0
+PORTVERSION=	1.4.1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
@@ -47,31 +47,12 @@ MAKE_ENV=	NO_CPU_CFLAGS=true
 CFLAGS=		-O
 CXXFLAGS=	-O
 
-DEMOFILES=	Makefile demo.c
-.if !defined(NOPORTDOCS)
-DEMOFILES+=	demo.bin demo.hex demo.pdf demo.srec
-.endif
-
 do-install:
 		${RM} -f ${TMPPLIST}; ${CAT} ${PLIST_DOC} ${PLIST} > ${TMPPLIST}
 		(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} install)
-		${MKDIR} ${PREFIX}/share/doc/avr-libc
-		${MKDIR} ${PREFIX}/share/doc/avr-libc/examples
-		${MKDIR} ${PREFIX}/share/doc/avr-libc/examples/demo
-		${MKDIR} ${PREFIX}/share/doc/avr-libc/examples/twitest
 		${INSTALL_DATA} \
 			${WRKDIR}/${DISTNAME}/LICENSE \
 			${WRKDIR}/${DISTNAME}/AUTHORS \
 			${PREFIX}/share/doc/avr-libc
-		@for f in ${DEMOFILES};\
-		do \
-			${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/examples/demo/$$f \
-				${PREFIX}/share/doc/avr-libc/examples/demo; \
-		done
-		@for f in Makefile twitest.c;\
-		do \
-			${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/examples/twitest/$$f \
-				${PREFIX}/share/doc/avr-libc/examples/twitest; \
-		done
 
 .include <bsd.port.mk>
diff --git a/devel/avr-libc/distinfo b/devel/avr-libc/distinfo
index 40cd96141bb4..0dd08be43683 100644
--- a/devel/avr-libc/distinfo
+++ b/devel/avr-libc/distinfo
@@ -1,2 +1,2 @@
-MD5 (avr-libc-1.4.0.tar.bz2) = f32c3728fd99055fec6420843e6b5863
-SIZE (avr-libc-1.4.0.tar.bz2) = 461160
+MD5 (avr-libc-1.4.1.tar.bz2) = 970244f82015f75a51e8f05749ef05ec
+SIZE (avr-libc-1.4.1.tar.bz2) = 770520
diff --git a/devel/avr-libc/pkg-plist b/devel/avr-libc/pkg-plist
index 17f032b085e4..4290b1741037 100644
--- a/devel/avr-libc/pkg-plist
+++ b/devel/avr-libc/pkg-plist
@@ -66,11 +66,15 @@ avr/include/avr/iotn13.h
 avr/include/avr/iotn15.h
 avr/include/avr/iotn22.h
 avr/include/avr/iotn2313.h
+avr/include/avr/iotn24.h
 avr/include/avr/iotn25.h
 avr/include/avr/iotn26.h
 avr/include/avr/iotn28.h
+avr/include/avr/iotn44.h
 avr/include/avr/iotn45.h
+avr/include/avr/iotn84.h
 avr/include/avr/iotn85.h
+avr/include/avr/iotnx4.h
 avr/include/avr/iotnx5.h
 avr/include/avr/parity.h
 avr/include/avr/pgmspace.h
@@ -143,9 +147,9 @@ avr/lib/avr5/crtm329.o
 avr/lib/avr5/crtm3290.o
 avr/lib/avr5/crtm64.o
 avr/lib/avr5/crtm640.o
+avr/lib/avr5/crtm644.o
 avr/lib/avr5/crtm645.o
 avr/lib/avr5/crtm6450.o
-avr/lib/avr5/crtm644.o
 avr/lib/avr5/crtm649.o
 avr/lib/avr5/crtm6490.o
 avr/lib/avr5/libc.a
@@ -172,10 +176,13 @@ avr/lib/crttn13.o
 avr/lib/crttn15.o
 avr/lib/crttn22.o
 avr/lib/crttn2313.o
+avr/lib/crttn24.o
 avr/lib/crttn25.o
 avr/lib/crttn26.o
 avr/lib/crttn28.o
+avr/lib/crttn44.o
 avr/lib/crttn45.o
+avr/lib/crttn84.o
 avr/lib/crttn85.o
 avr/lib/libc.a
 avr/lib/libm.a
@@ -188,6 +195,18 @@ share/doc/avr-libc/AUTHORS
 share/doc/avr-libc/LICENSE
 share/doc/avr-libc/examples/demo/Makefile
 share/doc/avr-libc/examples/demo/demo.c
+share/doc/avr-libc/examples/demo/iocompat.h
+share/doc/avr-libc/examples/largedemo/Makefile
+share/doc/avr-libc/examples/largedemo/largedemo.c
+share/doc/avr-libc/examples/stdiodemo/Makefile
+share/doc/avr-libc/examples/stdiodemo/defines.h
+share/doc/avr-libc/examples/stdiodemo/hd44780.c
+share/doc/avr-libc/examples/stdiodemo/hd44780.h
+share/doc/avr-libc/examples/stdiodemo/lcd.c
+share/doc/avr-libc/examples/stdiodemo/lcd.h
+share/doc/avr-libc/examples/stdiodemo/stdiodemo.c
+share/doc/avr-libc/examples/stdiodemo/uart.c
+share/doc/avr-libc/examples/stdiodemo/uart.h
 share/doc/avr-libc/examples/twitest/Makefile
 share/doc/avr-libc/examples/twitest/twitest.c
 @dirrm avr/include/util
@@ -198,6 +217,8 @@ share/doc/avr-libc/examples/twitest/twitest.c
 @dirrm avr/lib/avr4
 @dirrm avr/lib/avr5
 @dirrm share/doc/avr-libc/examples/twitest
+@dirrm share/doc/avr-libc/examples/stdiodemo
+@dirrm share/doc/avr-libc/examples/largedemo
 @dirrm share/doc/avr-libc/examples/demo
 @dirrm share/doc/avr-libc/examples
 @dirrm share/doc/avr-libc
diff --git a/devel/avr-libc/pkg-plist.doc b/devel/avr-libc/pkg-plist.doc
index b6f14ce70fbb..58da5e2aa242 100644
--- a/devel/avr-libc/pkg-plist.doc
+++ b/devel/avr-libc/pkg-plist.doc
@@ -35,7 +35,9 @@ 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__deprecated__items.html
+share/doc/avr-libc/avr-libc-user-manual/group__largedemo.html
 share/doc/avr-libc/avr-libc-user-manual/group__setjmp.html
+share/doc/avr-libc/avr-libc-user-manual/group__stdiodemo.html
 share/doc/avr-libc/avr-libc-user-manual/group__twi__demo.html
 share/doc/avr-libc/avr-libc-user-manual/group__util__crc.html
 share/doc/avr-libc/avr-libc-user-manual/group__util__delay.html
@@ -44,6 +46,8 @@ share/doc/avr-libc/avr-libc-user-manual/group__util__twi.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/largedemo-setup.jpg
+share/doc/avr-libc/avr-libc-user-manual/largedemo-wiring.jpg
 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
@@ -53,15 +57,12 @@ 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/stdiodemo-setup.jpg
 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/using_avrprog.html
 share/doc/avr-libc/avr-libc-user-manual/using_tools.html
-share/doc/avr-libc/examples/demo/demo.bin
-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/man/man3/BOOTLOADER_SECTION.3
 share/doc/avr-libc/man/man3/DTOSTR_ALWAYS_SIGN.3
 share/doc/avr-libc/man/man3/DTOSTR_PLUS_SIGN.3
@@ -461,6 +462,7 @@ share/doc/avr-libc/man/man3/isupper.3
 share/doc/avr-libc/man/man3/isxdigit.3
 share/doc/avr-libc/man/man3/itoa.3
 share/doc/avr-libc/man/man3/labs.3
+share/doc/avr-libc/man/man3/largedemo.3
 share/doc/avr-libc/man/man3/ldexp.3
 share/doc/avr-libc/man/man3/ldiv.3
 share/doc/avr-libc/man/man3/ldiv_t.3
@@ -525,6 +527,9 @@ share/doc/avr-libc/man/man3/set_sleep_mode.3
 share/doc/avr-libc/man/man3/setjmp.3
 share/doc/avr-libc/man/man3/sin.3
 share/doc/avr-libc/man/man3/sinh.3
+share/doc/avr-libc/man/man3/sleep_cpu.3
+share/doc/avr-libc/man/man3/sleep_disable.3
+share/doc/avr-libc/man/man3/sleep_enable.3
 share/doc/avr-libc/man/man3/sleep_mode.3
 share/doc/avr-libc/man/man3/snprintf.3
 share/doc/avr-libc/man/man3/snprintf_P.3
@@ -538,6 +543,7 @@ share/doc/avr-libc/man/man3/sscanf.3
 share/doc/avr-libc/man/man3/sscanf_P.3
 share/doc/avr-libc/man/man3/stderr.3
 share/doc/avr-libc/man/man3/stdin.3
+share/doc/avr-libc/man/man3/stdiodemo.3
 share/doc/avr-libc/man/man3/stdout.3
 share/doc/avr-libc/man/man3/strcasecmp.3
 share/doc/avr-libc/man/man3/strcasecmp_P.3
@@ -569,6 +575,7 @@ share/doc/avr-libc/man/man3/strrchr.3
 share/doc/avr-libc/man/man3/strrev.3
 share/doc/avr-libc/man/man3/strsep.3
 share/doc/avr-libc/man/man3/strstr.3
+share/doc/avr-libc/man/man3/strstr_P.3
 share/doc/avr-libc/man/man3/strtod.3
 share/doc/avr-libc/man/man3/strtok_r.3
 share/doc/avr-libc/man/man3/strtol.3