Date: Sat, 7 Nov 2015 16:05:51 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401003 - in head/devel/ahven: . files Message-ID: <201511071605.tA7G5pHY093987@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Nov 7 16:05:51 2015 New Revision: 401003 URL: https://svnweb.freebsd.org/changeset/ports/401003 Log: devel/ahven: Upgrade version 2.4 => 2.6 I could not use the comfignat build system. For starters it creates a dynamic library which, when used, has troubling finding libgnarl. If I make changes to force it to build statically, the programms that link to it fail with a STORAGE ERROR. Finally I just put all the build and install steps in the port makefile and everything is working as it did with version 2.4 Added: head/devel/ahven/files/ahven.gpr (contents, props changed) Deleted: head/devel/ahven/files/patch-Makefile Modified: head/devel/ahven/Makefile head/devel/ahven/distinfo head/devel/ahven/pkg-plist Modified: head/devel/ahven/Makefile ============================================================================== --- head/devel/ahven/Makefile Sat Nov 7 15:55:14 2015 (r401002) +++ head/devel/ahven/Makefile Sat Nov 7 16:05:51 2015 (r401003) @@ -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 - -OPTIONS_DEFINE= TRACE DOCS -OPTIONS_DEFAULT=TRACE -NO_OPTIONS_SORT=yes +USES= ada gmake +MAKE_ENV= OS_VERSION=unix -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> Modified: head/devel/ahven/distinfo ============================================================================== --- head/devel/ahven/distinfo Sat Nov 7 15:55:14 2015 (r401002) +++ head/devel/ahven/distinfo Sat Nov 7 16:05:51 2015 (r401003) @@ -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 Added: head/devel/ahven/files/ahven.gpr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ahven/files/ahven.gpr Sat Nov 7 16:05:51 2015 (r401003) @@ -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; Modified: head/devel/ahven/pkg-plist ============================================================================== --- head/devel/ahven/pkg-plist Sat Nov 7 15:55:14 2015 (r401002) +++ head/devel/ahven/pkg-plist Sat Nov 7 16:05:51 2015 (r401003) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511071605.tA7G5pHY093987>