Index: head/lang/adacontrol/Makefile
===================================================================
--- head/lang/adacontrol/Makefile	(revision 426187)
+++ head/lang/adacontrol/Makefile	(revision 426188)
@@ -1,50 +1,61 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	adacontrol
-PORTVERSION=	1.17r3
-PORTREVISION=	3
+PORTVERSION=	1.18r9
 CATEGORIES=	lang
 MASTER_SITES=	SF/adacontrol
 DISTNAME=	adactl-${PORTVERSION}-src
-DIST_SUBDIR=	adacontrol-01
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Tool for detecting use or non-use of specific Ada constructs
 
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	asis>=2013:lang/asis
 
 USES=		ada tar:tgz
 WRKSRC=		${WRKDIR}/adactl-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/src
 ALL_TARGET=	build
 PORTDOCS=	adacontrol*
 
-OPTIONS_DEFINE= DOCS
+OPTIONS_DEFINE= DOCS PROJECTS
 
+PROJECTS_DESC=		Support the direct processing of .gpr files
+PROJECTS_BUILD_DEPENDS=	gprbuild:devel/gprbuild \
+			${LOCALBASE}/lib/gnat/gnatcoll.gpr:devel/gnatcoll
+
+do-patch-PROJECTS-off:
+	(cd ${WRKSRC}/src && ${MV} \
+		implementation_options-i_options_from_gpr_project.adb \
+		implementation_options-i_options_from_gpr_project_gpr.adb)
+	(cd ${WRKSRC}/src && ${MV} \
+		implementation_options-i_options_from_gpr_project_nogpr.adb \
+		implementation_options-i_options_from_gpr_project.adb)
+	${REINPLACE_CMD} -e '/gnatcoll/d' ${WRKSRC}/build.gpr
+
 do-build:
-	(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -Pbuild)
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -Pbuild)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin \
 		${STAGEDIR}${PREFIX}/share/gps/plug-ins \
 		${STAGEDIR}${PREFIX}/share/doc/gps/html \
 		${STAGEDIR}${PREFIX}/share/gprconfig
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/adactl ${BUILD_WRKSRC}/pfni \
-		${BUILD_WRKSRC}/ptree ${STAGEDIR}/${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/adactl ${WRKSRC}/pfni \
+		${WRKSRC}/ptree ${STAGEDIR}/${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/GPS/adacontrol.xml \
 		${STAGEDIR}${PREFIX}/share/gprconfig
 	${INSTALL_DATA} ${WRKSRC}/GPS/*adactl* ${WRKSRC}/GPS/pfni.* \
 		${STAGEDIR}${PREFIX}/share/gps/plug-ins
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html \
 		${STAGEDIR}${PREFIX}/share/doc/gps/html
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${WRKSRC}/doc/*.html \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/lang/adacontrol/distinfo
===================================================================
--- head/lang/adacontrol/distinfo	(revision 426187)
+++ head/lang/adacontrol/distinfo	(revision 426188)
@@ -1,2 +1,3 @@
-SHA256 (adacontrol-01/adactl-1.17r3-src.tgz) = e23d45eb6d7af9982285d9eeaf51ac046128b150d306c3be62f7415b4ee6c5d0
-SIZE (adacontrol-01/adactl-1.17r3-src.tgz) = 1976446
+TIMESTAMP = 1479057564
+SHA256 (adactl-1.18r9-src.tgz) = 193095dbe9efdd0eb5b6c1590cf8dbff25b5fe2c65f8b45e3d5f085298d1ef0e
+SIZE (adactl-1.18r9-src.tgz) = 2212880
Index: head/lang/adacontrol/pkg-plist
===================================================================
--- head/lang/adacontrol/pkg-plist	(revision 426187)
+++ head/lang/adacontrol/pkg-plist	(revision 426188)
@@ -1,12 +1,14 @@
 bin/adactl
 bin/pfni
 bin/ptree
 share/doc/gps/html/adacontrol_pm.html
 share/doc/gps/html/adacontrol_ug.html
 share/gprconfig/adacontrol.xml
-share/gps/plug-ins/adactl.gif
+share/gps/plug-ins/adactl-ask.gif
+share/gps/plug-ins/adactl-ask.svg
+share/gps/plug-ins/adactl-file.gif
+share/gps/plug-ins/adactl-file.svg
 share/gps/plug-ins/adactl.py
-share/gps/plug-ins/adactl_ask.gif
 share/gps/plug-ins/pfni.py
 share/gps/plug-ins/pfni.xml
 share/gps/plug-ins/zadactl.xml