From bebb9f41c98e308eb72afa20bedaf9b16725a23d Mon Sep 17 00:00:00 2001
From: roberto <roberto@FreeBSD.org>
Date: Thu, 7 Aug 2014 11:44:30 +0000
Subject: [PATCH] 10 has a new flex (2.5.37) and the config.h for unbound has
 been updated to take this into account. Alas it breaks source upgrade from
 any version of 9 because flex is not built as a bootstrap-tools (it would be
 for older versions).

That means "libunbound/configlexer.c" is built with the old flex but using
config.h for the new one. Build is thus broken going from 9.* to 10.

Make flex a bootstrap-tools entry if host is less than 1000033 to take into
account the flex update in 10.

Tested on both 9.2-RC3 and 9.3 by myself and dim@. Running buildworld in
head but as both 10 and 11 has the new flex, it will not matter.

Reviewed by:	imp
Approved by:	des, imp
MFC after:	1 week
Phabric:	D554
---
 Makefile.inc1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index f50b7888d6c1..557d92a61d5b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1207,10 +1207,6 @@ _vtfontcvt=	usr.bin/vtfontcvt
 _sed=		usr.bin/sed
 .endif
 
-.if ${BOOTSTRAPPING} < 900006
-_lex=		usr.bin/lex
-.endif
-
 .if ${BOOTSTRAPPING} < 1000002
 _m4=		usr.bin/m4
 .endif
@@ -1233,6 +1229,10 @@ _nmtree=	lib/libnetbsd \
 _cat=		bin/cat
 .endif
 
+.if ${BOOTSTRAPPING} < 1000033
+_lex=		usr.bin/lex
+.endif
+
 .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
 _awk=		usr.bin/awk
 .endif