Simplify. Sync PLIST with reality. Bump revision.

2 files changed, 8 insertions, 139 deletions

diff --git a/cross/avr-libc/Makefile b/cross/avr-libc/Makefile
index 9197b4bd7c2..e2003355976 100644
--- a/cross/avr-libc/Makefile
+++ b/cross/avr-libc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2014/08/29 04:31:12 mef Exp $
+# $NetBSD: Makefile,v 1.35 2014/09/22 11:50:30 joerg Exp $
 
 DISTNAME=		avr-libc-1.8.0
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		cross
 MASTER_SITES=		http://savannah.nongnu.org/download/avr-libc/
 EXTRACT_SUFX=		.tar.bz2
@@ -52,14 +52,11 @@ post-install:
 		${DESTDIR}${PREFIX}/share/doc/avr-libc
 	## delete following or similar files, which includes PATH at build time.
 	##_usr_pkgsrc_cross_avr-libc_work_avr-libc-1.8.0_libc_string_.3
-	(cd ${DESTDIR}${PREFIX}/share/doc/avr-libc/man/man3; ${RM} -f *${PKGVERSION_NOREV}*)
-	set -e;	\
-	for f in Makefile demo.c demo.bin demo.hex demo.pdf \
-		demo.srec;\
-	do \
-		${INSTALL_DATA} ${WRKSRC}/doc/examples/demo/$$f \
-			${DESTDIR}${PREFIX}/share/doc/avr-libc/examples/demo; \
-	done
+	${RM} ${DESTDIR}${PREFIX}/share/doc/avr-libc/man/man3/*${PKGVERSION_NOREV}*
+.for f in Makefile demo.c demo.bin demo.hex demo.pdf demo.srec
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/demo/${f} \
+		${DESTDIR}${PREFIX}/share/doc/avr-libc/examples/demo
+.endfor
 
 .include "../../cross/avr-binutils/buildlink3.mk"
 .include "../../cross/avr-gcc/buildlink3.mk"
diff --git a/cross/avr-libc/PLIST b/cross/avr-libc/PLIST
index 89d71b061d8..bbde7de65d2 100644
--- a/cross/avr-libc/PLIST
+++ b/cross/avr-libc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2014/08/29 04:31:12 mef Exp $
+@comment $NetBSD: PLIST,v 1.18 2014/09/22 11:50:30 joerg Exp $
 avr/include/alloca.h
 avr/include/assert.h
 avr/include/avr/boot.h
@@ -503,8 +503,6 @@ 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/assert_8h.html
 share/doc/avr-libc/avr-libc-user-manual/assert_8h_source.html
-share/doc/avr-libc/avr-libc-user-manual/atoi_8S.html
-share/doc/avr-libc/avr-libc-user-manual/atol_8S.html
 share/doc/avr-libc/avr-libc-user-manual/atomic_8h.html
 share/doc/avr-libc/avr-libc-user-manual/atomic_8h_source.html
 share/doc/avr-libc/avr-libc-user-manual/avrs.png
@@ -554,9 +552,6 @@ share/doc/avr-libc/avr-libc-user-manual/eeprom_8h_source.html
 share/doc/avr-libc/avr-libc-user-manual/errno_8h.html
 share/doc/avr-libc/avr-libc-user-manual/errno_8h_source.html
 share/doc/avr-libc/avr-libc-user-manual/fdevopen_8c.html
-share/doc/avr-libc/avr-libc-user-manual/ffs_8S.html
-share/doc/avr-libc/avr-libc-user-manual/ffsl_8S.html
-share/doc/avr-libc/avr-libc-user-manual/ffsll_8S.html
 share/doc/avr-libc/avr-libc-user-manual/files.html
 share/doc/avr-libc/avr-libc-user-manual/ftv2blank.png
 share/doc/avr-libc/avr-libc-user-manual/ftv2doc.png
@@ -685,19 +680,6 @@ share/doc/avr-libc/avr-libc-user-manual/malloc.html
 share/doc/avr-libc/avr-libc-user-manual/math_8h.html
 share/doc/avr-libc/avr-libc-user-manual/math_8h_source.html
 share/doc/avr-libc/avr-libc-user-manual/mem_sections.html
-share/doc/avr-libc/avr-libc-user-manual/memccpy_8S.html
-share/doc/avr-libc/avr-libc-user-manual/memchr_8S.html
-share/doc/avr-libc/avr-libc-user-manual/memchr__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/memcmp_8S.html
-share/doc/avr-libc/avr-libc-user-manual/memcmp__PF_8S.html
-share/doc/avr-libc/avr-libc-user-manual/memcmp__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/memcpy_8S.html
-share/doc/avr-libc/avr-libc-user-manual/memcpy__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/memmem_8S.html
-share/doc/avr-libc/avr-libc-user-manual/memmove_8S.html
-share/doc/avr-libc/avr-libc-user-manual/memrchr_8S.html
-share/doc/avr-libc/avr-libc-user-manual/memrchr__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/memset_8S.html
 share/doc/avr-libc/avr-libc-user-manual/modules.html
 share/doc/avr-libc/avr-libc-user-manual/nav_f.png
 share/doc/avr-libc/avr-libc-user-manual/nav_g.png
@@ -736,59 +718,13 @@ share/doc/avr-libc/avr-libc-user-manual/stdiodemo-setup.jpg
 share/doc/avr-libc/avr-libc-user-manual/stdlib_8h.html
 share/doc/avr-libc/avr-libc-user-manual/stdlib_8h_source.html
 share/doc/avr-libc/avr-libc-user-manual/stdlib__private_8h_source.html
-share/doc/avr-libc/avr-libc-user-manual/strcasecmp_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strcasecmp__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strcasestr_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strcat_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strcat__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strchr_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strchr__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strchrnul_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strchrnul__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strcmp_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strcmp__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strcpy_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strcpy__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strcspn_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strcspn__P_8S.html
 share/doc/avr-libc/avr-libc-user-manual/strdup_8c.html
 share/doc/avr-libc/avr-libc-user-manual/string_8h.html
 share/doc/avr-libc/avr-libc-user-manual/string_8h_source.html
-share/doc/avr-libc/avr-libc-user-manual/strlcat_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strlcat__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strlcpy_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strlcpy__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strlen_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strlen__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strlwr_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strncasecmp_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strncasecmp__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strncat_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strncat__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strncmp_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strncmp__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strncpy_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strncpy__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strnlen_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strnlen__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strpbrk_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strpbrk__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strrchr_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strrchr__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strrev_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strsep_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strsep__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strspn_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strspn__P_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strstr_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strstr__P_8S.html
 share/doc/avr-libc/avr-libc-user-manual/strtok_8c.html
 share/doc/avr-libc/avr-libc-user-manual/strtok__P_8c.html
-share/doc/avr-libc/avr-libc-user-manual/strtok__rP_8S.html
-share/doc/avr-libc/avr-libc-user-manual/strtok__r_8S.html
 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/strupr_8S.html
 share/doc/avr-libc/avr-libc-user-manual/sync_off.png
 share/doc/avr-libc/avr-libc-user-manual/sync_on.png
 share/doc/avr-libc/avr-libc-user-manual/tab_a.png
@@ -1210,9 +1146,7 @@ share/doc/avr-libc/man/man3/atan2f.3
 share/doc/avr-libc/man/man3/atanf.3
 share/doc/avr-libc/man/man3/atof.3
 share/doc/avr-libc/man/man3/atoi.3
-share/doc/avr-libc/man/man3/atoi.S.3
 share/doc/avr-libc/man/man3/atol.3
-share/doc/avr-libc/man/man3/atol.S.3
 share/doc/avr-libc/man/man3/atomic.h.3
 share/doc/avr-libc/man/man3/avr_assert.3
 share/doc/avr-libc/man/man3/avr_boot.3
@@ -1330,11 +1264,8 @@ share/doc/avr-libc/man/man3/feof.3
 share/doc/avr-libc/man/man3/ferror.3
 share/doc/avr-libc/man/man3/fflush.3
 share/doc/avr-libc/man/man3/ffs.3
-share/doc/avr-libc/man/man3/ffs.S.3
 share/doc/avr-libc/man/man3/ffsl.3
-share/doc/avr-libc/man/man3/ffsl.S.3
 share/doc/avr-libc/man/man3/ffsll.3
-share/doc/avr-libc/man/man3/ffsll.S.3
 share/doc/avr-libc/man/man3/fgetc.3
 share/doc/avr-libc/man/man3/fgets.3
 share/doc/avr-libc/man/man3/floor.3
@@ -1431,34 +1362,21 @@ share/doc/avr-libc/man/man3/malloc.3
 share/doc/avr-libc/man/man3/math.h.3
 share/doc/avr-libc/man/man3/mem_sections.3
 share/doc/avr-libc/man/man3/memccpy.3
-share/doc/avr-libc/man/man3/memccpy.S.3
 share/doc/avr-libc/man/man3/memccpy_P.3
 share/doc/avr-libc/man/man3/memchr.3
-share/doc/avr-libc/man/man3/memchr.S.3
 share/doc/avr-libc/man/man3/memchr_P.3
-share/doc/avr-libc/man/man3/memchr_P.S.3
 share/doc/avr-libc/man/man3/memcmp.3
-share/doc/avr-libc/man/man3/memcmp.S.3
 share/doc/avr-libc/man/man3/memcmp_P.3
-share/doc/avr-libc/man/man3/memcmp_P.S.3
 share/doc/avr-libc/man/man3/memcmp_PF.3
-share/doc/avr-libc/man/man3/memcmp_PF.S.3
 share/doc/avr-libc/man/man3/memcpy.3
-share/doc/avr-libc/man/man3/memcpy.S.3
 share/doc/avr-libc/man/man3/memcpy_P.3
-share/doc/avr-libc/man/man3/memcpy_P.S.3
 share/doc/avr-libc/man/man3/memcpy_PF.3
 share/doc/avr-libc/man/man3/memmem.3
-share/doc/avr-libc/man/man3/memmem.S.3
 share/doc/avr-libc/man/man3/memmem_P.3
 share/doc/avr-libc/man/man3/memmove.3
-share/doc/avr-libc/man/man3/memmove.S.3
 share/doc/avr-libc/man/man3/memrchr.3
-share/doc/avr-libc/man/man3/memrchr.S.3
 share/doc/avr-libc/man/man3/memrchr_P.3
-share/doc/avr-libc/man/man3/memrchr_P.S.3
 share/doc/avr-libc/man/man3/memset.3
-share/doc/avr-libc/man/man3/memset.S.3
 share/doc/avr-libc/man/man3/modf.3
 share/doc/avr-libc/man/man3/modff.3
 share/doc/avr-libc/man/man3/outb.3
@@ -1555,107 +1473,64 @@ share/doc/avr-libc/man/man3/stdiodemo.3
 share/doc/avr-libc/man/man3/stdlib.h.3
 share/doc/avr-libc/man/man3/stdout.3
 share/doc/avr-libc/man/man3/strcasecmp.3
-share/doc/avr-libc/man/man3/strcasecmp.S.3
 share/doc/avr-libc/man/man3/strcasecmp_P.3
-share/doc/avr-libc/man/man3/strcasecmp_P.S.3
 share/doc/avr-libc/man/man3/strcasecmp_PF.3
 share/doc/avr-libc/man/man3/strcasestr.3
-share/doc/avr-libc/man/man3/strcasestr.S.3
 share/doc/avr-libc/man/man3/strcasestr_P.3
 share/doc/avr-libc/man/man3/strcat.3
-share/doc/avr-libc/man/man3/strcat.S.3
 share/doc/avr-libc/man/man3/strcat_P.3
-share/doc/avr-libc/man/man3/strcat_P.S.3
 share/doc/avr-libc/man/man3/strcat_PF.3
 share/doc/avr-libc/man/man3/strchr.3
-share/doc/avr-libc/man/man3/strchr.S.3
 share/doc/avr-libc/man/man3/strchr_P.3
-share/doc/avr-libc/man/man3/strchr_P.S.3
 share/doc/avr-libc/man/man3/strchrnul.3
-share/doc/avr-libc/man/man3/strchrnul.S.3
 share/doc/avr-libc/man/man3/strchrnul_P.3
-share/doc/avr-libc/man/man3/strchrnul_P.S.3
 share/doc/avr-libc/man/man3/strcmp.3
-share/doc/avr-libc/man/man3/strcmp.S.3
 share/doc/avr-libc/man/man3/strcmp_P.3
-share/doc/avr-libc/man/man3/strcmp_P.S.3
 share/doc/avr-libc/man/man3/strcmp_PF.3
 share/doc/avr-libc/man/man3/strcpy.3
-share/doc/avr-libc/man/man3/strcpy.S.3
 share/doc/avr-libc/man/man3/strcpy_P.3
-share/doc/avr-libc/man/man3/strcpy_P.S.3
 share/doc/avr-libc/man/man3/strcpy_PF.3
 share/doc/avr-libc/man/man3/strcspn.3
-share/doc/avr-libc/man/man3/strcspn.S.3
 share/doc/avr-libc/man/man3/strcspn_P.3
-share/doc/avr-libc/man/man3/strcspn_P.S.3
 share/doc/avr-libc/man/man3/strdup.3
 share/doc/avr-libc/man/man3/strdup.c.3
 share/doc/avr-libc/man/man3/string.h.3
 share/doc/avr-libc/man/man3/strlcat.3
-share/doc/avr-libc/man/man3/strlcat.S.3
 share/doc/avr-libc/man/man3/strlcat_P.3
-share/doc/avr-libc/man/man3/strlcat_P.S.3
 share/doc/avr-libc/man/man3/strlcat_PF.3
 share/doc/avr-libc/man/man3/strlcpy.3
-share/doc/avr-libc/man/man3/strlcpy.S.3
 share/doc/avr-libc/man/man3/strlcpy_P.3
-share/doc/avr-libc/man/man3/strlcpy_P.S.3
 share/doc/avr-libc/man/man3/strlcpy_PF.3
 share/doc/avr-libc/man/man3/strlen.3
-share/doc/avr-libc/man/man3/strlen.S.3
 share/doc/avr-libc/man/man3/strlen_P.3
-share/doc/avr-libc/man/man3/strlen_P.S.3
 share/doc/avr-libc/man/man3/strlen_PF.3
 share/doc/avr-libc/man/man3/strlwr.3
-share/doc/avr-libc/man/man3/strlwr.S.3
 share/doc/avr-libc/man/man3/strncasecmp.3
-share/doc/avr-libc/man/man3/strncasecmp.S.3
 share/doc/avr-libc/man/man3/strncasecmp_P.3
-share/doc/avr-libc/man/man3/strncasecmp_P.S.3
 share/doc/avr-libc/man/man3/strncasecmp_PF.3
 share/doc/avr-libc/man/man3/strncat.3
-share/doc/avr-libc/man/man3/strncat.S.3
 share/doc/avr-libc/man/man3/strncat_P.3
-share/doc/avr-libc/man/man3/strncat_P.S.3
 share/doc/avr-libc/man/man3/strncat_PF.3
 share/doc/avr-libc/man/man3/strncmp.3
-share/doc/avr-libc/man/man3/strncmp.S.3
 share/doc/avr-libc/man/man3/strncmp_P.3
-share/doc/avr-libc/man/man3/strncmp_P.S.3
 share/doc/avr-libc/man/man3/strncmp_PF.3
 share/doc/avr-libc/man/man3/strncpy.3
-share/doc/avr-libc/man/man3/strncpy.S.3
 share/doc/avr-libc/man/man3/strncpy_P.3
-share/doc/avr-libc/man/man3/strncpy_P.S.3
 share/doc/avr-libc/man/man3/strncpy_PF.3
 share/doc/avr-libc/man/man3/strnlen.3
-share/doc/avr-libc/man/man3/strnlen.S.3
 share/doc/avr-libc/man/man3/strnlen_P.3
-share/doc/avr-libc/man/man3/strnlen_P.S.3
 share/doc/avr-libc/man/man3/strnlen_PF.3
 share/doc/avr-libc/man/man3/strpbrk.3
-share/doc/avr-libc/man/man3/strpbrk.S.3
 share/doc/avr-libc/man/man3/strpbrk_P.3
-share/doc/avr-libc/man/man3/strpbrk_P.S.3
 share/doc/avr-libc/man/man3/strrchr.3
-share/doc/avr-libc/man/man3/strrchr.S.3
 share/doc/avr-libc/man/man3/strrchr_P.3
-share/doc/avr-libc/man/man3/strrchr_P.S.3
 share/doc/avr-libc/man/man3/strrev.3
-share/doc/avr-libc/man/man3/strrev.S.3
 share/doc/avr-libc/man/man3/strsep.3
-share/doc/avr-libc/man/man3/strsep.S.3
 share/doc/avr-libc/man/man3/strsep_P.3
-share/doc/avr-libc/man/man3/strsep_P.S.3
 share/doc/avr-libc/man/man3/strspn.3
-share/doc/avr-libc/man/man3/strspn.S.3
 share/doc/avr-libc/man/man3/strspn_P.3
-share/doc/avr-libc/man/man3/strspn_P.S.3
 share/doc/avr-libc/man/man3/strstr.3
-share/doc/avr-libc/man/man3/strstr.S.3
 share/doc/avr-libc/man/man3/strstr_P.3
-share/doc/avr-libc/man/man3/strstr_P.S.3
 share/doc/avr-libc/man/man3/strstr_PF.3
 share/doc/avr-libc/man/man3/strtod.3
 share/doc/avr-libc/man/man3/strtok.3
@@ -1663,13 +1538,10 @@ share/doc/avr-libc/man/man3/strtok.c.3
 share/doc/avr-libc/man/man3/strtok_P.3
 share/doc/avr-libc/man/man3/strtok_P.c.3
 share/doc/avr-libc/man/man3/strtok_r.3
-share/doc/avr-libc/man/man3/strtok_r.S.3
 share/doc/avr-libc/man/man3/strtok_rP.3
-share/doc/avr-libc/man/man3/strtok_rP.S.3
 share/doc/avr-libc/man/man3/strtol.3
 share/doc/avr-libc/man/man3/strtoul.3
 share/doc/avr-libc/man/man3/strupr.3
-share/doc/avr-libc/man/man3/strupr.S.3
 share/doc/avr-libc/man/man3/tan.3
 share/doc/avr-libc/man/man3/tanf.3
 share/doc/avr-libc/man/man3/tanh.3