1 files changed, 56 insertions, 55 deletions

diff --git a/devel/aap/pkg-plist b/devel/aap/pkg-plist
index 9ca87fd1c303..2768f5c8d7e1 100644
--- a/devel/aap/pkg-plist
+++ b/devel/aap/pkg-plist
@@ -84,58 +84,7 @@ lib/aap/Exec-%%PORTVERSION%%/aapnetrc.py
 lib/aap/Exec-%%PORTVERSION%%/aapnetrc.pyc
 lib/aap/Exec-%%PORTVERSION%%/aapre.py
 lib/aap/Exec-%%PORTVERSION%%/default.aap
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/exec.pdf
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/appendix.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ch39s02.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ch39s03.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/exec.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/index.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/license.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-arguments.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-assign.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-attributes.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-commands.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-filetype.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-modules.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-python.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-syntax.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-tools.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-variables.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-varscope.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/reference.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-actions.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-compile.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-cvs.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-distribute.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-include.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-pipe.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-port.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-python.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-start.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-variant.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-website.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutorial.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-autoconf.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-autodep.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-basics.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-configure.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-cvs.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-debug.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-depend.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-fetch.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-filetype.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-install.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-issue.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-language.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-makedif.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-package.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-porting.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-publish.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-python.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-tools.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-variant.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-version.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user.html
+%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc
 lib/aap/Exec-%%PORTVERSION%%/import_re.py
 lib/aap/Exec-%%PORTVERSION%%/import_re.pyc
 lib/aap/Exec-%%PORTVERSION%%/modules/d.aap
@@ -159,10 +108,62 @@ lib/aap/Exec-%%PORTVERSION%%/tools/mingw.py
 lib/aap/Exec-%%PORTVERSION%%/tools/mingw.pyc
 lib/aap/Exec-%%PORTVERSION%%/tools/msvc.py
 lib/aap/Exec-%%PORTVERSION%%/tools/msvc.pyc
-%%PORTDOCS%%%%DOCSDIR%%
+man/man1/aap.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/exec.pdf
+%%PORTDOCS%%%%DOCSDIR%%/html/appendix.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch39s02.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch39s03.html
+%%PORTDOCS%%%%DOCSDIR%%/html/exec.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/license.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref-arguments.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref-assign.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref-attributes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref-commands.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref-filetype.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref-modules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref-python.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref-syntax.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref-tools.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref-variables.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref-varscope.html
+%%PORTDOCS%%%%DOCSDIR%%/html/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutor-actions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutor-compile.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutor-cvs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutor-distribute.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutor-include.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutor-pipe.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutor-port.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutor-python.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutor-start.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutor-variant.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutor-website.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-autoconf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-autodep.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-basics.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-configure.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-cvs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-debug.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-depend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-fetch.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-filetype.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-install.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-issue.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-language.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-makedif.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-package.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-porting.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-publish.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-python.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-tools.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-variant.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user-version.html
+%%PORTDOCS%%%%DOCSDIR%%/html/user.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/aap/Exec-%%PORTVERSION%%/tools
 @dirrm lib/aap/Exec-%%PORTVERSION%%/modules
-%%PORTDOCS%%@dirrm lib/aap/Exec-%%PORTVERSION%%/doc/html
-%%PORTDOCS%%@dirrm lib/aap/Exec-%%PORTVERSION%%/doc
 @dirrm lib/aap/Exec-%%PORTVERSION%%
 @dirrmtry lib/aap