3 files changed, 16 insertions, 26 deletions

diff --git a/devel/aap/Makefile b/devel/aap/Makefile
index 8e79e2e72f12..57803512508a 100644
--- a/devel/aap/Makefile
+++ b/devel/aap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	aap
-PORTVERSION=	1.000
+PORTVERSION=	1.010
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	a-a-p
@@ -23,29 +23,16 @@ USE_ZIP=	yes
 USE_PYTHON=	yes
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-# The files are installed in lib/aap/Exec-${PORTVERSION} and below.  Create
-# a symbolic link for bin/aap so that it's found in $PATH and still knows
-# where to find the Python modules.
-# Also create a link for share/doc/aap, so that more people can find the docs
-# without clobbering share/doc.
-INSTALLDIR=	${PREFIX}/lib/aap/Exec-${PORTVERSION}
-do-install:
-	cd ${WRKSRC} && \
-		${MKDIR} -m 755 ${INSTALLDIR}/tools && \
-		${INSTALL_SCRIPT} *.py aap ${INSTALLDIR} && \
-		${LN} -fhs ${INSTALLDIR}/aap ${PREFIX}/bin/aap && \
-		${INSTALL_SCRIPT} tools/*.py ${INSTALLDIR}/tools && \
-		${INSTALL_DATA} -m 644 COPYING README.txt default.aap ${INSTALLDIR} && \
-		${INSTALL_DATA} aap.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && \
-		${MKDIR} -m 755 ${INSTALLDIR}/doc ${INSTALLDIR}/doc/html && \
-		${INSTALL_DATA} doc/exec.pdf ${INSTALLDIR}/doc && \
-		${INSTALL_DATA} doc/*.html ${INSTALLDIR}/doc/html && \
-		${LN} -fhs ${INSTALLDIR}/doc ${PREFIX}/share/doc/aap
+FULLDOCS=yes
+.else
+FULLDOCS=no
 .endif
-	cd ${INSTALLDIR} && \
-		${PYTHON_CMD} -c "import compileall; compileall.compile_dir('.', 1)"
+
+do-install:
+	@cd ${WRKSRC} && \
+		${PYTHON_CMD} ./aap PREFIX="${PREFIX}" FULLDOCS=${FULLDOCS} \
+			HTMLDIR=/html install
 
 test: install
 	cd ${WRKSRC}; ${PREFIX}/bin/aap
diff --git a/devel/aap/distinfo b/devel/aap/distinfo
index b945ae0b721a..0b62fbe96de6 100644
--- a/devel/aap/distinfo
+++ b/devel/aap/distinfo
@@ -1 +1 @@
-MD5 (aap-1.000.zip) = 605764a12ac71f55bc3a0769bbafd6d5
+MD5 (aap-1.010.zip) = 042e5272cad201c9a2dca133bcfb6100
diff --git a/devel/aap/pkg-plist b/devel/aap/pkg-plist
index 6a111d0f9b3d..b6f8489ec30b 100644
--- a/devel/aap/pkg-plist
+++ b/devel/aap/pkg-plist
@@ -84,10 +84,10 @@ lib/aap/Exec-%%PORTVERSION%%/default.aap
 %%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/ln12.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/p1820.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/p5586.html
+%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/p2801.html
+%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/p6786.html
 %%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/p30.html
-%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/p803.html
+%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/p836.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
@@ -108,6 +108,7 @@ lib/aap/Exec-%%PORTVERSION%%/default.aap
 %%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/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-cvs.html
@@ -127,6 +128,8 @@ lib/aap/Exec-%%PORTVERSION%%/default.aap
 %%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-version.html
 lib/aap/Exec-%%PORTVERSION%%/tools/__init__.py
 lib/aap/Exec-%%PORTVERSION%%/tools/__init__.pyc
+lib/aap/Exec-%%PORTVERSION%%/tools/bcc.py
+lib/aap/Exec-%%PORTVERSION%%/tools/bcc.pyc
 lib/aap/Exec-%%PORTVERSION%%/tools/gcc.py
 lib/aap/Exec-%%PORTVERSION%%/tools/gcc.pyc
 lib/aap/Exec-%%PORTVERSION%%/tools/icc.py