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

3 files changed, 71 insertions, 37 deletions

diff --git a/devel/afay/Makefile b/devel/afay/Makefile
index 5b9da66efef3..a8b8cc248a39 100644
--- a/devel/afay/Makefile
+++ b/devel/afay/Makefile
@@ -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 scanner and parser generators
 
 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>
diff --git a/devel/afay/files/patch-afay_aflex_src_dfaB.a b/devel/afay/files/patch-afay_aflex_src_dfaB.a
new file mode 100644
index 000000000000..6a6b3ee2f662
--- /dev/null
+++ b/devel/afay/files/patch-afay_aflex_src_dfaB.a
@@ -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 
diff --git a/devel/afay/pkg-plist b/devel/afay/pkg-plist
index b0194feba874..8f2c08ac6a82 100644
--- a/devel/afay/pkg-plist
+++ b/devel/afay/pkg-plist
@@ -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%%