Index: head/devel/ahven/Makefile
===================================================================
--- head/devel/ahven/Makefile	(revision 395941)
+++ head/devel/ahven/Makefile	(revision 395942)
@@ -1,44 +1,40 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ahven
 PORTVERSION=	2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Ahven%20${PORTVERSION}
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Ada unit test framework
 
 LICENSE=	ISCL
 
 BUILD_DEPENDS=	adactl:${PORTSDIR}/lang/adacontrol
 
 USES=		ada
 ALL_TARGET=	build_all
+INSTALL_TARGET=	install_lib
 MAKE_ENV+=	OS_VERSION=unix
 
 OPTIONS_DEFINE=	TRACE DOCS
 OPTIONS_DEFAULT=TRACE
 NO_OPTIONS_SORT=yes
 
 TRACE_DESC=	Build with GNAT-specific symbolic tracing functionality
 
-.include <bsd.port.options.mk>
+DOCS_USES=		python:build
+DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx \
+			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-adadomain>0:${PORTSDIR}/textproc/py-sphinxcontrib-adadomain
+DOCS_ALL_TARGET=	docs
+DOCS_INSTALL_TARGET=	install_docs
 
-.if ${PORT_OPTIONS:MDOCS}
-USES+=		python:build
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx \
-		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-adadomain>0:${PORTSDIR}/textproc/py-sphinxcontrib-adadomain
-ALL_TARGET+=	docs
-.endif
-
-.if ${PORT_OPTIONS:MTRACE}
-EXTRA_PATCHES=	${FILESDIR}/extra-src_ahven-framework.adb
-.endif
+TRACE_EXTRA_PATCHES=	${FILESDIR}/extra-src_ahven-framework.adb
 
 post-install:
 	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/ahven/html/_sources
 	${RM} ${STAGEDIR}${PREFIX}/share/doc/ahven/html/.buildinfo
 
 .include <bsd.port.mk>
Index: head/devel/ahven/pkg-plist
===================================================================
--- head/devel/ahven/pkg-plist	(revision 395941)
+++ head/devel/ahven/pkg-plist	(revision 395942)
@@ -1,84 +1,86 @@
 include/ahven/ahven-astrings.ads
 include/ahven/ahven-framework.adb
 include/ahven/ahven-framework.ads
 include/ahven/ahven-listeners-basic.adb
 include/ahven/ahven-listeners-basic.ads
 include/ahven/ahven-listeners.ads
 include/ahven/ahven-long_astrings.ads
 include/ahven/ahven-parameters.adb
 include/ahven/ahven-parameters.ads
 include/ahven/ahven-results.adb
 include/ahven/ahven-results.ads
 include/ahven/ahven-runner.adb
 include/ahven/ahven-runner.ads
 include/ahven/ahven-slist.adb
 include/ahven/ahven-slist.ads
 include/ahven/ahven-tap_runner.adb
 include/ahven/ahven-tap_runner.ads
 include/ahven/ahven-temporary_output.adb
 include/ahven/ahven-temporary_output.ads
 include/ahven/ahven-text_runner.adb
 include/ahven/ahven-text_runner.ads
 include/ahven/ahven-xml_runner.adb
 include/ahven/ahven-xml_runner.ads
 include/ahven/ahven.adb
 include/ahven/ahven.ads
 include/ahven/ahven_compat.adb
 include/ahven/ahven_compat.ads
 lib/ahven/ahven-astrings.ali
 lib/ahven/ahven-framework.ali
 lib/ahven/ahven-listeners-basic.ali
 lib/ahven/ahven-listeners.ali
 lib/ahven/ahven-long_astrings.ali
 lib/ahven/ahven-parameters.ali
 lib/ahven/ahven-results.ali
 lib/ahven/ahven-runner.ali
 lib/ahven/ahven-slist.ali
 lib/ahven/ahven-tap_runner.ali
 lib/ahven/ahven-temporary_output.ali
 lib/ahven/ahven-text_runner.ali
 lib/ahven/ahven-xml_runner.ali
 lib/ahven/ahven.ali
 lib/ahven/ahven_compat.ali
 lib/ahven/libahven.a
 lib/gnat/ahven.gpr
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/ajax-loader.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-bright.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-close.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/comment.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/down-pressed.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/down.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-1.11.1.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/nature.css
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/searchtools.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore-1.3.1.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/up-pressed.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/up.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/websupport.js
 %%PORTDOCS%%%%DOCSDIR%%/html/ada-modindex.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-framework.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-listeners-basic.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-listeners.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-parameters.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-results.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-runner.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-slist.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-tap_runner.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-temporary_output.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-text_runner.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-xml_runner.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api-ahven.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api.html
 %%PORTDOCS%%%%DOCSDIR%%/html/design.html
 %%PORTDOCS%%%%DOCSDIR%%/html/genindex.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/html/objects.inv
 %%PORTDOCS%%%%DOCSDIR%%/html/search.html
 %%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js