Date: Fri, 14 Mar 2014 10:43:10 +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: r348207 - in head/devel/afay: . files Message-ID: <201403141043.s2EAhAQ5032743@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Fri Mar 14 10:43:09 2014 New Revision: 348207 URL: http://svnweb.freebsd.org/changeset/ports/348207 QAT: https://qat.redports.org/buildarchive/r348207/ Log: devel/afay: Fix for gcc49 and add EXAMPLES option * Add a patch to make gcc49 building this port * Add EXAMPLES option * Fix DOCS option * Simplify installation, respect 80 columns This means only gnatdroid-arm* depends on gcc47-aux now. Everything else can be built with gcc49 Added: head/devel/afay/files/patch-afay_aflex_src_dfaB.a (contents, props changed) Modified: head/devel/afay/Makefile head/devel/afay/pkg-plist Modified: head/devel/afay/Makefile ============================================================================== --- head/devel/afay/Makefile Fri Mar 14 10:30:11 2014 (r348206) +++ head/devel/afay/Makefile Fri Mar 14 10:43:09 2014 (r348207) @@ -3,7 +3,7 @@ PORTNAME= afay PORTVERSION= 041111 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://thiberlog.free.fr/src/ DISTNAME= ${PORTNAME}_thiberlog_${PORTVERSION} @@ -14,7 +14,7 @@ COMMENT= Improved aflex and ayacc Ada 95 BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash -USES= ada:47 +USES= ada NO_WRKSUBDIR= yes OPTIONS_DEFINE= DOCS EXAMPLES @@ -32,25 +32,31 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/afay/ayacc/src/ayacc ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex.man ${STAGEDIR}${PREFIX}/man/man1/aflex.1 ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/old_docs/ayacc.manpage ${STAGEDIR}${PREFIX}/man/man1/ayacc.1 +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/READ_ME ${STAGEDIR}${DOCSDIR}/READ_ME.aflex - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex.html ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex_user_man.* ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/READ_ME ${STAGEDIR}${DOCSDIR}/READ_ME.ayacc - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/ayacc.html ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/ayacc_user_man.tex ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ada_parser - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/calc - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/example.l ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/test95.l ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/afay/ayacc/examples/ada_parser/COMPILE ${STAGEDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/READ.ME ${STAGEDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/ada.y ${STAGEDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/ada_lex.l ${STAGEDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/driver.a ${STAGEDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_SCRIPT} ${WRKSRC}/afay/ayacc/examples/calc/COMPILE ${STAGEDIR}${EXAMPLESDIR}/calc - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/READ.ME ${STAGEDIR}${EXAMPLESDIR}/calc - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/calc* ${STAGEDIR}${EXAMPLESDIR}/calc - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/driver.a ${STAGEDIR}${EXAMPLESDIR}/calc + ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/READ_ME \ + ${STAGEDIR}${DOCSDIR}/READ_ME.aflex + (cd ${WRKSRC}/afay/aflex/doc && ${INSTALL_DATA} aflex.html \ + aflex_user_man.* ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/READ_ME \ + ${STAGEDIR}${DOCSDIR}/READ_ME.ayacc + (cd ${WRKSRC}/afay/ayacc/doc && ${INSTALL_DATA} ayacc.html \ + ayacc_user_man.tex ${STAGEDIR}${DOCSDIR}) +.endif +.if ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ada_parser \ + ${STAGEDIR}${EXAMPLESDIR}/calc + (cd ${WRKSRC}/afay/aflex/doc && ${INSTALL_DATA} example.l test95.l \ + ${STAGEDIR}${EXAMPLESDIR}) + ${INSTALL_SCRIPT} ${WRKSRC}/afay/ayacc/examples/ada_parser/COMPILE \ + ${STAGEDIR}${EXAMPLESDIR}/ada_parser + (cd ${WRKSRC}/afay/ayacc/examples/ada_parser && \ + ${INSTALL_DATA} READ.ME ada.y ada_lex.l driver.a \ + ${STAGEDIR}${EXAMPLESDIR}/ada_parser) + ${INSTALL_SCRIPT} ${WRKSRC}/afay/ayacc/examples/calc/COMPILE \ + ${STAGEDIR}${EXAMPLESDIR}/calc + (cd ${WRKSRC}/afay/ayacc/examples/calc && ${INSTALL_DATA} \ + READ.ME calc* driver.a ${STAGEDIR}${EXAMPLESDIR}/calc) +.endif .include <bsd.port.mk> Added: head/devel/afay/files/patch-afay_aflex_src_dfaB.a ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/afay/files/patch-afay_aflex_src_dfaB.a Fri Mar 14 10:43:09 2014 (r348207) @@ -0,0 +1,28 @@ +--- afay/aflex/src/dfaB.a.orig 2004-10-16 16:41:22.000000000 +0000 ++++ afay/aflex/src/dfaB.a +@@ -496,7 +496,11 @@ package body DFA is + NSET(NUMSTATES) := NFA.MKBRANCH(SCBOL(CNT/2), SCSET(CNT/2)); + end if; + +- DFA.EPSCLOSURE(NSET, NUMSTATES, ACCSET, NACC, HASHVAL, NSET); ++ declare ++ NSET_COPY : INT_PTR := NSET; ++ begin ++ DFA.EPSCLOSURE(NSET_COPY, NUMSTATES, ACCSET, NACC, HASHVAL, NSET); ++ end; + + SNSTODS(NSET, NUMSTATES, ACCSET, NACC, HASHVAL, DS, SNSRESULT); + if (SNSRESULT) then +@@ -548,7 +552,11 @@ package body DFA is + if (DUPLIST(SYM) = NIL) then + -- symbol has unique out-transitions + NUMSTATES := SYMFOLLOWSET(DSET, DSIZE, SYM, NSET); +- DFA.EPSCLOSURE(NSET, NUMSTATES, ACCSET, NACC, HASHVAL, NSET); ++ declare ++ NSET_COPY : INT_PTR := NSET; ++ begin ++ DFA.EPSCLOSURE(NSET_COPY, NUMSTATES, ACCSET, NACC, HASHVAL, NSET); ++ end; + + SNSTODS(NSET, NUMSTATES, ACCSET, NACC, HASHVAL, NEWDS, SNSRESULT); + if (SNSRESULT) then Modified: head/devel/afay/pkg-plist ============================================================================== --- head/devel/afay/pkg-plist Fri Mar 14 10:30:11 2014 (r348206) +++ head/devel/afay/pkg-plist Fri Mar 14 10:43:09 2014 (r348207) @@ -9,20 +9,20 @@ man/man1/ayacc.1.gz %%PORTDOCS%%%%DOCSDIR%%/aflex_user_man.tex %%PORTDOCS%%%%DOCSDIR%%/ayacc.html %%PORTDOCS%%%%DOCSDIR%%/ayacc_user_man.tex -%%EXAMPLESDIR%%/ada_parser/COMPILE -%%EXAMPLESDIR%%/ada_parser/READ.ME -%%EXAMPLESDIR%%/ada_parser/ada.y -%%EXAMPLESDIR%%/ada_parser/ada_lex.l -%%EXAMPLESDIR%%/ada_parser/driver.a -%%EXAMPLESDIR%%/calc/COMPILE -%%EXAMPLESDIR%%/calc/READ.ME -%%EXAMPLESDIR%%/calc/calc.input -%%EXAMPLESDIR%%/calc/calc.y -%%EXAMPLESDIR%%/calc/calc_lex.l -%%EXAMPLESDIR%%/calc/driver.a -%%EXAMPLESDIR%%/example.l -%%EXAMPLESDIR%%/test95.l +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ada_parser/COMPILE +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ada_parser/READ.ME +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ada_parser/ada.y +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ada_parser/ada_lex.l +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ada_parser/driver.a +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc/COMPILE +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc/READ.ME +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc/calc.input +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc/calc.y +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc/calc_lex.l +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc/driver.a +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.l +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test95.l %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%EXAMPLESDIR%%/ada_parser -@dirrm %%EXAMPLESDIR%%/calc -@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/ada_parser +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/calc +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403141043.s2EAhAQ5032743>