Re: toolchain/42242 (tools build broken)

[Ignatios Souvatzis <ignatios%cs.uni-bonn.de@localhost>]

The patch below fixes it.

Short:

1. The new lex needs m4. Our old m4 wasn't GNUish enough, so a workaround
was added using gm4 from pkgsrc, which wasn't removed when our m4 was
upgraded. (Thanks to Alan Barret for finding this.)

(My original problem was caused because I had a broken pkgsrc gm4
installation. pkg_delete-ing m4 didn't help, as lex still insisted on
/usr/pkg/bin/m4.)

2. Fixing m4 didn't make toolchain lex work, as toolchain m4 wasn't
installed in time. It seems to me that the .WAIT magic used in the
tools Makefiles doesn't work as expected, but only forces early
installation of the tool immediately before the .WAIT in the list.
(This is from observation, not from fully understanding the
 higher-order Makefile magic used.)

Giving m4 its own .WAIT fixed this for me; maybe a full rewrite
of the Makefile magic would be better in the long run.

Index: src/external/bsd/flex/bin/Makefile
===================================================================
RCS file: /cvsroot/src/external/bsd/flex/bin/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- src/external/bsd/flex/bin/Makefile  26 Oct 2009 18:32:39 -0000      1.3
+++ src/external/bsd/flex/bin/Makefile  29 Oct 2009 11:20:50 -0000
@@ -48,7 +48,5 @@
 LDADD+=-lm
 DPADD+=${LIBM}
-# XXX: Fix m4.
-TOOL_M4=/usr/pkg/bin/gm4
 
 MAN = flex.1
 
Index: src/tools/Makefile
===================================================================
RCS file: /cvsroot/src/tools/Makefile,v
retrieving revision 1.128
diff -u -r1.128 Makefile
--- src/tools/Makefile  23 Oct 2009 22:14:37 -0000      1.128
+++ src/tools/Makefile  29 Oct 2009 11:21:26 -0000
@@ -37,8 +37,9 @@
        binstall .WAIT mktemp .WAIT sed .WAIT \
                cap_mkdb crunchgen ctags genassym gencat hexdump join \
                ${LINT_BITS} \
-               lorder m4 makewhatis mkdep mtree rpcgen tsort uudecode \
+               lorder makewhatis mkdep mtree rpcgen tsort uudecode \
        texinfo .WAIT \
+       m4 .WAIT \
        yacc .WAIT \
        awk .WAIT \
        lex .WAIT \