From: John Marino <draco@marino.st>
Date: Wed, 16 Jan 2013 02:05:46 +0000 (+0100)
Subject: flex/lex: Activate flex 2.5.37, deactivate lex 2.5.4
X-Git-Tag: v3.4.0rc~486
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/f506e60df4a2ee3cc470ddcbad8a149f756bec0f

flex/lex: Activate flex 2.5.37, deactivate lex 2.5.4

Flex is a bootstrap tool.  This swaps the new flex for the old lex.
The old lex subdirectory should stay in place for around a week in case
we need to revert this change for any reason.
---

diff --git a/Makefile.inc1 b/Makefile.inc1
index 3ea93c0f04..71cd5b7cfb 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -768,7 +768,7 @@ BSTRAPDIRS= ${_strfile} \
 	bin/hostname bin/kill \
 	usr.bin/yacc usr.bin/colldef usr.bin/uudecode usr.bin/xinstall \
 	usr.bin/m4 usr.bin/rpcgen usr.bin/bmake usr.bin/awk usr.bin/stat \
-	usr.bin/find usr.bin/lex usr.bin/sed usr.bin/uname usr.bin/touch \
+	usr.bin/find usr.bin/flex usr.bin/sed usr.bin/uname usr.bin/touch \
 	usr.bin/mkdep usr.bin/mktemp usr.bin/lorder usr.bin/file2c \
 	usr.bin/tsort usr.bin/tr usr.bin/join usr.bin/wc usr.bin/basename \
 	usr.bin/gencat usr.bin/chflags usr.bin/expand usr.bin/paste \
@@ -940,7 +940,7 @@ secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L
 _generic_libs+=	secure/lib
 .endif
 
-_generic_libs+=	usr.bin/lex/lib
+_generic_libs+=	usr.bin/flex/lib
 
 .for _lib in ${_startup_libs44} ${_startup_libs47} \
 		${_startup_libs} ${_prebuild_libs} ${_generic_libs}
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index a8fe2ccd2c..eb05106e30 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -65,6 +65,7 @@ SUBDIR=	alias \
 	file2c \
 	find \
 	finger \
+	flex \
 	fmt \
 	fold \
 	from \
@@ -101,7 +102,6 @@ SUBDIR=	alias \
 	less \
 	lessecho \
 	lesskey \
-	lex \
 	limits \
 	locale \
 	locate \