Handle PLIST generation correctly for the -DNOPORTDOCS case.

3 files changed, 72 insertions, 68 deletions

diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index d14254c71c43..6ad57a8b8fab 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -34,6 +34,9 @@ CONFIGURE_ENV=	CC=avr-gcc PREFIX=${PREFIX}
 CONFIGURE_SCRIPT= doconf
 .if !defined(NOPORTDOCS)
 CONFIGURE_ARGS=	--enable-doc --disable-versioned-doc
+PLIST_DOC=	${PKGDIR}/pkg-plist.doc
+.else
+PLIST_DOC=
 .endif
 # Work around the braind***ness introduced by <bsd.cpu.mk> in freebsd-5.
 # Sorry, the user is no longer be able to override the optimization and
@@ -51,6 +54,7 @@ do-build:
 		(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ./domake MAKE=${GMAKE})
 
 do-install:
+		rm -f ${TMPPLIST}; cat ${PLIST_DOC} ${PLIST} > ${TMPPLIST}
 		(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ./domake MAKE=${GMAKE} install)
 		${MKDIR} ${PREFIX}/share/doc/avr-libc
 		${MKDIR} ${PREFIX}/share/doc/avr-libc/examples
diff --git a/devel/avr-libc/pkg-plist b/devel/avr-libc/pkg-plist
index 531704c1cd24..513f1572247c 100644
--- a/devel/avr-libc/pkg-plist
+++ b/devel/avr-libc/pkg-plist
@@ -129,76 +129,9 @@ avr/lib/libscanf_flt.a
 avr/lib/libscanf_min.a
 share/doc/avr-libc/AUTHORS
 share/doc/avr-libc/LICENSE
-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/demo_project.html
-share/doc/avr-libc/avr-libc-user-manual/deprecated.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/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__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__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__setjmp.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/twi_demo.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
@@ -212,7 +145,6 @@ share/doc/avr-libc/examples/twitest/twitest.c
 @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/twitest
 @dirrm share/doc/avr-libc/examples/demo
 @dirrm share/doc/avr-libc/examples
diff --git a/devel/avr-libc/pkg-plist.doc b/devel/avr-libc/pkg-plist.doc
new file mode 100644
index 000000000000..5949a10e842e
--- /dev/null
+++ b/devel/avr-libc/pkg-plist.doc
@@ -0,0 +1,68 @@
+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/demo_project.html
+share/doc/avr-libc/avr-libc-user-manual/deprecated.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/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__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__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__setjmp.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/twi_demo.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
+@dirrm share/doc/avr-libc/avr-libc-user-manual