[src/trunk]: src/external/bsd/flex/bin Now it works, but it needs gm4...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dff015581295
branches:  trunk
changeset: 748537:dff015581295
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Oct 26 18:32:39 2009 +0000

description:
Now it works, but it needs gm4...
Problem was that our bison cannot deal with it, so we don't regenerate
parse.c and parse.h from parse.y.
So we need:
        1. Fix m4
        2. Get new byacc/bison

diffstat:

 external/bsd/flex/bin/Makefile |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r bea56f05e283 -r dff015581295 external/bsd/flex/bin/Makefile
--- a/external/bsd/flex/bin/Makefile    Mon Oct 26 16:41:35 2009 +0000
+++ b/external/bsd/flex/bin/Makefile    Mon Oct 26 18:32:39 2009 +0000
@@ -1,5 +1,5 @@
 #      from: @(#)Makefile      5.4 (Berkeley) 6/24/90
-#      $NetBSD: Makefile,v 1.2 2009/10/26 11:19:47 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2009/10/26 18:32:39 christos Exp $
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
@@ -25,7 +25,7 @@
 misc.c \
 nfa.c \
 options.c \
-parse.y \
+parse.c \
 regex.c \
 scan.c \
 scanflags.c \
@@ -37,12 +37,18 @@
 tblcmp.c \
 yylex.c
 
+# Don't frob yacc files until we have a good bison
+.y.c .y.h:
+       @true
+
 YHEADER=1
-CLEANFILES+=scan.c skel.c
+CLEANFILES+=scan.c skel.c parse.c parse.h
 INCS   =FlexLexer.h
 INCSDIR=/usr/include/g++
 LDADD+=-lm
 DPADD+=${LIBM}
+# XXX: Fix m4.
+TOOL_M4=/usr/pkg/bin/gm4
 
 MAN = flex.1
 
@@ -52,7 +58,7 @@
 
 skel.c: flex.skl mkskel.sh flexint.h tables_shared.h
        ${TOOL_SED} -e 's/m4_/m4postproc_/g' -e 's/m4preproc_/m4_/g' \
-           ${IDIST}/flex.skl | ${TOOL_M4} -P \
+           ${IDIST}/flex.skl | ${TOOL_M4} -I${IDIST} -P \
            -DFLEX_MAJOR_VERSION=`echo ${VERSION} | cut -f 1 -d .` \
            -DFLEX_MINOR_VERSION=`echo ${VERSION} | cut -f 2 -d .` \
            -DFLEX_SUBMINOR_VERSION=`echo ${VERSION} | cut -f 3 -d .` | \