devel/aap: update to 1.093

- Update to 1.903
- Allow staging (based on)
- Remove leading article from COMMENT
- Add DOCS option

PR:		ports/183563
Submitted by:	KATO Tsuguru <tkato432 yahoo.com>

4 files changed, 83 insertions, 87 deletions

diff --git a/devel/aap/Makefile b/devel/aap/Makefile
index 317dd760a0b6..486eb059c94f 100644
--- a/devel/aap/Makefile
+++ b/devel/aap/Makefile
@@ -2,45 +2,43 @@
 # $FreeBSD$
 
 PORTNAME=	aap
-PORTVERSION=	1.092
+PORTVERSION=	1.093
 CATEGORIES=	devel
-MASTER_SITES=	SF/a-a-p/Aap
+MASTER_SITES=	SF/a-a-p/Aap/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A build tool alternative to make with internet access and CVS support
+COMMENT=	Build tool alternative to make with internet access and CVS support
 
 LICENSE=	GPLv2
 
-MAN1=		aap.1
+OPTIONS_DEFINE=	DOCS
 
-NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
+NO_BUILD=	yes
 
 USE_ZIP=	yes
 USE_PYTHON=	yes
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
-FULLDOCS=yes
-.else
-FULLDOCS=no
-.endif
-
-.include <bsd.port.pre.mk>
-
 do-install:
-	@cd ${WRKSRC} && \
-		${PYTHON_CMD} ./aap PREFIX="${PREFIX}" FULLDOCS=${FULLDOCS} \
-			HTMLDIR=/html install
+	@cd ${WRKSRC} && ${PYTHON_CMD} ./aap PREFIX="${STAGEDIR}/${PREFIX}" \
+		FULLDOCS=no install
+	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+	    -d ${PREFIX}/lib/aap/Exec-${PORTVERSION}/ -f ${STAGEDIR}${PREFIX}/lib/aap/Exec-${PORTVERSION}
+	@${LN} -sf ../lib/aap/Exec-${PORTVERSION}/aap \
+		${STAGEDIR}${PREFIX}/bin/aap
+	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} exec.pdf \
+		${STAGEDIR}${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}/${DOCSDIR}/html
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html \
+		${STAGEDIR}${DOCSDIR}/html)
+	@${LN} -sf ../../../${DOCSDIR_REL} \
+		${STAGEDIR}${PREFIX}/lib/aap/Exec-${PORTVERSION}/doc
 
 test: install
 	cd ${WRKSRC}; ${PREFIX}/bin/aap
 
-# This target is only meant to be used by the port maintainer.
-x-generate-plist:
-	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX}|${SED} -E 's,.*share/nls/.+$$,,g;s,${PORTVERSION},%%PORTVERSION%%,g;s,^(lib/aap/Exec-%%PORTVERSION%%/doc/),%%PORTDOCS%%\1,g;s,^share/doc/aap/.*,,g'|${TR} -s '\n') > temp-pkg-plist
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/aap/distinfo b/devel/aap/distinfo
index 1572a8d0ce23..8c938dae0294 100644
--- a/devel/aap/distinfo
+++ b/devel/aap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aap-1.092.zip) = 70c81eeda824e5379af4702c86a233f6987acae9955ec1e6621ced109dc9585b
-SIZE (aap-1.092.zip) = 1648928
+SHA256 (aap-1.093.zip) = 7a6c6c4a819a8379e60c679fe0c3f93eb1b74204cd7cc1c158263f4b34943001
+SIZE (aap-1.093.zip) = 1648931
diff --git a/devel/aap/pkg-descr b/devel/aap/pkg-descr
index c6fbf462bf82..711c88c23430 100644
--- a/devel/aap/pkg-descr
+++ b/devel/aap/pkg-descr
@@ -1,12 +1,9 @@
-A-A-P is an Open Source build tool.  It does everything that make does in a
-better way.  Includes Internet access for uploading and downloading files.
-Integrated CVS support: obtain a module from a CVS server and check changes
-into a CVS server.
+A-A-P is an Open Source build tool. It does everything that make does in
+a better way. Includes Internet access for uploading and downloading
+files.  Integrated CVS support: obtain a module from a CVS server and
+check changes into a CVS server.
 
 Can be used to build programs, maintain web sites, distribute software,
 download and install an application, etc.
 
-Language: Python (version 1.5 or later)
-License: GNU GPL
-
 WWW: http://www.a-a-p.org/
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