5 files changed, 42 insertions, 53 deletions

diff --git a/devel/ahven/Makefile b/devel/ahven/Makefile
index 1edb02df98cd..0cd3a0ff7bbc 100644
--- a/devel/ahven/Makefile
+++ b/devel/ahven/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	ahven
-PORTVERSION=	2.4
-PORTREVISION=	5
+PORTVERSION=	2.6
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Ahven%20${PORTVERSION}
+MASTER_SITES=	http://www.ahven-framework.com/releases/
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Ada unit test framework
@@ -14,27 +13,40 @@ LICENSE=	ISCL
 
 BUILD_DEPENDS=	adactl:${PORTSDIR}/lang/adacontrol
 
-USES=		ada
-ALL_TARGET=	build_all
-INSTALL_TARGET=	install_lib
-MAKE_ENV+=	OS_VERSION=unix
+USES=		ada gmake
+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
+OPTIONS_DEFINE=		TRACE DOCS
+OPTIONS_DEFAULT=	TRACE
+NO_OPTIONS_SORT=	yes
+TRACE_DESC=		Build with GNAT-specific symbolic tracing functionality
 
 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
-
 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
+do-build:
+	(cd ${WRKSRC} && ${MKDIR} lib objects)
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -Pgnat/ahven_lib)
+
+do-build-DOCS-on:
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${MAKE_CMD} -C doc/manual/en html)
+
+do-install:
+	(cd ${STAGEDIR}${PREFIX} && ${MKDIR} lib/gnat lib/ahven include/ahven)
+	${INSTALL_DATA} ${WRKSRC}/src/*.ad[bs] \
+		${STAGEDIR}${PREFIX}/include/ahven
+	${INSTALL_DATA} ${WRKSRC}/lib/*.ali ${STAGEDIR}${PREFIX}/lib/ahven
+	${INSTALL_DATA} ${WRKSRC}/lib/libahven.a ${STAGEDIR}${PREFIX}/lib/ahven
+	${INSTALL_DATA} ${FILESDIR}/ahven.gpr ${STAGEDIR}${PREFIX}/lib/gnat
+
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc/manual/en/build && \
+		${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR});
+	${RM} -r ${STAGEDIR}${DOCSDIR}/html/_sources
+	${RM} ${STAGEDIR}${DOCSDIR}/html/.buildinfo
 
 .include <bsd.port.mk>
diff --git a/devel/ahven/distinfo b/devel/ahven/distinfo
index bf10e31ecfd7..cbe8175c130b 100644
--- a/devel/ahven/distinfo
+++ b/devel/ahven/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ahven-2.4.tar.gz) = 3e0c2726c5775f622c2a3182f47f3247437e46f169ecc9b3d92968902d8ec28a
-SIZE (ahven-2.4.tar.gz) = 321346
+SHA256 (ahven-2.6.tar.gz) = 9ad43885c333c1d93cb106dbf8f361bac33b793d9892930a540eebdf23c1c4a5
+SIZE (ahven-2.6.tar.gz) = 107491
diff --git a/devel/ahven/files/ahven.gpr b/devel/ahven/files/ahven.gpr
new file mode 100644
index 000000000000..357aad893ae0
--- /dev/null
+++ b/devel/ahven/files/ahven.gpr
@@ -0,0 +1,7 @@
+library project Ahven is
+   for Library_Name     use "ahven";
+   for Library_Kind     use "static";
+   for Source_Dirs      use ("../../include/ahven");
+   for Library_Dir      use "../../lib/ahven";
+   for Externally_Built use "true";
+end Ahven;
diff --git a/devel/ahven/files/patch-Makefile b/devel/ahven/files/patch-Makefile
deleted file mode 100644
index c420dca41971..000000000000
--- a/devel/ahven/files/patch-Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.orig	2013-01-23 19:59:16.000000000 +0000
-+++ Makefile
-@@ -91,17 +91,17 @@ distclean:
- install: install_lib install_docs
- 
- install_lib: build_lib
--	mkdir -p $(PREFIX)/include/ahven
--	mkdir -p $(LIBDIR)/ahven
--	mkdir -p $(PREFIX)/lib/gnat
--	$(INSTALL) -m 644 $(SOURCES) $(PREFIX)/include/ahven
--	$(INSTALL) -m 444 $(ALI_FILES) $(LIBDIR)/ahven
--	$(INSTALL) -m 644 lib/$(STATIC_LIBRARY) $(LIBDIR)/ahven
--	$(INSTALL) -m 644 $(GPR_FILE) $(PREFIX)/lib/gnat
-+	mkdir -p $(DESTDIR)$(PREFIX)/include/ahven
-+	mkdir -p $(DESTDIR)$(PREFIX)/lib/ahven
-+	mkdir -p $(DESTDIR)$(PREFIX)/lib/gnat
-+	$(BSD_INSTALL_DATA) $(SOURCES) $(DESTDIR)$(PREFIX)/include/ahven
-+	$(BSD_INSTALL_DATA) $(ALI_FILES) $(DESTDIR)$(PREFIX)/lib/ahven
-+	$(BSD_INSTALL_DATA) lib/$(STATIC_LIBRARY) $(DESTDIR)$(PREFIX)/lib/ahven
-+	$(BSD_INSTALL_DATA) $(GPR_FILE) $(DESTDIR)$(PREFIX)/lib/gnat
- 
- install_docs: userguide
--	mkdir -p $(PREFIX)/share/doc/ahven
--	cp -r doc/manual/en/build/html $(PREFIX)/share/doc/ahven
-+	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/ahven
-+	cp -r doc/manual/en/build/html $(DESTDIR)$(PREFIX)/share/doc/ahven
- 
- check: build_tests
- 	./tester -c
diff --git a/devel/ahven/pkg-plist b/devel/ahven/pkg-plist
index 5fbe550792ac..2de035c53110 100644
--- a/devel/ahven/pkg-plist
+++ b/devel/ahven/pkg-plist
@@ -3,8 +3,10 @@ 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.adb
 include/ahven/ahven-listeners.ads
 include/ahven/ahven-long_astrings.ads
+include/ahven/ahven-name_list.ads
 include/ahven/ahven-parameters.adb
 include/ahven/ahven-parameters.ads
 include/ahven/ahven-results.adb
@@ -23,13 +25,12 @@ 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-name_list.ali
 lib/ahven/ahven-parameters.ali
 lib/ahven/ahven-results.ali
 lib/ahven/ahven-runner.ali
@@ -51,14 +52,12 @@ lib/gnat/ahven.gpr
 %%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