Merge from head

author: sjg <sjg@FreeBSD.org> 2013-09-05 20:18:59 +0000
committer: sjg <sjg@FreeBSD.org> 2013-09-05 20:18:59 +0000
commit: 62bb1062226d3ce6a2350808256a25508978352d (patch)
tree: 22b131dceb13c3df96da594fbaadb693504797c7 /usr.bin
parent: 72ab90509b3a51ab361bf710338f2ef44a4e360d (diff)
parent: 04932445481c2cb89ff69a83b961bdef3d64757e (diff)
download: FreeBSD-src-62bb1062226d3ce6a2350808256a25508978352d.zip
FreeBSD-src-62bb1062226d3ce6a2350808256a25508978352d.tar.gz
284 files changed, 19284 insertions, 17983 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index b3a23f7..a7c72a8 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -148,7 +148,6 @@ SUBDIR=	alias \
 	sockstat \
 	sort \
 	split \
-	ssh-copy-id \
 	stat \
 	stdbuf \
 	su \
@@ -303,6 +302,10 @@ SUBDIR+=	ypmatch
 SUBDIR+=	ypwhich
 .endif
 
+.if ${MK_OPENSSH} != "no"
+SUBDIR+=	ssh-copy-id
+.endif
+
 .if ${MK_OPENSSL} != "no"
 SUBDIR+=	bc
 SUBDIR+=	chkey
@@ -363,6 +366,14 @@ SUBDIR+=	users
 SUBDIR+=	who
 .endif
 
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || \
+    ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "i386" || \
+    (${MACHINE_ARCH} == "armv6" && ${COMPILER_TYPE} == "clang")
+.if ${MK_SVN} == "yes" || ${MK_SVNLITE} == "yes"
+SUBDIR+=	svn
+.endif
+.endif
+
 .include <bsd.arch.inc.mk>
 
 SUBDIR:=	${SUBDIR:O}
diff --git a/usr.bin/Makefile.amd64 b/usr.bin/Makefile.amd64
index b720e3d..fee2fb0 100644
--- a/usr.bin/Makefile.amd64
+++ b/usr.bin/Makefile.amd64
@@ -1,2 +1,3 @@
 # $FreeBSD$
 
+SUBDIR+=	smbutil
diff --git a/usr.bin/Makefile.i386 b/usr.bin/Makefile.i386
index b720e3d..fee2fb0 100644
--- a/usr.bin/Makefile.i386
+++ b/usr.bin/Makefile.i386
@@ -1,2 +1,3 @@
 # $FreeBSD$
 
+SUBDIR+=	smbutil
diff --git a/usr.bin/Makefile.ia64 b/usr.bin/Makefile.ia64
index b720e3d..fee2fb0 100644
--- a/usr.bin/Makefile.ia64
+++ b/usr.bin/Makefile.ia64
@@ -1,2 +1,3 @@
 # $FreeBSD$
 
+SUBDIR+=	smbutil
diff --git a/usr.bin/Makefile.powerpc b/usr.bin/Makefile.powerpc
index b720e3d..fee2fb0 100644
--- a/usr.bin/Makefile.powerpc
+++ b/usr.bin/Makefile.powerpc
@@ -1,2 +1,3 @@
 # $FreeBSD$
 
+SUBDIR+=	smbutil
diff --git a/usr.bin/Makefile.sparc64 b/usr.bin/Makefile.sparc64
index b720e3d..fee2fb0 100644
--- a/usr.bin/Makefile.sparc64
+++ b/usr.bin/Makefile.sparc64
@@ -1,2 +1,3 @@
 # $FreeBSD$
 
+SUBDIR+=	smbutil
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index fa25072..03d9814 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -8,6 +8,8 @@ SRCS=	ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
 DPADD=	${LIBARCHIVE} ${LIBELF} ${LIBZ}
 LDADD=	-larchive -lelf -lz
 
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
 CFLAGS+=-I. -I${.CURDIR}
 
 .if ${MK_SHARED_TOOLCHAIN} == "no"
diff --git a/usr.bin/ar/acplex.l b/usr.bin/ar/acplex.l
index 0acf5b7..589888e 100644
--- a/usr.bin/ar/acplex.l
+++ b/usr.bin/ar/acplex.l
@@ -36,14 +36,16 @@ __FBSDID("$FreeBSD$");
 
 #include "y.tab.h"
 
-#define YY_NO_UNPUT
-#define YY_NO_INPUT
 int lineno = 1;
 
 int	yylex(void);
 
+#define	YY_DECL	int yylex(void)
+
 %}
 
+%option nounput
+%option noinput
 %option noyywrap
 
 %%
diff --git a/usr.bin/bc/Makefile b/usr.bin/bc/Makefile
index 55f465d..39d54e0 100644
--- a/usr.bin/bc/Makefile
+++ b/usr.bin/bc/Makefile
@@ -8,6 +8,8 @@ CFLAGS+= -I. -I${.CURDIR}
 DPADD=	${LIBEDIT} ${LIBTERMCAP}
 LDADD=	-ledit -ltermcap
 
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
 FILES+=	bc.library
 FILESDIR=${SHAREDIR}/misc
 
diff --git a/usr.bin/bc/scan.l b/usr.bin/bc/scan.l
index 5d60bb3..71cb295 100644
--- a/usr.bin/bc/scan.l
+++ b/usr.bin/bc/scan.l
@@ -46,6 +46,7 @@ static void	 init_strbuf(void);
 static void	 add_str(const char *);
 static int	 bc_yyinput(char *, int);
 
+#define YY_DECL	int yylex(void)
 #define YY_NO_INPUT
 #undef YY_INPUT
 #define YY_INPUT(buf,retval,max) \
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index 20dd3f3..b22956d 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -28,7 +28,7 @@
 .\"     @(#)biff.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd March 20, 2010
+.Dd April 28, 2013
 .Dt BIFF 1
 .Os
 .Sh NAME
@@ -97,9 +97,9 @@ The
 utility exits with one of the following values:
 .Bl -tag -width indent
 .It 0
-Notification is enabled.
+Notification was enabled at the time of invocation.
 .It 1
-Notification is disabled.
+Notification was disabled at the time of invocation.
 .It >1
 An error occurred.
 .El
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
index 07c6e56..4129552 100644
--- a/usr.bin/bmake/Makefile
+++ b/usr.bin/bmake/Makefile
@@ -14,10 +14,10 @@ CFLAGS+= -I${.CURDIR}
 CLEANDIRS+= FreeBSD
 CLEANFILES+= bootstrap
 
-#	$Id: Makefile,v 1.10 2013/03/31 05:57:19 sjg Exp $
+#	$Id: Makefile,v 1.20 2013/09/04 15:42:03 sjg Exp $
 
 # Base version on src date
-MAKE_VERSION= 20130330
+MAKE_VERSION= 20130904
 
 PROG?=	${.CURDIR:T}
 
diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc
index c8ca110..7567887 100644
--- a/usr.bin/bmake/Makefile.inc
+++ b/usr.bin/bmake/Makefile.inc
@@ -7,12 +7,19 @@
 .export SRCTOP
 .endif
 
-.if ${MK_BMAKE} != "no"
+# Sadly, we cannot assume bsd.own.mk did its job,
+# nor can we safely include the one we want
+.if !defined(WITHOUT_BMAKE)
+MK_BMAKE= yes
+.endif
+
+.if defined(MK_BMAKE) && ${MK_BMAKE} != "no"
 PROG= make
 .endif
 
-.if ${MK_SHARED_TOOLCHAIN} == "no"
+.if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=     YES
 .endif
 
 WARNS=3
+CFLAGS+= -DNO_PWD_OVERRIDE
diff --git a/usr.bin/bmake/config.h b/usr.bin/bmake/config.h
index 93191b5..546af84 100644
--- a/usr.bin/bmake/config.h
+++ b/usr.bin/bmake/config.h
@@ -230,7 +230,7 @@
 #define PACKAGE_NAME "bmake"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "bmake 20130303"
+#define PACKAGE_STRING "bmake 20130706"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "bmake"
@@ -239,7 +239,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "20130303"
+#define PACKAGE_VERSION "20130706"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile
index b24871f..be4cd2f 100644
--- a/usr.bin/bmake/unit-tests/Makefile
+++ b/usr.bin/bmake/unit-tests/Makefile
@@ -5,9 +5,9 @@
 
 SRCTOP?= ${.CURDIR:H:H:H}
 
-# $Id: Makefile.in,v 1.42 2013/03/23 02:31:13 sjg Exp $
+# $Id: Makefile.in,v 1.44 2013/08/28 22:09:29 sjg Exp $
 #
-# $NetBSD: Makefile,v 1.36 2013/03/22 16:36:46 sjg Exp $
+# $NetBSD: Makefile,v 1.38 2013/08/28 21:56:50 sjg Exp $
 #
 # Unit tests for make(1)
 # The main targets are:
@@ -52,6 +52,7 @@ SUBFILES= \
 	phony-end \
 	posix \
 	qequals \
+	sunshcmd \
 	sysv \
 	ternary \
 	unexport \
@@ -96,7 +97,7 @@ test:
 	@echo "${TEST_MAKE} -f ${MAKEFILE} > ${.TARGET}.out 2>&1"
 	@cd ${.OBJDIR} && ${TEST_MAKE} -f ${MAKEFILE} 2>&1 | \
 	${TOOL_TR} -d '\015' | \
-	${TOOL_SED} -e 's,^${TEST_MAKE:T:C/\./\\\./g}:,make:,' \
+	${TOOL_SED} -e 's,^${TEST_MAKE:T:C/\./\\\./g}[^:]*:,make:,' \
 	-e '/stopped/s, /.*, unit-tests,' \
 	-e 's,${.CURDIR:C/\./\\\./g}/,,g' \
 	-e 's,${UNIT_TESTS:C/\./\\\./g}/,,g' > ${.TARGET}.out || { \
diff --git a/usr.bin/brandelf/brandelf.1 b/usr.bin/brandelf/brandelf.1
index 689f0cc..2b3ea7e 100644
--- a/usr.bin/brandelf/brandelf.1
+++ b/usr.bin/brandelf/brandelf.1
@@ -1,5 +1,4 @@
-.\" Copyright (c) 1997
-.\"	John-Mark Gurney.  All rights reserved.
+.\" Copyright 1997 John-Mark Gurney.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -9,9 +8,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the author nor the names of any co-contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY John-Mark Gurney AND CONTRIBUTORS ``AS IS''
 .\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/usr.bin/bzip2recover/Makefile b/usr.bin/bzip2recover/Makefile
index 7f61946..affe91b 100644
--- a/usr.bin/bzip2recover/Makefile
+++ b/usr.bin/bzip2recover/Makefile
@@ -6,4 +6,6 @@ BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 PROG=	bzip2recover
 NO_MAN=
 
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index 79f8590..c7bd544 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -8,7 +8,7 @@ DPADD=	${LIBM}
 LDADD=	-lm
 INTER=          de_AT.ISO_8859-15 de_DE.ISO8859-1 fr_FR.ISO8859-1 \
 		hr_HR.ISO8859-2 hu_HU.ISO8859-2 pt_BR.ISO8859-1 \
-		pt_BR.UTF-8 ru_RU.KOI8-R uk_UA.KOI8-U
+		pt_BR.UTF-8 ru_RU.KOI8-R ru_RU.UTF-8 uk_UA.KOI8-U
 DE_LINKS=       de_DE.ISO8859-15
 FR_LINKS=       fr_FR.ISO8859-15
 TEXTMODE?=	444
diff --git a/usr.bin/calendar/calendar.h b/usr.bin/calendar/calendar.h
index a4903b1..87e705c 100644
--- a/usr.bin/calendar/calendar.h
+++ b/usr.bin/calendar/calendar.h
@@ -101,11 +101,11 @@ extern int EastLongitude;
 					 * program wrong.
 					 */
 
-/* 
+/*
  * All the astronomical calculations are carried out for the meridian 120
  * degrees east of Greenwich.
  */
-#define UTCOFFSET_CNY		8.0		
+#define UTCOFFSET_CNY		8.0
 
 extern int	debug;		/* show parsing of the input */
 extern int	year1, year2;
@@ -174,7 +174,7 @@ int	j2g(int);
 
 /* dates.c */
 extern int cumdaytab[][14];
-extern int mondaytab[][14];
+extern int monthdaytab[][14];
 extern int debug_remember;
 void	generatedates(struct tm *tp1, struct tm *tp2);
 void	dumpdates(void);
diff --git a/usr.bin/calendar/calendars/calendar.birthday b/usr.bin/calendar/calendars/calendar.birthday
index adf14a2..51745e3 100644
--- a/usr.bin/calendar/calendars/calendar.birthday
+++ b/usr.bin/calendar/calendars/calendar.birthday
@@ -120,7 +120,7 @@
 04/10	William Booth born, 1829, founder of the Salvation Army
 04/13	Thomas Jefferson, 3rd President of the United States, born Shadwell
 		Plantation, Albemarle County, Virginia, 1743
-04/14	Christian Huygen born, 1629, physicist & astronomer;
+04/14	Christiaan Huygens born, 1629, physicist & astronomer;
 		discovered Saturn's rings
 04/15	Leonardo da Vinci born, 1452
 04/16	Charles (Charlie) Chaplin (Sir) born in London, 1889
diff --git a/usr.bin/calendar/calendars/calendar.dutch b/usr.bin/calendar/calendars/calendar.dutch
index fab1793..edabe10 100644
--- a/usr.bin/calendar/calendars/calendar.dutch
+++ b/usr.bin/calendar/calendars/calendar.dutch
@@ -13,7 +13,7 @@ Easter=Pasen
 jan/01	Nieuwjaar
 jan/06	Driekoningen
 apr/01	1 april
-apr/30	Koninginnedag
+apr/27	Koningsdag
 mei/01	Dag van de Arbeid
 mei/04	Dodenherdenking
 mei/05	Bevrijdingsdag
@@ -60,13 +60,13 @@ sep/TueThird	Prinsjesdag
  * Het koningshuis
  */
 jan/19	Prinses Margriet (1943)
-jan/31	Koningin Beatrix (1938)
+jan/31	Prinses Beatrix (1938)
 feb/17	Prins Willem III (1817 - 1890)
 feb/18	Prinses Christina (1947)
 apr/10	Prinses Ariane (2007)
 apr/19	Prins Hendrik (1876 - 1934)
-apr/27	Kroonprins Willem Alexander (1967)
-apr/30	Koningin Juliana (1909 - 2004)
+apr/27	Koning Willem Alexander (1967)
+apr/30	Prinses Juliana (1909 - 2004)
 apr/30	Mr. Pieter van Vollenhoven (1939)
 mei/17	Prinses Maxima (1971)
 jun/26	Prinses Alexia (2005)
diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd
index aac2304..6cf0346 100644
--- a/usr.bin/calendar/calendars/calendar.freebsd
+++ b/usr.bin/calendar/calendars/calendar.freebsd
@@ -62,6 +62,7 @@
 02/14	Manolis Kiagias <manolis@FreeBSD.org> born in Chania, Greece, 1970
 02/14	Erwin Lansing <erwin@FreeBSD.org> born in 's-Hertogenbosch, the Netherlands, 1975
 02/14	Martin Blapp <mbr@FreeBSD.org> born in Olten, Switzerland, 1976
+02/15	Hiren Panchasara <hiren@FreeBSD.org> born in Ahmedabad, Gujarat, India, 1984
 02/19	Murray Stokely <murray@FreeBSD.org> born in Jacksonville, Florida, United States, 1979
 02/20	Anders Nordby <anders@FreeBSD.org> born in Oslo, Norway, 1976
 02/21	Alexey Zelkin <phantom@FreeBSD.org> born in Simferopol, Ukraine, 1978
@@ -73,6 +74,7 @@
 02/24	Colin Percival <cperciva@FreeBSD.org> born in Burnaby, Canada, 1981
 02/26	Pietro Cerutti <gahr@FreeBSD.org> born in Faido, Switzerland, 1984
 02/28	Daichi GOTO <daichi@FreeBSD.org> born in Shimizu Suntou, Shizuoka, Japan, 1980
+02/28	Ruslan Makhmatkhanov <rm@FreeBSD.org> born in Rostov-on-Don, USSR, 1984
 03/01	Hye-Shik Chang <perky@FreeBSD.org> born in Daejeon, Republic of Korea, 1980
 03/02	Cy Schubert <cy@FreeBSD.org> born in Edmonton, Alberta, Canada, 1956
 03/03	Sergey Matveychuk <sem@FreeBSD.org> born in Moscow, Russian Federation, 1973
@@ -150,6 +152,7 @@
 05/10	Markus Brueffer <markus@FreeBSD.org> born in Gronau, Nordrhein-Westfalen, Germany, 1977
 05/11	Jesus Rodriguez <jesusr@FreeBSD.org> born in Barcelona, Spain, 1972
 05/11	Roman Kurakin <rik@FreeBSD.org> born in Moscow, USSR, 1979
+05/11	Ulrich Spoerlein <uqs@FreeBSD.org> born in Schesslitz, Bayern, Germany, 1981
 05/13	Pete Fritchman <petef@FreeBSD.org> born in Lansdale, Pennsylvania, United States, 1983
 05/14	Tatsumi Hosokawa <hosokawa@FreeBSD.org> born in Tokyo, Japan, 1968
 05/14	Shigeyuku Fukushima <shige@FreeBSD.org> born in Osaka, Japan, 1974
@@ -192,7 +195,7 @@
 06/07	Jimmy Olgeni <olgeni@FreeBSD.org> born in Milano, Italy, 1976
 06/07	Benjamin Close <benjsc@FreeBSD.org> born in Adelaide, Australia, 1978
 06/14	Josh Paetzel <jpaetzel@FreeBSD.org> born in Minneapolis, Minnesota, United States, 1973
-06/17	Tilman Linneweh <arved@FreeBSD.org> born in Weinheim, Baden-Wuertemberg, Germany, 1978
+06/17	Tilman Linneweh <arved@FreeBSD.org> born in Weinheim, Baden-Wuerttemberg, Germany, 1978
 06/18	Li-Wen Hsu <lwhsu@FreeBSD.org> born in Taipei, Taiwan, Republic of China, 1984
 06/18	Roman Bogorodskiy <novel@FreeBSD.org> born in Saratov, Russian Federation, 1986
 06/19	Charlie Root <root@FreeBSD.org> born in Portland, Oregon, United States, 1993
@@ -258,6 +261,7 @@
 08/19	Pav Lucistnik <pav@FreeBSD.org> born in Kutna Hora, Czech Republic, 1980
 08/20	Michael Heffner <mikeh@FreeBSD.org> born in Cleona, Pennsylvania, United States, 1981
 08/24	Mark Linimon <linimon@FreeBSD.org> born in Houston, Texas, United States, 1955
+08/24	Alexander Botero-Lowry <alexbl@FreeBSD.org> died in San Francisco, California, United States, 2012
 08/25	Beech Rintoul <beech@FreeBSD.org> born in Oakland, California, United States, 1952
 08/25	Jean Milanez Melo <jmelo@FreeBSD.org> born in Divinopolis, Minas Gerais, Brazil, 1982
 08/26	Dima Ruban <dima@FreeBSD.org> born in Nalchik, USSR, 1970
@@ -296,6 +300,7 @@
 09/28	Greg Lehey <grog@FreeBSD.org> born in Melbourne, Victoria, Australia, 1948
 09/28	Alex Dupre <ale@FreeBSD.org> born in Milano, Italy, 1980
 09/29	Matthew Hunt <mph@FreeBSD.org> born in Johnstown, Pennsylvania, United States, 1976
+09/30	Mark Felder <feld@FreeBSD.org> born in Prairie du Chien, Wisconsin, United States, 1985
 09/30	Hiten M. Pandya <hmp@FreeBSD.org> born in Dar-es-Salaam, Tanzania, East Africa, 1986
 09/30	Third quarter status reports are due on 10/15
 10/02	Beat Gaetzi <beat@FreeBSD.org> born in Zurich, Switzerland, 1980
diff --git a/usr.bin/calendar/calendars/calendar.history b/usr.bin/calendar/calendars/calendar.history
index a05a6ff..e343293 100644
--- a/usr.bin/calendar/calendars/calendar.history
+++ b/usr.bin/calendar/calendars/calendar.history
@@ -99,7 +99,6 @@
 04/04	Martin Luther King assassinated in Memphis, Tennessee, 1968
 04/04	NATO Established, 1949
 04/06	Joseph Smith founds Mormon Church, 1830
-04/07	Albert Hofmann synthesizes LSD in Switzerland, 1943
 04/07	Alewives run, Cape Cod
 04/08	Matthew Flinders and Nicolas Baudin meet in Encounter Bay, 1802
 04/09	Lee surrenders to Grant at Appomattox Courthouse, 1865
@@ -420,6 +419,7 @@
 	from McDonald's), 1971
 11/15	Niagara Falls power plant startup, 1896
 11/16	Opening of the Suez Canal, 1869
+11/16	Albert Hofmann synthesizes LSD in Switzerland, 1938
 11/17	46,000 meteoroids fall over AZ in 20 minutes, 1966
 11/17	Richard Nixon says "I am not a crook.", 1973
 11/18	First hydrogen bomb blasts Enewetok, 1952
diff --git a/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.all b/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.all
new file mode 100644
index 0000000..038bfb0
--- /dev/null
+++ b/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.all
@@ -0,0 +1,16 @@
+/*
+ * Русский календарь
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _ru_RU_UTF_8_all_
+#define _ru_RU_UTF_8_all_
+
+#include <ru_RU.UTF-8/calendar.common>
+#include <ru_RU.UTF-8/calendar.holiday>
+#include <ru_RU.UTF-8/calendar.military>
+#include <ru_RU.UTF-8/calendar.orthodox>
+#include <ru_RU.UTF-8/calendar.pagan>
+
+#endif /* !_ru_RU_UTF_8_all_ */
diff --git a/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.common b/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.common
new file mode 100644
index 0000000..8c0a823
--- /dev/null
+++ b/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.common
@@ -0,0 +1,105 @@
+/*
+ * Российские праздники
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _ru_RU_UTF_8_common_
+#define _ru_RU_UTF_8_common_
+
+LANG=ru_RU.UTF-8
+
+12 янв	День работника прокуратуры
+13 янв	День российской печати
+14 янв	Старый Новый год
+21 янв	День инженерных войск
+25 янв	Татьянин день. Студенческий праздник
+ 8 фев	День российской науки
+10 фев	День дипломатического работника
+ 1 мар	Всемирный день гражданской обороны
+03/SunSecond	День работников геодезии и картографии
+11 мар	День работника органов наркоконтроля
+18 мар	День налоговой полиции
+03/SunThird	День работников торговли, бытового обслуживания населения и жилищно-коммунального хозяйства
+27 мар	Международный день театра
+27 мар	День внутренних войск
+ 1 апр	День смеха
+ 2 апр	День единения народов
+04/SunFirst	День геолога
+12 апр	День космонавтики
+04/SunSecond	День войск противовоздушной обороны
+26 апр	День памяти погибших в радиационных авариях и катастрофах
+30 апр	День пожарной охраны
+ 7 май	День радио
+17 май	Международный день телекоммуникаций
+18 май	Международный день музеев
+24 май	День славянской письменности и культуры
+26 май	День российского предпринимательства
+27 май	Общероссийский день библиотек
+28 май	День пограничника
+30 май	День пожарной охраны
+31 май	День Российской Адвокатуры
+05/SunLast	День химика
+ 1 июн	День защиты детей
+ 5 июн	День эколога
+ 6 июн	Пушкинский день
+ 8 июн	День социального работника
+06/SunSecond	День работников легкой промышленности
+06/SunThird	День медицинского работника
+22 июн	День памяти и скорби (Начало Великой Отечественной Войны, 1941 год)
+27 июн	День молодежи
+29 июн	День партизан и подпольщиков
+06/SatLast	День изобретателя и рационализатора
+07/SunFirst	День работников морского и речного флота
+07/SunSecond	День рыбака
+07/SunSecond	День российской почты
+07/SunThird	День металлурга
+07/SunLast	День Военно-Морского Флота
+28 июл	День крещения Руси
+ 6 авг	День железнодорожных войск
+08/SunFirst	День железнодорожника
+12 авг	День военно-воздушных сил
+08/SunSecond	День строителя
+08/SunThird	День Воздушного Флота
+22 авг	День государственного флага
+27 авг	День кино
+08/SunLast	День шахтера
+ 1 сен	День знаний
+ 2 сен	День российской гвардии
+ 3 сен	День солидарности в борьбе с терроризмом
+ 4 сен	День специалиста по ядерному обеспечению
+09/SunFirst	День работников нефтяной и газовой промышленности
+09/SunSecond	День танкиста
+09/SunThird	День работников леса
+28 сен	День работника атомной промышленности
+09/SunLast	День машиностроителя
+ 1 окт	День пожилых людей
+ 1 окт	День сухопутных войск
+ 4 окт	День космических войск
+ 5 окт	День учителя
+14 окт	Международный день стандартизации
+10/SunSecond	День работников сельского хозяйства и перерабатывающей промышленности
+10/SunThird	День работников дорожного хозяйства
+24 окт	Международный день ООН
+25 окт	День таможенника
+30 окт	День памяти жертв политических репрессий
+10/SunLast	День работников автомобильного транспорта
+ 7 ноя	День октябрьской революции 1917 года
+ 9 ноя	Всемирный день качества
+10 ноя	День милиции
+16 ноя	День морской пехоты
+17 ноя	Международный день студентов
+19 ноя	День ракетных войск и артиллерии
+21 ноя	День работников налоговых органов
+26 ноя	Всемирный день информации
+11/SunLast	День матери
+ 1 дек	Всемирный день борьбы со СПИДом
+ 3 дек	День юриста
+ 9 дек	День Героев Отечества
+12 дек	День Конституции
+17 дек	День ракетных войск стратегического назначения
+20 дек	День работника органов безопасности
+22 дек	День энергетика
+27 дек	День спасателя
+
+#endif /* !_ru_RU_UTF_8_common_ */
diff --git a/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.holiday b/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.holiday
new file mode 100644
index 0000000..13a7bc0
--- /dev/null
+++ b/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.holiday
@@ -0,0 +1,25 @@
+/*
+ * Российские праздники (нерабочие "красные" дни)
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _ru_RU_UTF_8_holiday_
+#define _ru_RU_UTF_8_holiday_
+
+LANG=ru_RU.UTF-8
+
+ 1 янв	Новый год
+ 2 янв	Новогодние каникулы
+ 3 янв	Новогодние каникулы
+ 4 янв	Новогодние каникулы
+ 5 янв	Новогодние каникулы
+ 7 янв	Рождество Христово
+23 фев	День защитника Отечества
+ 8 мар	Международный женский день
+ 1 май	Праздник Весны и Труда
+ 9 май	День Победы
+12 июн	День России
+ 4 ноя	День народного единства
+
+#endif /* !_ru_RU_UTF_8_holiday_ */
diff --git a/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.military b/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.military
new file mode 100644
index 0000000..48f257c
--- /dev/null
+++ b/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.military
@@ -0,0 +1,28 @@
+/*
+ * Дни воинской славы России
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _ru_RU_UTF_8_military_
+#define _ru_RU_UTF_8_military_
+
+LANG=ru_RU.UTF-8
+
+27 янв	День снятия блокады города Ленинграда (1944 год)
+ 2 фев	День разгрома советскими войсками немецко-фашистских войск в Сталинградской битве (1943 год)
+23 фев	День победы Красной Армии над кайзеровскими войсками Германии (1918 год)
+18 апр	День победы русских воинов князя Александра Невского над немецкими рыцарями на Чудском озере (Ледовое побоище, 1242 год)
+10 июл	День победы русской армии под командованием Петра Первого над шведами в Полтавском сражении (1709 год)
+ 9 авг	День первой в российской истории морской победы русского флота под командованием Петра Первого над шведами у мыса Гангут (1714 год)
+23 авг	День разгрома советскими войсками немецко-фашистских войск в Курской битве (1943 год)
+ 2 сен	День окончания Второй мировой войны (1945 год)
+ 8 сен	День Бородинского сражения русской армии под командованием М.И. Кутузова с французской армией (1812 год)
+11 сен	День победы русской эскадры под командованием Ф.Ф. Ушакова над турецкой эскадрой у мыса Тендра (1790 год)
+21 сен	День победы русских полков во главе с великим князем Дмитрием Донским над монголо-татарскими войсками в Куликовской битве (1380 год)
+ 7 ноя	День освобождения Москвы силами народного ополчения под руководством Кузьмы Минина и Дмитрия Пожарского от польских интервентов (1612 год)
+ 1 дек	День победы русской эскадры под командованием П.С. Нахимова над турецкой эскадрой у мыса Синоп (1853 год)
+ 5 дек	День начала контрнаступления советских войск против немецко-фашистских войск в битве под Москвой (1941 год)
+24 дек	День взятия турецкой крепости Измаил русскими войсками под командованием А.В. Суворова (1790 год)
+
+#endif /* !_ru_RU_UTF_8_military_ */
diff --git a/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.orthodox b/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.orthodox
new file mode 100644
index 0000000..f42c6ae
--- /dev/null
+++ b/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.orthodox
@@ -0,0 +1,36 @@
+/*
+ * Православные праздники
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _ru_RU_UTF_8_orthodox_
+#define _ru_RU_UTF_8_orthodox_
+
+LANG=ru_RU.UTF-8
+Paskha=Пасха
+
+21 сен	Рождество Пресвятой Богородицы
+27 сен	Воздвижение Креста Господня
+14 окт	Покров Пресвятой Богородицы
+ 4 дек	Введение во храм Пресвятой Богородицы
+ 7 янв	Рождество Христово
+14 янв	Обрезание Господне
+19 янв	Богоявление или Крещение Господне
+15 фев	Сретение Господне
+Пасха-48	Великий Пост
+Пасха-7	Вход Господень в Иерусалим. Вербное Воскресенье
+Пасха-3	Великий Четверг
+Пасха-2	Страстная Пятница
+Пасха	Воскресение Христово
+Пасха+39	Вознесение
+Пасха+49	День Святой Троицы. Пятидесятница
+ 7 апр	Благовещение Пресвятой Богородицы
+ 7 июл	Рождество Иоанна Предтечи
+12 июл	День святых первоверховных апостолов Петра и Павла
+19 авг	Преображение Господне
+28 авг	Успение Пресвятой Богородицы
+11 сен	Усекновение главы Иоанна Предтечи
+
+#endif /* !_ru_RU_UTF_8_orthodox_ */
+
diff --git a/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.pagan b/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.pagan
new file mode 100644
index 0000000..144a649
--- /dev/null
+++ b/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.pagan
@@ -0,0 +1,42 @@
+/*
+ * Языческие праздники
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _ru_RU_UTF_8_pagan_
+#define _ru_RU_UTF_8_pagan_
+
+LANG=ru_RU.UTF-8
+Paskha=Пасха
+
+21 дек*	Зимнее солнцестояние
+25 дек	Коляда (сдвинутое зимнее солнцестояние)
+ 6 янв	День Кащея и Велеса
+24 фев	День Велеса
+29 фев	День Кащея
+ 1 мар	День Марены
+14 мар	Новый Год, Овсень малый
+Пасха-55	Масленица
+Пасха+7	Красная Горка
+Пасха+16	Радуница
+20 мар*	Весенние равноденствие
+ 7 апр	День Марены (сдвинутое весеннее равноденствие)
+ 6 май	День Дажьбога, Овсень большой
+22 май	Ярилин День
+15 июн	День Триглава
+21 июн*	Летнее солнцестояние
+ 1 июл	Русальная Неделя
+ 7 июл	Купала (сдвинутое летнее солнцестояние)
+27 июл	Отбор жертв Перуну, русалии
+ 2 авг	Перунов День
+21 авг	День Стрибога
+28 авг	Успение Златогорки
+14 сен	День Волха Змеевича
+22 сен*	Поворот к зиме (осеннее равноденствие)
+10 ноя	День Макоши
+21 ноя	День Сварога и Семаргла
+ 9 дек	День Дажьбога и Марены
+
+#endif /* !_ru_RU_UTF_8_pagan_ */
+
diff --git a/usr.bin/calendar/dates.c b/usr.bin/calendar/dates.c
index 989f29c..a5f5e9f 100644
--- a/usr.bin/calendar/dates.c
+++ b/usr.bin/calendar/dates.c
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -22,7 +22,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  */
 
 #include <sys/cdefs.h>
@@ -73,8 +73,8 @@ int	cumdaytab[][14] = {
 	{0, -1, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365},
 };
 /* 1-based month, individual */
-static int *mondays;
-int	mondaytab[][14] = {
+static int *monthdays;
+int	monthdaytab[][14] = {
 	{0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 30},
 	{0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 30},
 };
@@ -192,11 +192,11 @@ generatedates(struct tm *tp1, struct tm *tp2)
 		 * - Take all days from <m1 .. m2>
 		 * - Take the first days from m2
 		 */
-		mondays = mondaytab[isleap(y1)];
-		for (d = d1; d <= mondays[m1]; d++)
+		monthdays = monthdaytab[isleap(y1)];
+		for (d = d1; d <= monthdays[m1]; d++)
 			createdate(y1, m1, d);
 		for (m = m1 + 1; m < m2; m++)
-			for (d = 1; d <= mondays[m]; d++)
+			for (d = 1; d <= monthdays[m]; d++)
 				createdate(y1, m, d);
 		for (d = 1; d <= d2; d++)
 			createdate(y1, m2, d);
@@ -210,21 +210,21 @@ generatedates(struct tm *tp1, struct tm *tp2)
 	 * - Take all days from y2-[1 .. m2>
 	 * - Take the first days of y2-m2
 	 */
-	mondays = mondaytab[isleap(y1)];
-	for (d = d1; d <= mondays[m1]; d++)
+	monthdays = monthdaytab[isleap(y1)];
+	for (d = d1; d <= monthdays[m1]; d++)
 		createdate(y1, m1, d);
 	for (m = m1 + 1; m <= 12; m++)
-		for (d = 1; d <= mondays[m]; d++)
+		for (d = 1; d <= monthdays[m]; d++)
 			createdate(y1, m, d);
 	for (y = y1 + 1; y < y2; y++) {
-		mondays = mondaytab[isleap(y)];
+		monthdays = monthdaytab[isleap(y)];
 		for (m = 1; m <= 12; m++)
-			for (d = 1; d <= mondays[m]; d++)
+			for (d = 1; d <= monthdays[m]; d++)
 				createdate(y, m, d);
 	}
-	mondays = mondaytab[isleap(y2)];
+	monthdays = monthdaytab[isleap(y2)];
 	for (m = 1; m < m2; m++)
-		for (d = 1; d <= mondays[m]; d++)
+		for (d = 1; d <= monthdays[m]; d++)
 			createdate(y2, m, d);
 	for (d = 1; d <= d2; d++)
 		createdate(y2, m2, d);
@@ -360,12 +360,12 @@ first_dayofweek_of_month(int yy, int mm)
 				return (m->firstdayofweek);
 			m = m->nextmonth;
 		}
-		/* Should not happen */
+		/* No data for this month */
 		return (-1);
 	}
 
-	/* Should not happen */
-	return (-1);
+	/* No data for this year.  Error? */
+        return (-1);
 }
 
 int
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 1625717..2ea0865 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -273,7 +273,7 @@ opencal(void)
 			_exit(1);
 		}
 		execl(_PATH_CPP, "cpp", "-P",
-		    "-traditional", "-nostdinc",	/* GCC specific opts */
+		    "-traditional-cpp", "-nostdinc",	/* GCC specific opts */
 		    "-I.", "-I", _PATH_INCLUDE, (char *)NULL);
 		warn(_PATH_CPP);
 		_exit(1);
diff --git a/usr.bin/calendar/parsedata.c b/usr.bin/calendar/parsedata.c
index 4ece663..4586973 100644
--- a/usr.bin/calendar/parsedata.c
+++ b/usr.bin/calendar/parsedata.c
@@ -47,6 +47,7 @@ static int indextooffset(char *s);
 static int parseoffset(char *s);
 static char *floattoday(int year, double f);
 static char *floattotime(double f);
+static int wdayom (int day, int offset, int month, int year);
 
 /*
  * Expected styles:
@@ -184,7 +185,7 @@ determinestyle(char *date, int *flags,
 	}
 
 	/*
-	 * AFTER this, leave by goto-ing to "allfine" or "fail" to restore the
+	 * After this, leave by goto-ing to "allfine" or "fail" to restore the
 	 * original data in `date'.
 	 */
 	pold = *p;
@@ -203,15 +204,9 @@ determinestyle(char *date, int *flags,
 		*flags |= F_YEAR;
 	}
 
-	/*
-	printf("p1: %s\n", p1);
-	printf("p2: %s\n", p2);
-	printf("year: %s\n", year);
-	*/
-
 	/* Check if there is a month-string in the date */
 	if ((checkmonth(p1, &len, &offset, &pmonth) != 0)
-	 || (checkmonth(p2, &len, &offset, &pmonth) != 0 && (p2 = p1))) {
+	    || (checkmonth(p2, &len, &offset, &pmonth) != 0 && (p2 = p1))) {
 		/* p2 is the non-month part */
 		*flags |= F_MONTH;
 		*imonth = offset;
@@ -239,13 +234,12 @@ determinestyle(char *date, int *flags,
 			*flags |= F_MODIFIERINDEX;
 			goto allfine;
 		}
-
 		goto fail;
 	}
 
 	/* Check if there is an every-day or every-month in the string */
 	if ((strcmp(p1, "*") == 0 && isonlydigits(p2, 1))
-	 || (strcmp(p2, "*") == 0 && isonlydigits(p1, 1) && (p2 = p1))) {
+	    || (strcmp(p2, "*") == 0 && isonlydigits(p1, 1) && (p2 = p1))) {
 		int d;
 
 		*flags |= F_ALLMONTH;
@@ -258,7 +252,7 @@ determinestyle(char *date, int *flags,
 
 	/* Month as a number, then a weekday */
 	if (isonlydigits(p1, 1)
-	 && checkdayofweek(p2, &len, &offset, &dow) != 0) {
+	    && checkdayofweek(p2, &len, &offset, &dow) != 0) {
 		int d;
 
 		*flags |= F_MONTH;
@@ -316,7 +310,10 @@ allfine:
 
 }
 
-static void
+void
+remember(int *rememberindex, int *y, int *m, int *d, char **ed, int yy, int mm,
+    int dd, char *extra);
+void
 remember(int *rememberindex, int *y, int *m, int *d, char **ed, int yy, int mm,
     int dd, char *extra)
 {
@@ -367,16 +364,60 @@ debug_determinestyle(int dateonly, char *date, int flags, char *month,
 		printf("specialday: |%s|\n", specialday);
 }
 
-struct yearinfo {
+static struct yearinfo {
 	int year;
 	int ieaster, ipaskha, firstcnyday;
 	double ffullmoon[MAXMOONS], fnewmoon[MAXMOONS];
 	double ffullmooncny[MAXMOONS], fnewmooncny[MAXMOONS];
 	int ichinesemonths[MAXMOONS];
 	double equinoxdays[2], solsticedays[2];
-	int *mondays;
+	int *monthdays;
 	struct yearinfo *next;
-};
+} *years, *yearinfo;
+
+/*
+ * Calculate dates with offset from weekdays, like Thurs-3, Wed+2, etc.
+ * day is the day of the week,
+ * offset the ordinal number of the weekday in the month.
+ */
+static int
+wdayom (int day, int offset, int month, int year)
+{
+/* Weekday of first day in month */
+	int wday1;                                /* first day of month */
+/* Weekday of last day in month */
+	int wdayn;
+	int d;
+
+	wday1 = first_dayofweek_of_month(year, month);
+	if (wday1 < 0)                          /* not set */
+		return (wday1);
+	/*
+	 * Date of zeroth or first of our weekday in month, depending on the
+	 * relationship with the first of the month.  The range is -6:6.
+	 */
+	d = (day - wday1 + 1) % 7;
+	/*
+	 * Which way are we counting?  Offset 0 is invalid, abs (offset) > 5 is
+	 * meaningless, but that's OK.  Offset 5 may or may not be meaningless,
+	 * so there's no point in complaining for complaining's sake.
+	 */
+	if (offset < 0) {			/* back from end of month */
+						/* FIXME */
+		wdayn = d;
+		while (wdayn <= yearinfo->monthdays[month])
+			wdayn += 7;
+		d = offset * 7 + wdayn;
+	} else if (offset > 0){
+		if (d > 0)
+			d += offset * 7 - 7;
+		else
+			d += offset * 7;
+	} else
+		warnx ("Invalid offset 0");
+	return (d);
+}
+
 /*
  * Possible date formats include any combination of:
  *	3-charmonth			(January, Jan, Jan)
@@ -400,8 +441,6 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 	char *ed;
 	int retvalsign = 1;
 
-	static struct yearinfo *years, *yearinfo;
-
 	/*
 	 * CONVENTION
 	 *
@@ -419,8 +458,8 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 		    dayofmonth, idayofmonth, dayofweek, idayofweek,
 		    modifieroffset, modifierindex, specialday, syear, iyear);
 	if (determinestyle(date, flags, month, &imonth, dayofmonth,
-	    &idayofmonth, dayofweek, &idayofweek, modifieroffset,
-	    modifierindex, specialday, syear, &iyear) == 0) {
+		&idayofmonth, dayofweek, &idayofweek, modifieroffset,
+		modifierindex, specialday, syear, &iyear) == 0) {
 		if (debug)
 			printf("Failed!\n");
 		return (0);
@@ -457,7 +496,7 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 			yearinfo->next = years;
 			years = yearinfo;
 
-			yearinfo->mondays = mondaytab[isleap(year)];
+			yearinfo->monthdays = monthdaytab[isleap(year)];
 			yearinfo->ieaster = easter(year);
 			yearinfo->ipaskha = paskha(year);
 			fpom(year, UTCOffset, yearinfo->ffullmoon,
@@ -514,7 +553,7 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 
 		/* Every day of a month */
 		if (lflags == (F_ALLDAY | F_MONTH)) {
-			for (d = 1; d <= yearinfo->mondays[imonth]; d++) {
+			for (d = 1; d <= yearinfo->monthdays[imonth]; d++) {
 				if (!remember_ymd(year, imonth, d))
 					continue;
 				remember(&remindex, yearp, monthp, dayp, edp,
@@ -548,14 +587,15 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 			continue;
 		}
 
-		/* Every so-manied dayofweek of every month of the year */
+		/*
+	         * Every so-manied dayofweek of every month of the year:
+	         * Thu-3
+	         */
 		if (lflags == (F_DAYOFWEEK | F_MODIFIERINDEX | F_VARIABLE)) {
 			offset = indextooffset(modifierindex);
 
-			for (m = 0; m < 12; m++) {
-				dow = first_dayofweek_of_month(year, m);
-				d = (idayofweek - dow + 8) % 7;
-				d += (offset - 1) * 7;
+			for (m = 0; m <= 12; m++) {
+	                        d = wdayom (idayofweek, offset, m, year);
 				if (remember_ymd(year, m, d)) {
 					remember(&remindex,
 					    yearp, monthp, dayp, edp,
@@ -566,7 +606,10 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 			continue;
 		}
 
-		/* A certain dayofweek of a month */
+		/*
+	         * A certain dayofweek of a month
+	         * Jan/Thu-3
+	         */
 		if (lflags ==
 		    (F_MONTH | F_DAYOFWEEK | F_MODIFIERINDEX | F_VARIABLE)) {
 			offset = indextooffset(modifierindex);
@@ -574,9 +617,9 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 			d = (idayofweek - dow + 8) % 7;
 
 			if (offset > 0) {
-				while (d <= yearinfo->mondays[imonth]) {
+				while (d <= yearinfo->monthdays[imonth]) {
 					if (--offset == 0
-					 && remember_ymd(year, imonth, d)) {
+					    && remember_ymd(year, imonth, d)) {
 						remember(&remindex,
 						    yearp, monthp, dayp, edp,
 						    year, imonth, d, NULL);
@@ -587,7 +630,7 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 				continue;
 			}
 			if (offset < 0) {
-				while (d <= yearinfo->mondays[imonth])
+				while (d <= yearinfo->monthdays[imonth])
 					d += 7;
 				while (offset != 0) {
 					offset++;
@@ -606,7 +649,7 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 		if (lflags == (F_DAYOFWEEK | F_MONTH | F_VARIABLE)) {
 			dow = first_dayofweek_of_month(year, imonth);
 			d = (idayofweek - dow + 8) % 7;
-			while (d <= yearinfo->mondays[imonth]) {
+			while (d <= yearinfo->monthdays[imonth]) {
 				if (remember_ymd(year, imonth, d))
 					remember(&remindex,
 					    yearp, monthp, dayp, edp,
@@ -623,7 +666,7 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 			if ((lflags & F_MODIFIEROFFSET) != 0)
 				offset = parseoffset(modifieroffset);
 			if (remember_yd(year, yearinfo->ieaster + offset,
-			    &rm, &rd))
+	                        &rm, &rd))
 				remember(&remindex, yearp, monthp, dayp, edp,
 				    year, rm, rd, NULL);
 			continue;
@@ -636,7 +679,7 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 			if ((lflags & F_MODIFIEROFFSET) != 0)
 				offset = parseoffset(modifieroffset);
 			if (remember_yd(year, yearinfo->ipaskha + offset,
-			    &rm, &rd))
+	                        &rm, &rd))
 				remember(&remindex, yearp, monthp, dayp, edp,
 				    year, rm, rd, NULL);
 			continue;
@@ -649,7 +692,7 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 			if ((lflags & F_MODIFIEROFFSET) != 0)
 				offset = parseoffset(modifieroffset);
 			if (remember_yd(year, yearinfo->firstcnyday + offset,
-			    &rm, &rd))
+	                        &rm, &rd))
 				remember(&remindex, yearp, monthp, dayp, edp,
 				    year, rm, rd, NULL);
 			continue;
@@ -665,7 +708,7 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 				offset = parseoffset(modifieroffset);
 			for (i = 0; yearinfo->ffullmoon[i] > 0; i++) {
 				if (remember_yd(year,
-				    floor(yearinfo->ffullmoon[i]) + offset,
+	                                floor(yearinfo->ffullmoon[i]) + offset,
 					&rm, &rd)) {
 					ed = floattotime(
 					    yearinfo->ffullmoon[i]);
@@ -687,8 +730,8 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 				offset = parseoffset(modifieroffset);
 			for (i = 0; yearinfo->ffullmoon[i] > 0; i++) {
 				if (remember_yd(year,
-				    floor(yearinfo->fnewmoon[i]) + offset,
-				    &rm, &rd)) {
+					floor(yearinfo->fnewmoon[i]) + offset,
+					&rm, &rd)) {
 					ed = floattotime(yearinfo->fnewmoon[i]);
 					remember(&remindex,
 					    yearp, monthp, dayp, edp,
@@ -705,7 +748,7 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 			if ((lflags & F_MODIFIEROFFSET) != 0)
 				offset = parseoffset(modifieroffset);
 			if (remember_yd(year, yearinfo->equinoxdays[0] + offset,
-			    &rm, &rd)) {
+				&rm, &rd)) {
 				ed = floattotime(yearinfo->equinoxdays[0]);
 				remember(&remindex, yearp, monthp, dayp, edp,
 				    year, rm, rd, ed);
@@ -733,7 +776,7 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 			if ((lflags & F_MODIFIEROFFSET) != 0)
 				offset = parseoffset(modifieroffset);
 			if (remember_yd(year,
-			    yearinfo->solsticedays[0] + offset, &rm, &rd)) {
+				yearinfo->solsticedays[0] + offset, &rm, &rd)) {
 				ed = floattotime(yearinfo->solsticedays[0]);
 				remember(&remindex, yearp, monthp, dayp, edp,
 				    year, rm, rd, ed);
@@ -746,7 +789,7 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 			if ((lflags & F_MODIFIEROFFSET) != 0)
 				offset = parseoffset(modifieroffset);
 			if (remember_yd(year,
-			    yearinfo->solsticedays[1] + offset, &rm, &rd)) {
+				yearinfo->solsticedays[1] + offset, &rm, &rd)) {
 				ed = floattotime(yearinfo->solsticedays[1]);
 				remember(&remindex, yearp, monthp, dayp, edp,
 				    year, rm, rd, ed);
@@ -755,11 +798,11 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
 		}
 
 		if (debug) {
-		    printf("Unprocessed:\n");
-		    debug_determinestyle(2, date, lflags, month, imonth,
-			dayofmonth, idayofmonth, dayofweek, idayofweek,
-			modifieroffset, modifierindex, specialday, syear,
-			iyear);
+			printf("Unprocessed:\n");
+			debug_determinestyle(2, date, lflags, month, imonth,
+			    dayofmonth, idayofmonth, dayofweek, idayofweek,
+			    modifieroffset, modifierindex, specialday, syear,
+			    iyear);
 		}
 		retvalsign = -1;
 	}
@@ -972,7 +1015,6 @@ indextooffset(char *s)
 static int
 parseoffset(char *s)
 {
-
 	return strtol(s, NULL, 10);
 }
 
diff --git a/usr.bin/calendar/pathnames.h b/usr.bin/calendar/pathnames.h
index ea76948..a46913c 100644
--- a/usr.bin/calendar/pathnames.h
+++ b/usr.bin/calendar/pathnames.h
@@ -32,5 +32,5 @@
 
 #include <paths.h>
 
-#define	_PATH_CPP	"/usr/bin/cpp"
+#define	_PATH_CPP	"/usr/bin/gcpp"
 #define	_PATH_INCLUDE	"/usr/share/calendar"
diff --git a/usr.bin/calendar/sunpos.c b/usr.bin/calendar/sunpos.c
index 72b8f5c..f905c3f 100644
--- a/usr.bin/calendar/sunpos.c
+++ b/usr.bin/calendar/sunpos.c
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -22,7 +22,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  */
 
 #include <sys/cdefs.h>
@@ -373,7 +373,7 @@ calculatesunlongitude30(int year, int degreeGMToffset, int *ichinesemonths)
 	int firstmonth330 = -1;
 
 	cumdays = cumdaytab[isleap(year)];
-	monthdays = mondaytab[isleap(year)];
+	monthdays = monthdaytab[isleap(year)];
 	pichinesemonths = ichinesemonths;
 
 	h = 0;
diff --git a/usr.bin/clang/bugpoint/Makefile b/usr.bin/clang/bugpoint/Makefile
index a40d1e6..6599b03 100644
--- a/usr.bin/clang/bugpoint/Makefile
+++ b/usr.bin/clang/bugpoint/Makefile
@@ -16,11 +16,12 @@ SRCS=	BugDriver.cpp \
 	bugpoint.cpp
 
 TGHDRS=	Intrinsics
-LIBDEPS=llvmbitwriter \
-	llvmlinker \
-	llvmarchive \
+LIBDEPS=llvmirreader \
+	llvmbitwriter \
 	llvmbitreader \
+	llvmlinker \
 	llvmipo \
+	llvmobjcarcopts \
 	llvmvectorize \
 	llvmscalaropts \
 	llvminstcombine \
diff --git a/usr.bin/clang/bugpoint/bugpoint.1 b/usr.bin/clang/bugpoint/bugpoint.1
index 0e119a4..4a180f4 100644
--- a/usr.bin/clang/bugpoint/bugpoint.1
+++ b/usr.bin/clang/bugpoint/bugpoint.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "BUGPOINT" "1" "2012-08-16" "3.2" "LLVM"
+.TH "BUGPOINT" "1" "2013-04-11" "3.3" "LLVM"
 .SH NAME
 bugpoint \- automatic test case reduction tool
 .
@@ -66,37 +66,45 @@ code is considered a test failure. Defaults to false.
 \fB\-\-args\fP \fIprogram args\fP
 .INDENT 0.0
 .INDENT 3.5
-Pass all arguments specified after \-args to the test program whenever it runs.
-Note that if any of the \fIprogram args\fP start with a \(aq\-\(aq, you should use:
+Pass all arguments specified after \fB\-\-args\fP to the test program whenever it runs.
+Note that if any of the \fIprogram args\fP start with a "\fB\-\fP", you should use:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
 bugpoint [bugpoint args] \-\-args \-\- [program args]
 .ft P
 .fi
+.UNINDENT
+.UNINDENT
 .sp
-The "\-\-" right after the \fB\-\-args\fP option tells \fBbugpoint\fP to consider any
-options starting with \fB\-\fP to be part of the \fB\-\-args\fP option, not as options to
-\fBbugpoint\fP itself.
+The "\fB\-\-\fP" right after the \fB\-\-args\fP option tells \fBbugpoint\fP to consider
+any options starting with "\fB\-\fP" to be part of the \fB\-\-args\fP option, not as
+options to \fBbugpoint\fP itself.
 .UNINDENT
 .UNINDENT
 .sp
 \fB\-\-tool\-args\fP \fItool args\fP
 .INDENT 0.0
 .INDENT 3.5
-Pass all arguments specified after \-\-tool\-args to the LLVM tool under test
+Pass all arguments specified after \fB\-\-tool\-args\fP to the LLVM tool under test
 (\fBllc\fP, \fBlli\fP, etc.) whenever it runs.  You should use this option in the
 following way:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
 bugpoint [bugpoint args] \-\-tool\-args \-\- [tool args]
 .ft P
 .fi
+.UNINDENT
+.UNINDENT
 .sp
-The "\-\-" right after the \fB\-\-tool\-args\fP option tells \fBbugpoint\fP to consider any
-options starting with \fB\-\fP to be part of the \fB\-\-tool\-args\fP option, not as
-options to \fBbugpoint\fP itself. (See \fB\-\-args\fP, above.)
+The "\fB\-\-\fP" right after the \fB\-\-tool\-args\fP option tells \fBbugpoint\fP to
+consider any options starting with "\fB\-\fP" to be part of the \fB\-\-tool\-args\fP
+option, not as options to \fBbugpoint\fP itself. (See \fB\-\-args\fP, above.)
 .UNINDENT
 .UNINDENT
 .sp
@@ -172,6 +180,8 @@ Load the dynamic object \fIplugin\fP into \fBbugpoint\fP itself.  This object sh
 register new optimization passes.  Once loaded, the object will add new command
 line options to enable various optimizations.  To see the new complete list of
 optimizations, use the \fB\-help\fP and \fB\-\-load\fP options together; for example:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
@@ -180,6 +190,8 @@ bugpoint \-\-load myNewPass.so \-help
 .fi
 .UNINDENT
 .UNINDENT
+.UNINDENT
+.UNINDENT
 .sp
 \fB\-\-mlimit\fP \fImegabytes\fP
 .INDENT 0.0
@@ -247,6 +259,8 @@ option to compile the bitcode testcase. This can be useful for
 testing compiler output without running any link or execute stages. To
 generate a reduced unit test, you may add CHECK directives to the
 testcase and pass the name of an executable compile\-command script in this form:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
@@ -255,6 +269,8 @@ llc "$@"
 not FileCheck [bugpoint input file].ll < bugpoint\-test\-program.s
 .ft P
 .fi
+.UNINDENT
+.UNINDENT
 .sp
 This script will "fail" as long as FileCheck passes. So the result
 will be the minimum bitcode that passes FileCheck.
@@ -279,6 +295,6 @@ opt|opt
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/clang/clang-tblgen/Makefile b/usr.bin/clang/clang-tblgen/Makefile
index b777f07..5cfa83d 100644
--- a/usr.bin/clang/clang-tblgen/Makefile
+++ b/usr.bin/clang/clang-tblgen/Makefile
@@ -9,13 +9,13 @@ SRCDIR=	tools/clang/utils/TableGen
 SRCS=	ClangASTNodesEmitter.cpp \
 	ClangAttrEmitter.cpp \
 	ClangCommentCommandInfoEmitter.cpp \
+	ClangCommentHTMLNamedCharacterReferenceEmitter.cpp \
 	ClangCommentHTMLTagsEmitter.cpp \
 	ClangDiagnosticsEmitter.cpp \
 	ClangSACheckersEmitter.cpp \
 	NeonEmitter.cpp \
 	OptParserEmitter.cpp \
 	TableGen.cpp
-LLVM_REQUIRES_EH=
 
 LIBDEPS=llvmtablegen \
 	llvmsupport
diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile
index 18a768b..27c2cf1 100644
--- a/usr.bin/clang/clang/Makefile
+++ b/usr.bin/clang/clang/Makefile
@@ -56,15 +56,15 @@ LIBDEPS=clangfrontendtool \
 	clangparse \
 	clangsema \
 	${_clangstaticanalyzer} \
-	clanganalysis \
 	${_clangarcmigrate} \
 	${_clangrewriter} \
+	clanganalysis \
 	clangedit \
 	clangast \
-	clanglex \
 	clangbasic \
+	clanglex \
 	llvmlinker \
-	llvmarchive \
+	llvmirreader \
 	llvmipo \
 	llvmvectorize \
 	llvminstrumentation \
@@ -72,33 +72,34 @@ LIBDEPS=clangfrontendtool \
 	llvmbitreader \
 	llvmasmparser \
 	llvmarmdisassembler \
-	llvmarmasmparser \
 	llvmarmcodegen \
+	llvmarmasmparser \
 	llvmarmdesc \
 	llvmarminfo \
 	llvmarminstprinter \
-	llvmmipsasmparser \
+	llvmmipsdisassembler \
 	llvmmipscodegen \
+	llvmmipsasmparser \
 	llvmmipsdesc \
-	llvmmipsinstprinter \
-	llvmmipsdisassembler \
 	llvmmipsinfo \
+	llvmmipsinstprinter \
 	llvmpowerpccodegen \
 	llvmpowerpcdesc \
 	llvmpowerpcinfo \
 	llvmpowerpcinstprinter \
+	llvmx86disassembler \
 	llvmx86asmparser \
 	llvmx86codegen \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmmcparser \
 	llvmcodegen \
+	llvmobjcarcopts \
 	llvmscalaropts \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmx86disassembler \
 	llvmx86desc \
 	llvmx86info \
 	llvmtarget \
diff --git a/usr.bin/clang/clang/clang.1 b/usr.bin/clang/clang/clang.1
index 1a37c6d..3f0689f 100644
--- a/usr.bin/clang/clang/clang.1
+++ b/usr.bin/clang/clang/clang.1
@@ -125,7 +125,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CLANG 1"
-.TH CLANG 1 "2012-12-21" "clang 3.2" "Clang Tools Documentation"
+.TH CLANG 1 "2013-06-10" "clang 3.3" "Clang Tools Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -135,7 +135,7 @@ clang \- the Clang C, C++, and Objective\-C compiler
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 \&\fBclang\fR [\fB\-c\fR|\fB\-S\fR|\fB\-E\fR] \fB\-std=\fR\fIstandard\fR \fB\-g\fR
-  [\fB\-O0\fR|\fB\-O1\fR|\fB\-O2\fR|\fB\-Os\fR|\fB\-Oz\fR|\fB\-O3\fR|\fB\-O4\fR]
+  [\fB\-O0\fR|\fB\-O1\fR|\fB\-O2\fR|\fB\-Os\fR|\fB\-Oz\fR|\fB\-O3\fR|\fB\-Ofast\fR|\fB\-O4\fR]
   \fB\-W\fR\fIwarnings...\fR \fB\-pedantic\fR
   \fB\-I\fR\fIdir...\fR \fB\-L\fR\fIdir...\fR
   \fB\-D\fR\fImacro[=defn]\fR
@@ -325,15 +325,17 @@ generate instructions that are valid on i486 and later processors, but which
 may not exist on earlier ones.
 .SS "Code Generation Options"
 .IX Subsection "Code Generation Options"
-.IP "\fB\-O0\fR \fB\-O1\fR \fB\-O2\fR \fB\-Os\fR \fB\-Oz\fR \fB\-O3\fR \fB\-O4\fR" 4
-.IX Item "-O0 -O1 -O2 -Os -Oz -O3 -O4"
+.IP "\fB\-O0\fR \fB\-O1\fR \fB\-O2\fR \fB\-Os\fR \fB\-Oz\fR \fB\-O3\fR \fB\-Ofast\fR \fB\-O4\fR" 4
+.IX Item "-O0 -O1 -O2 -Os -Oz -O3 -Ofast -O4"
 Specify which optimization level to use.  \fB\-O0\fR means \*(L"no optimization\*(R": this
 level compiles the fastest and generates the most debuggable code.  \fB\-O2\fR is a
 moderate level of optimization which enables most optimizations.  \fB\-Os\fR is like
 \&\fB\-O2\fR with extra optimizations to reduce code size.  \fB\-Oz\fR is like \fB\-Os\fR 
 (and thus \fB\-O2\fR), but reduces code size further.  \fB\-O3\fR is like \fB\-O2\fR,
 except that it enables optimizations that take longer to perform or that may
-generate larger code (in an attempt to make the program run faster).  On
+generate larger code (in an attempt to make the program run faster).
+\&\fB\-Ofast\fR enables all the optimizations from \fB\-O3\fR along with other aggressive
+optimizations that may violate strict compliance with language standards. On
 supported platforms, \fB\-O4\fR enables link-time optimization; object files are
 stored in the \s-1LLVM\s0 bitcode file format and whole program optimization is done at
 link time. \fB\-O1\fR is somewhere between \fB\-O0\fR and \fB\-O2\fR.
diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile
index 7be4309..e75dd81 100644
--- a/usr.bin/clang/llc/Makefile
+++ b/usr.bin/clang/llc/Makefile
@@ -7,36 +7,38 @@ PROG_CXX=llc
 SRCDIR=	tools/llc
 SRCS=	llc.cpp
 
-LIBDEPS=llvmasmparser \
+LIBDEPS=llvmirreader \
+	llvmasmparser \
 	llvmbitreader \
 	llvmarmdisassembler \
-	llvmarmasmparser \
 	llvmarmcodegen \
+	llvmarmasmparser \
 	llvmarmdesc \
 	llvmarminfo \
 	llvmarminstprinter \
-	llvmmipsasmparser \
+	llvmmipsdisassembler \
 	llvmmipscodegen \
+	llvmmipsasmparser \
 	llvmmipsdesc \
-	llvmmipsinstprinter \
-	llvmmipsdisassembler \
 	llvmmipsinfo \
+	llvmmipsinstprinter \
 	llvmpowerpccodegen \
 	llvmpowerpcdesc \
 	llvmpowerpcinfo \
 	llvmpowerpcinstprinter \
+	llvmx86disassembler \
 	llvmx86asmparser \
 	llvmx86codegen \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmmcparser \
 	llvmcodegen \
+	llvmobjcarcopts \
 	llvmscalaropts \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmx86disassembler \
 	llvmx86desc \
 	llvmx86info \
 	llvmtarget \
diff --git a/usr.bin/clang/llc/llc.1 b/usr.bin/clang/llc/llc.1
index b7862db..e231f21 100644
--- a/usr.bin/clang/llc/llc.1
+++ b/usr.bin/clang/llc/llc.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "LLC" "1" "2012-08-16" "3.2" "LLVM"
+.TH "LLC" "1" "2013-06-10" "3.3" "LLVM"
 .SH NAME
 llc \- LLVM static compiler
 .
@@ -36,241 +36,230 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 \fBllc\fP [\fIoptions\fP] [\fIfilename\fP]
 .SH DESCRIPTION
 .sp
-The \fBllc\fP command compiles LLVM source inputs into assembly language for a
-specified architecture.  The assembly language output can then be passed through
-a native assembler and linker to generate a native executable.
+The \fBllc\fP command compiles LLVM source inputs into assembly language
+for a specified architecture.  The assembly language output can then be passed
+through a native assembler and linker to generate a native executable.
 .sp
 The choice of architecture for the output assembly code is automatically
-determined from the input file, unless the \fB\-march\fP option is used to override
-the default.
+determined from the input file, unless the \fI\%-march\fP option is used to
+override the default.
 .SH OPTIONS
 .sp
-If \fIfilename\fP is \- or omitted, \fBllc\fP reads from standard input.  Otherwise, it
-will from \fIfilename\fP.  Inputs can be in either the LLVM assembly language
-format (.ll) or the LLVM bitcode format (.bc).
+If \fBfilename\fP is "\fB\-\fP" or omitted, \fBllc\fP reads from standard input.
+Otherwise, it will from \fBfilename\fP.  Inputs can be in either the LLVM assembly
+language format (\fB.ll\fP) or the LLVM bitcode format (\fB.bc\fP).
 .sp
-If the \fB\-o\fP option is omitted, then \fBllc\fP will send its output to standard
-output if the input is from standard input.  If the \fB\-o\fP option specifies \-,
-then the output will also be sent to standard output.
+If the \fI\-o\fP option is omitted, then \fBllc\fP will send its output
+to standard output if the input is from standard input.  If the \fI\-o\fP
+option specifies "\fB\-\fP", then the output will also be sent to standard output.
 .sp
-If no \fB\-o\fP option is specified and an input file other than \- is specified,
-then \fBllc\fP creates the output filename by taking the input filename,
-removing any existing \fI.bc\fP extension, and adding a \fI.s\fP suffix.
+If no \fI\-o\fP option is specified and an input file other than "\fB\-\fP" is
+specified, then \fBllc\fP creates the output filename by taking the input
+filename, removing any existing \fB.bc\fP extension, and adding a \fB.s\fP suffix.
 .sp
-Other \fBllc\fP options are as follows:
+Other \fBllc\fP options are described below.
 .SS End\-user Options
-.sp
-\fB\-help\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-help
 Print a summary of command line options.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-O\fP=\fIuint\fP
 .INDENT 0.0
-.INDENT 3.5
-Generate code at different optimization levels. These correspond to the \fI\-O0\fP,
-\fI\-O1\fP, \fI\-O2\fP, and \fI\-O3\fP optimization levels used by \fBllvm\-gcc\fP and
-\fBclang\fP.
+.TP
+.B \-O=uint
+Generate code at different optimization levels.  These correspond to the
+\fB\-O0\fP, \fB\-O1\fP, \fB\-O2\fP, and \fB\-O3\fP optimization levels used by
+\fBllvm\-gcc\fP and \fBclang\fP.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-mtriple\fP=\fItarget triple\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-mtriple=<target triple>
 Override the target triple specified in the input file with the specified
 string.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-march\fP=\fIarch\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-march=<arch>
 Specify the architecture for which to generate assembly, overriding the target
 encoded in the input file.  See the output of \fBllc \-help\fP for a list of
 valid architectures.  By default this is inferred from the target triple or
 autodetected to the current architecture.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-mcpu\fP=\fIcpuname\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-mcpu=<cpuname>
 Specify a specific chip in the current architecture to generate code for.
 By default this is inferred from the target triple and autodetected to
 the current architecture.  For a list of available CPUs, use:
-\fBllvm\-as < /dev/null | llc \-march=xyz \-mcpu=help\fP
+.INDENT 7.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+llvm\-as < /dev/null | llc \-march=xyz \-mcpu=help
+.ft P
+.fi
+.UNINDENT
 .UNINDENT
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-filetype=<output file type>
+Specify what kind of output \fBllc\fP should generated.  Options are: \fBasm\fP
+for textual assembly ( \fB\(aq.s\(aq\fP), \fBobj\fP for native object files (\fB\(aq.o\(aq\fP)
+and \fBnull\fP for not emitting anything (for performance testing).
 .sp
-\fB\-mattr\fP=\fIa1,+a2,\-a3,...\fP
+Note that not all targets support all options.
+.UNINDENT
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-mattr=a1,+a2,\-a3,...
 Override or control specific attributes of the target, such as whether SIMD
 operations are enabled or not.  The default set of attributes is set by the
 current CPU.  For a list of available attributes, use:
-\fBllvm\-as < /dev/null | llc \-march=xyz \-mattr=help\fP
+.INDENT 7.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+llvm\-as < /dev/null | llc \-march=xyz \-mattr=help
+.ft P
+.fi
+.UNINDENT
 .UNINDENT
 .UNINDENT
-.sp
-\fB\-\-disable\-fp\-elim\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-\-disable\-fp\-elim
 Disable frame pointer elimination optimization.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-\-disable\-excess\-fp\-precision\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-\-disable\-excess\-fp\-precision
 Disable optimizations that may produce excess precision for floating point.
 Note that this option can dramatically slow down code on some systems
 (e.g. X86).
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-\-enable\-no\-infs\-fp\-math\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-\-enable\-no\-infs\-fp\-math
 Enable optimizations that assume no Inf values.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-\-enable\-no\-nans\-fp\-math\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-\-enable\-no\-nans\-fp\-math
 Enable optimizations that assume no NAN values.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-\-enable\-unsafe\-fp\-math\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-\-enable\-unsafe\-fp\-math
 Enable optimizations that make unsafe assumptions about IEEE math (e.g. that
 addition is associative) or may not work for all input ranges.  These
 optimizations allow the code generator to make use of some instructions which
-would otherwise not be usable (such as fsin on X86).
+would otherwise not be usable (such as \fBfsin\fP on X86).
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-\-enable\-correct\-eh\-support\fP
 .INDENT 0.0
-.INDENT 3.5
-Instruct the \fBlowerinvoke\fP pass to insert code for correct exception handling
-support.  This is expensive and is by default omitted for efficiency.
-.UNINDENT
+.TP
+.B \-\-enable\-correct\-eh\-support
+Instruct the \fBlowerinvoke\fP pass to insert code for correct exception
+handling support.  This is expensive and is by default omitted for efficiency.
 .UNINDENT
-.sp
-\fB\-\-stats\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-\-stats
 Print statistics recorded by code\-generation passes.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-\-time\-passes\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-\-time\-passes
 Record the amount of time needed for each pass and print a report to standard
 error.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-\-load\fP=\fIdso_path\fP
 .INDENT 0.0
-.INDENT 3.5
-Dynamically load \fIdso_path\fP (a path to a dynamically shared object) that
-implements an LLVM target. This will permit the target name to be used with the
-\fB\-march\fP option so that code can be generated for that target.
-.UNINDENT
+.TP
+.B \-\-load=<dso_path>
+Dynamically load \fBdso_path\fP (a path to a dynamically shared object) that
+implements an LLVM target.  This will permit the target name to be used with
+the \fI\%-march\fP option so that code can be generated for that target.
 .UNINDENT
 .SS Tuning/Configuration Options
-.sp
-\fB\-\-print\-machineinstrs\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-\-print\-machineinstrs
 Print generated machine code between compilation phases (useful for debugging).
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-\-regalloc\fP=\fIallocator\fP
 .INDENT 0.0
-.INDENT 3.5
-Specify the register allocator to use. The default \fIallocator\fP is \fIlocal\fP.
+.TP
+.B \-\-regalloc=<allocator>
+Specify the register allocator to use.  The default \fBallocator\fP is \fIlocal\fP.
 Valid register allocators are:
 .sp
 \fIsimple\fP
-.INDENT 0.0
+.INDENT 7.0
 .INDENT 3.5
 Very simple "always spill" register allocator
 .UNINDENT
 .UNINDENT
 .sp
 \fIlocal\fP
-.INDENT 0.0
+.INDENT 7.0
 .INDENT 3.5
 Local register allocator
 .UNINDENT
 .UNINDENT
 .sp
 \fIlinearscan\fP
-.INDENT 0.0
+.INDENT 7.0
 .INDENT 3.5
 Linear scan global register allocator
 .UNINDENT
 .UNINDENT
 .sp
 \fIiterativescan\fP
-.INDENT 0.0
+.INDENT 7.0
 .INDENT 3.5
 Iterative scan global register allocator
 .UNINDENT
 .UNINDENT
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-\-spiller\fP=\fIspiller\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-\-spiller=<spiller>
 Specify the spiller to use for register allocators that support it.  Currently
-this option is used only by the linear scan register allocator. The default
-\fIspiller\fP is \fIlocal\fP.  Valid spillers are:
+this option is used only by the linear scan register allocator.  The default
+\fBspiller\fP is \fIlocal\fP.  Valid spillers are:
 .sp
 \fIsimple\fP
-.INDENT 0.0
+.INDENT 7.0
 .INDENT 3.5
 Simple spiller
 .UNINDENT
 .UNINDENT
 .sp
 \fIlocal\fP
-.INDENT 0.0
+.INDENT 7.0
 .INDENT 3.5
 Local spiller
 .UNINDENT
 .UNINDENT
 .UNINDENT
-.UNINDENT
 .SS Intel IA\-32\-specific Options
-.sp
-\fB\-\-x86\-asm\-syntax=att|intel\fP
 .INDENT 0.0
-.INDENT 3.5
-Specify whether to emit assembly code in AT&T syntax (the default) or intel
+.TP
+.B \-\-x86\-asm\-syntax=[att|intel]
+Specify whether to emit assembly code in AT&T syntax (the default) or Intel
 syntax.
 .UNINDENT
-.UNINDENT
 .SH EXIT STATUS
 .sp
-If \fBllc\fP succeeds, it will exit with 0.  Otherwise, if an error occurs,
-it will exit with a non\-zero value.
+If \fBllc\fP succeeds, it will exit with 0.  Otherwise, if an error
+occurs, it will exit with a non\-zero value.
 .SH SEE ALSO
 .sp
-lli|lli
+lli
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/clang/lli/Makefile b/usr.bin/clang/lli/Makefile
index 4c56961..1916fb0 100644
--- a/usr.bin/clang/lli/Makefile
+++ b/usr.bin/clang/lli/Makefile
@@ -9,8 +9,9 @@ SRCS=	lli.cpp \
 	RecordingMemoryManager.cpp \
 	RemoteTarget.cpp
 
-LIBDEPS=llvmx86asmparser \
-	llvmx86disassembler \
+LIBDEPS=llvmx86disassembler \
+	llvmx86asmparser \
+	llvmirreader \
 	llvmasmparser \
 	llvmbitreader \
 	llvmx86codegen \
@@ -22,14 +23,15 @@ LIBDEPS=llvmx86asmparser \
 	llvmasmprinter \
 	llvmmcparser \
 	llvminterpreter \
+	llvmmcjit \
 	llvmjit \
 	llvmcodegen \
+	llvmobjcarcopts \
 	llvmscalaropts \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmmcjit \
 	llvmruntimedyld \
 	llvmexecutionengine \
 	llvmtarget \
diff --git a/usr.bin/clang/lli/lli.1 b/usr.bin/clang/lli/lli.1
index e018a95..16b8374 100644
--- a/usr.bin/clang/lli/lli.1
+++ b/usr.bin/clang/lli/lli.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "LLI" "1" "2012-08-16" "3.2" "LLVM"
+.TH "LLI" "1" "2013-04-11" "3.3" "LLVM"
 .SH NAME
 lli \- directly execute programs from LLVM bitcode
 .
@@ -71,7 +71,7 @@ Print a summary of command line options.
 .UNINDENT
 .UNINDENT
 .sp
-\fB\-load\fP=\fIpuginfilename\fP
+\fB\-load\fP=\fIpluginfilename\fP
 .INDENT 0.0
 .INDENT 3.5
 Causes \fBlli\fP to load the plugin (shared object) named \fIpluginfilename\fP and use
@@ -185,6 +185,8 @@ equivalent hardware instructions.
 .INDENT 0.0
 .INDENT 3.5
 Choose the code model from:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
@@ -197,6 +199,8 @@ large: Large code model
 .fi
 .UNINDENT
 .UNINDENT
+.UNINDENT
+.UNINDENT
 .sp
 \fB\-disable\-post\-RA\-scheduler\fP
 .INDENT 0.0
@@ -239,6 +243,8 @@ Coalesce copies (default=true).
 .INDENT 0.0
 .INDENT 3.5
 Instruction schedulers available (before register allocation):
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
@@ -253,11 +259,15 @@ Instruction schedulers available (before register allocation):
 .fi
 .UNINDENT
 .UNINDENT
+.UNINDENT
+.UNINDENT
 .sp
 \fB\-regalloc\fP=\fIallocator\fP
 .INDENT 0.0
 .INDENT 3.5
 Register allocator to use (default=linearscan)
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
@@ -268,11 +278,15 @@ Register allocator to use (default=linearscan)
 .fi
 .UNINDENT
 .UNINDENT
+.UNINDENT
+.UNINDENT
 .sp
 \fB\-relocation\-model\fP=\fImodel\fP
 .INDENT 0.0
 .INDENT 3.5
 Choose relocation model from:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
@@ -283,11 +297,15 @@ Choose relocation model from:
 .fi
 .UNINDENT
 .UNINDENT
+.UNINDENT
+.UNINDENT
 .sp
 \fB\-spiller\fP
 .INDENT 0.0
 .INDENT 3.5
 Spiller to use (default=local)
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
@@ -297,11 +315,15 @@ Spiller to use (default=local)
 .fi
 .UNINDENT
 .UNINDENT
+.UNINDENT
+.UNINDENT
 .sp
 \fB\-x86\-asm\-syntax\fP=\fIsyntax\fP
 .INDENT 0.0
 .INDENT 3.5
 Choose style of code to emit from X86 backend:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
@@ -311,6 +333,8 @@ Choose style of code to emit from X86 backend:
 .fi
 .UNINDENT
 .UNINDENT
+.UNINDENT
+.UNINDENT
 .SH EXIT STATUS
 .sp
 If \fBlli\fP fails to load the program, it will exit with an exit code of 1.
@@ -321,6 +345,6 @@ llc|llc
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile
index b7a4a13..592be46 100644
--- a/usr.bin/clang/llvm-ar/Makefile
+++ b/usr.bin/clang/llvm-ar/Makefile
@@ -6,7 +6,6 @@ PROG_CXX=llvm-ar
 
 SRCDIR=	tools/llvm-ar
 SRCS=	llvm-ar.cpp
-LLVM_REQUIRES_EH=
 
 LIBDEPS=llvmarchive \
 	llvmbitreader \
diff --git a/usr.bin/clang/llvm-ar/llvm-ar.1 b/usr.bin/clang/llvm-ar/llvm-ar.1
index 84a978f..b920cf5 100644
--- a/usr.bin/clang/llvm-ar/llvm-ar.1
+++ b/usr.bin/clang/llvm-ar/llvm-ar.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "LLVM-AR" "1" "2012-08-16" "3.2" "LLVM"
+.TH "LLVM-AR" "1" "2013-04-11" "3.3" "LLVM"
 .SH NAME
 llvm-ar \- LLVM archiver
 .
@@ -479,6 +479,6 @@ llvm\-ranlib|llvm\-ranlib, ar(1)
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/clang/llvm-as/Makefile b/usr.bin/clang/llvm-as/Makefile
index 6d3fd8e..d3d0732 100644
--- a/usr.bin/clang/llvm-as/Makefile
+++ b/usr.bin/clang/llvm-as/Makefile
@@ -6,7 +6,6 @@ PROG_CXX=llvm-as
 
 SRCDIR=	tools/llvm-as
 SRCS=	llvm-as.cpp
-LLVM_REQUIRES_EH=
 
 LIBDEPS=llvmbitwriter \
 	llvmasmparser \
diff --git a/usr.bin/clang/llvm-as/llvm-as.1 b/usr.bin/clang/llvm-as/llvm-as.1
index 82e13bc..79e6e39 100644
--- a/usr.bin/clang/llvm-as/llvm-as.1
+++ b/usr.bin/clang/llvm-as/llvm-as.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "LLVM-AS" "1" "2012-08-16" "3.2" "LLVM"
+.TH "LLVM-AS" "1" "2013-04-11" "3.3" "LLVM"
 .SH NAME
 llvm-as \- LLVM assembler
 .
@@ -82,6 +82,6 @@ llvm\-dis|llvm\-dis, gccas|gccas
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/clang/llvm-bcanalyzer/Makefile b/usr.bin/clang/llvm-bcanalyzer/Makefile
index 88032cf..54446dc 100644
--- a/usr.bin/clang/llvm-bcanalyzer/Makefile
+++ b/usr.bin/clang/llvm-bcanalyzer/Makefile
@@ -6,7 +6,6 @@ PROG_CXX=llvm-bcanalyzer
 
 SRCDIR=	tools/llvm-bcanalyzer
 SRCS=	llvm-bcanalyzer.cpp
-LLVM_REQUIRES_EH=
 
 LIBDEPS=llvmbitreader \
 	llvmcore \
diff --git a/usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1 b/usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1
index 8611eec..572d91b 100644
--- a/usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1
+++ b/usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "LLVM-BCANALYZER" "1" "2012-08-16" "3.2" "LLVM"
+.TH "LLVM-BCANALYZER" "1" "2013-04-11" "3.3" "LLVM"
 .SH NAME
 llvm-bcanalyzer \- LLVM bitcode analyzer
 .
@@ -36,58 +36,51 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 \fBllvm\-bcanalyzer\fP [\fIoptions\fP] [\fIfilename\fP]
 .SH DESCRIPTION
 .sp
-The \fBllvm\-bcanalyzer\fP command is a small utility for analyzing bitcode files.
-The tool reads a bitcode file (such as generated with the \fBllvm\-as\fP tool) and
-produces a statistical report on the contents of the bitcode file.  The tool
-can also dump a low level but human readable version of the bitcode file.
-This tool is probably not of much interest or utility except for those working
-directly with the bitcode file format. Most LLVM users can just ignore
-this tool.
-.sp
-If \fIfilename\fP is omitted or is \fB\-\fP, then \fBllvm\-bcanalyzer\fP reads its input
-from standard input. This is useful for combining the tool into a pipeline.
-Output is written to the standard output.
+The \fBllvm\-bcanalyzer\fP command is a small utility for analyzing bitcode
+files.  The tool reads a bitcode file (such as generated with the
+\fBllvm\-as\fP tool) and produces a statistical report on the contents of
+the bitcode file.  The tool can also dump a low level but human readable
+version of the bitcode file.  This tool is probably not of much interest or
+utility except for those working directly with the bitcode file format.  Most
+LLVM users can just ignore this tool.
+.sp
+If \fIfilename\fP is omitted or is \fB\-\fP, then \fBllvm\-bcanalyzer\fP reads its
+input from standard input.  This is useful for combining the tool into a
+pipeline.  Output is written to the standard output.
 .SH OPTIONS
-.sp
-\fB\-nodetails\fP
 .INDENT 0.0
-.INDENT 3.5
-Causes \fBllvm\-bcanalyzer\fP to abbreviate its output by writing out only a module
-level summary. The details for individual functions are not displayed.
-.UNINDENT
+.TP
+.B \-nodetails
+Causes \fBllvm\-bcanalyzer\fP to abbreviate its output by writing out only
+a module level summary.  The details for individual functions are not
+displayed.
 .UNINDENT
-.sp
-\fB\-dump\fP
 .INDENT 0.0
-.INDENT 3.5
-Causes \fBllvm\-bcanalyzer\fP to dump the bitcode in a human readable format. This
-format is significantly different from LLVM assembly and provides details about
-the encoding of the bitcode file.
-.UNINDENT
+.TP
+.B \-dump
+Causes \fBllvm\-bcanalyzer\fP to dump the bitcode in a human readable
+format.  This format is significantly different from LLVM assembly and
+provides details about the encoding of the bitcode file.
 .UNINDENT
-.sp
-\fB\-verify\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-verify
 Causes \fBllvm\-bcanalyzer\fP to verify the module produced by reading the
-bitcode. This ensures that the statistics generated are based on a consistent
+bitcode.  This ensures that the statistics generated are based on a consistent
 module.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-help\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-help
 Print a summary of command line options.
 .UNINDENT
-.UNINDENT
 .SH EXIT STATUS
 .sp
-If \fBllvm\-bcanalyzer\fP succeeds, it will exit with 0.  Otherwise, if an error
-occurs, it will exit with a non\-zero value, usually 1.
+If \fBllvm\-bcanalyzer\fP succeeds, it will exit with 0.  Otherwise, if an
+error occurs, it will exit with a non\-zero value, usually 1.
 .SH SUMMARY OUTPUT DEFINITIONS
 .sp
-The following items are always printed by llvm\-bcanalyzer. They comprize the
+The following items are always printed by llvm\-bcanalyzer.  They comprize the
 summary output.
 .sp
 \fBBitcode Analysis Of Module\fP
@@ -115,14 +108,14 @@ The size, in bytes, of the entire bitcode file.
 \fBModule Bytes\fP
 .INDENT 0.0
 .INDENT 3.5
-The size, in bytes, of the module block. Percentage is relative to File Size.
+The size, in bytes, of the module block.  Percentage is relative to File Size.
 .UNINDENT
 .UNINDENT
 .sp
 \fBFunction Bytes\fP
 .INDENT 0.0
 .INDENT 3.5
-The size, in bytes, of all the function blocks. Percentage is relative to File
+The size, in bytes, of all the function blocks.  Percentage is relative to File
 Size.
 .UNINDENT
 .UNINDENT
@@ -130,8 +123,8 @@ Size.
 \fBGlobal Types Bytes\fP
 .INDENT 0.0
 .INDENT 3.5
-The size, in bytes, of the Global Types Pool. Percentage is relative to File
-Size. This is the size of the definitions of all types in the bitcode file.
+The size, in bytes, of the Global Types Pool.  Percentage is relative to File
+Size.  This is the size of the definitions of all types in the bitcode file.
 .UNINDENT
 .UNINDENT
 .sp
@@ -155,7 +148,7 @@ Percentage is relative to File Size.
 .INDENT 0.0
 .INDENT 3.5
 The size, in bytes, of all the instruction lists in all the functions.
-Percentage is relative to File Size. Note that this value is also included in
+Percentage is relative to File Size.  Note that this value is also included in
 the Function Bytes.
 .UNINDENT
 .UNINDENT
@@ -164,7 +157,7 @@ the Function Bytes.
 .INDENT 0.0
 .INDENT 3.5
 The size, in bytes, of all the compaction tables in all the functions.
-Percentage is relative to File Size. Note that this value is also included in
+Percentage is relative to File Size.  Note that this value is also included in
 the Function Bytes.
 .UNINDENT
 .UNINDENT
@@ -172,8 +165,8 @@ the Function Bytes.
 \fBSymbol Table Bytes\fP
 .INDENT 0.0
 .INDENT 3.5
-The size, in bytes, of all the symbol tables in all the functions. Percentage is
-relative to File Size. Note that this value is also included in the Function
+The size, in bytes, of all the symbol tables in all the functions.  Percentage is
+relative to File Size.  Note that this value is also included in the Function
 Bytes.
 .UNINDENT
 .UNINDENT
@@ -181,8 +174,8 @@ Bytes.
 \fBDependent Libraries Bytes\fP
 .INDENT 0.0
 .INDENT 3.5
-The size, in bytes, of the list of dependent libraries in the module. Percentage
-is relative to File Size. Note that this value is also included in the Module
+The size, in bytes, of the list of dependent libraries in the module.  Percentage
+is relative to File Size.  Note that this value is also included in the Module
 Global Bytes.
 .UNINDENT
 .UNINDENT
@@ -233,7 +226,7 @@ The total number of instructions defined in all functions in the bitcode file.
 .INDENT 0.0
 .INDENT 3.5
 The total number of long instructions defined in all functions in the bitcode
-file. Long instructions are those taking greater than 4 bytes. Typically long
+file.  Long instructions are those taking greater than 4 bytes.  Typically long
 instructions are GetElementPtr with several indices, PHI nodes, and calls to
 functions with large numbers of arguments.
 .UNINDENT
@@ -278,7 +271,7 @@ The total size of the instructions in all functions in the bitcode file.
 .INDENT 0.0
 .INDENT 3.5
 The average number of bytes per instruction across all functions in the bitcode
-file. This value is computed by dividing Total Instruction Size by Number Of
+file.  This value is computed by dividing Total Instruction Size by Number Of
 Instructions.
 .UNINDENT
 .UNINDENT
@@ -286,7 +279,7 @@ Instructions.
 \fBMaximum Type Slot Number\fP
 .INDENT 0.0
 .INDENT 3.5
-The maximum value used for a type\(aqs slot number. Larger slot number values take
+The maximum value used for a type\(aqs slot number.  Larger slot number values take
 more bytes to encode.
 .UNINDENT
 .UNINDENT
@@ -294,7 +287,7 @@ more bytes to encode.
 \fBMaximum Value Slot Number\fP
 .INDENT 0.0
 .INDENT 3.5
-The maximum value used for a value\(aqs slot number. Larger slot number values take
+The maximum value used for a value\(aqs slot number.  Larger slot number values take
 more bytes to encode.
 .UNINDENT
 .UNINDENT
@@ -302,7 +295,7 @@ more bytes to encode.
 \fBBytes Per Value\fP
 .INDENT 0.0
 .INDENT 3.5
-The average size of a Value definition (of any type). This is computed by
+The average size of a Value definition (of any type).  This is computed by
 dividing File Size by the total number of values of any type.
 .UNINDENT
 .UNINDENT
@@ -317,7 +310,7 @@ The average size of a global definition (constants and global variables).
 \fBBytes Per Function\fP
 .INDENT 0.0
 .INDENT 3.5
-The average number of bytes per function definition. This is computed by
+The average number of bytes per function definition.  This is computed by
 dividing Function Bytes by Number Of Functions.
 .UNINDENT
 .UNINDENT
@@ -419,18 +412,18 @@ The number of bytes consumed by instructions in the function.
 \fBAverage Instruction Size\fP
 .INDENT 0.0
 .INDENT 3.5
-The average number of bytes consumed by the instructions in the function. This
-value is computed by dividing Instruction Size by Instructions.
+The average number of bytes consumed by the instructions in the function.
+This value is computed by dividing Instruction Size by Instructions.
 .UNINDENT
 .UNINDENT
 .sp
 \fBBytes Per Instruction\fP
 .INDENT 0.0
 .INDENT 3.5
-The average number of bytes used by the function per instruction. This value is
-computed by dividing Byte Size by Instructions. Note that this is not the same
-as Average Instruction Size. It computes a number relative to the total function
-size not just the size of the instruction list.
+The average number of bytes used by the function per instruction.  This value
+is computed by dividing Byte Size by Instructions.  Note that this is not the
+same as Average Instruction Size.  It computes a number relative to the total
+function size not just the size of the instruction list.
 .UNINDENT
 .UNINDENT
 .sp
@@ -469,15 +462,15 @@ Bit Rate encoding scheme.
 .INDENT 0.0
 .INDENT 3.5
 The total number of bytes saved in this function by using the Variable Bit
-Rate encoding scheme. The percentage is relative to # of VBR Expanded Bytes.
+Rate encoding scheme.  The percentage is relative to # of VBR Expanded Bytes.
 .UNINDENT
 .UNINDENT
 .SH SEE ALSO
 .sp
-llvm\-dis|llvm\-dis, \fI\%http://llvm.org/docs/BitCodeFormat.html\fP
+\fB/CommandGuide/llvm\-dis\fP, \fB/BitCodeFormat\fP
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/clang/llvm-diff/Makefile b/usr.bin/clang/llvm-diff/Makefile
index 1a130fb..527daa2 100644
--- a/usr.bin/clang/llvm-diff/Makefile
+++ b/usr.bin/clang/llvm-diff/Makefile
@@ -10,7 +10,8 @@ SRCS=	llvm-diff.cpp \
 	DiffLog.cpp \
 	DifferenceEngine.cpp
 
-LIBDEPS=llvmbitreader \
+LIBDEPS=llvmirreader \
+	llvmbitreader \
 	llvmasmparser \
 	llvmcore \
 	llvmsupport
diff --git a/usr.bin/clang/llvm-diff/llvm-diff.1 b/usr.bin/clang/llvm-diff/llvm-diff.1
index 21586ef..9d4446e 100644
--- a/usr.bin/clang/llvm-diff/llvm-diff.1
+++ b/usr.bin/clang/llvm-diff/llvm-diff.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "LLVM-DIFF" "1" "2012-08-16" "3.2" "LLVM"
+.TH "LLVM-DIFF" "1" "2013-04-11" "3.3" "LLVM"
 .SH NAME
 llvm-diff \- LLVM structural 'diff'
 .
@@ -72,6 +72,6 @@ massive detected differences in blocks.
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/clang/llvm-dis/Makefile b/usr.bin/clang/llvm-dis/Makefile
index 75a5738..3fe3f78 100644
--- a/usr.bin/clang/llvm-dis/Makefile
+++ b/usr.bin/clang/llvm-dis/Makefile
@@ -6,7 +6,6 @@ PROG_CXX=llvm-dis
 
 SRCDIR=	tools/llvm-dis
 SRCS=	llvm-dis.cpp
-LLVM_REQUIRES_EH=
 
 TGHDRS=	Intrinsics
 LIBDEPS=llvmanalysis \
diff --git a/usr.bin/clang/llvm-dis/llvm-dis.1 b/usr.bin/clang/llvm-dis/llvm-dis.1
index 28363b7..fa3c012 100644
--- a/usr.bin/clang/llvm-dis/llvm-dis.1
+++ b/usr.bin/clang/llvm-dis/llvm-dis.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "LLVM-DIS" "1" "2012-08-16" "3.2" "LLVM"
+.TH "LLVM-DIS" "1" "2013-04-11" "3.3" "LLVM"
 .SH NAME
 llvm-dis \- LLVM disassembler
 .
@@ -83,6 +83,6 @@ llvm\-as|llvm\-as
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/clang/llvm-extract/Makefile b/usr.bin/clang/llvm-extract/Makefile
index 8aac1ab..007c9c7 100644
--- a/usr.bin/clang/llvm-extract/Makefile
+++ b/usr.bin/clang/llvm-extract/Makefile
@@ -7,10 +7,12 @@ PROG_CXX=llvm-extract
 SRCDIR=	tools/llvm-extract
 SRCS=	llvm-extract.cpp
 
-LIBDEPS=llvmasmparser \
+LIBDEPS=llvmirreader \
+	llvmasmparser \
 	llvmbitwriter \
 	llvmbitreader \
 	llvmipo \
+	llvmobjcarcopts \
 	llvmvectorize \
 	llvmscalaropts \
 	llvminstcombine \
diff --git a/usr.bin/clang/llvm-extract/llvm-extract.1 b/usr.bin/clang/llvm-extract/llvm-extract.1
index fec5f07..6871124 100644
--- a/usr.bin/clang/llvm-extract/llvm-extract.1
+++ b/usr.bin/clang/llvm-extract/llvm-extract.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "LLVM-EXTRACT" "1" "2012-08-16" "3.2" "LLVM"
+.TH "LLVM-EXTRACT" "1" "2013-04-11" "3.3" "LLVM"
 .SH NAME
 llvm-extract \- extract a function from an LLVM module
 .
@@ -123,6 +123,6 @@ bugpoint|bugpoint
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/clang/llvm-link/Makefile b/usr.bin/clang/llvm-link/Makefile
index b76c5f4..12591ae 100644
--- a/usr.bin/clang/llvm-link/Makefile
+++ b/usr.bin/clang/llvm-link/Makefile
@@ -7,8 +7,10 @@ PROG_CXX=llvm-link
 SRCDIR=	tools/llvm-link
 SRCS=	llvm-link.cpp
 
-LIBDEPS=llvmasmparser \
+LIBDEPS=llvmirreader \
+	llvmasmparser \
 	llvmbitwriter \
+	llvmbitreader \
 	llvmlinker \
 	llvmtransformutils \
 	llvmipa \
@@ -16,8 +18,6 @@ LIBDEPS=llvmasmparser \
 	llvmtarget \
 	llvmmc \
 	llvmobject \
-	llvmarchive \
-	llvmbitreader \
 	llvmcore \
 	llvmsupport
 
diff --git a/usr.bin/clang/llvm-link/llvm-link.1 b/usr.bin/clang/llvm-link/llvm-link.1
index 67e4cb7..46f24ee 100644
--- a/usr.bin/clang/llvm-link/llvm-link.1
+++ b/usr.bin/clang/llvm-link/llvm-link.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
-.TH "LLVM-LINK" "1" "2012-08-16" "3.2" "LLVM"
+.TH "LLVM-LINK" "1" "2013-04-11" "3.3" "LLVM"
 .SH NAME
-llvm-link \- LLVM linker
+llvm-link \- LLVM bitcode linker
 .
 .nr rst2man-indent-level 0
 .
@@ -36,84 +36,54 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 \fBllvm\-link\fP [\fIoptions\fP] \fIfilename ...\fP
 .SH DESCRIPTION
 .sp
-\fBllvm\-link\fP takes several LLVM bitcode files and links them together into a
-single LLVM bitcode file.  It writes the output file to standard output, unless
-the \fB\-o\fP option is used to specify a filename.
-.sp
-\fBllvm\-link\fP attempts to load the input files from the current directory.  If
-that fails, it looks for each file in each of the directories specified by the
-\fB\-L\fP options on the command line.  The library search paths are global; each
-one is searched for every input file if necessary.  The directories are searched
-in the order they were specified on the command line.
+\fBllvm\-link\fP takes several LLVM bitcode files and links them together
+into a single LLVM bitcode file.  It writes the output file to standard output,
+unless the \fI\-o\fP option is used to specify a filename.
 .SH OPTIONS
-.sp
-\fB\-L\fP \fIdirectory\fP
 .INDENT 0.0
-.INDENT 3.5
-Add the specified \fIdirectory\fP to the library search path.  When looking for
-libraries, \fBllvm\-link\fP will look in path name for libraries.  This option can be
-specified multiple times; \fBllvm\-link\fP will search inside these directories in
-the order in which they were specified on the command line.
-.UNINDENT
+.TP
+.B \-f
+Enable binary output on terminals.  Normally, \fBllvm\-link\fP will refuse
+to write raw bitcode output if the output stream is a terminal. With this
+option, \fBllvm\-link\fP will write raw bitcode regardless of the output
+device.
 .UNINDENT
-.sp
-\fB\-f\fP
 .INDENT 0.0
-.INDENT 3.5
-Enable binary output on terminals.  Normally, \fBllvm\-link\fP will refuse to
-write raw bitcode output if the output stream is a terminal. With this option,
-\fBllvm\-link\fP will write raw bitcode regardless of the output device.
-.UNINDENT
-.UNINDENT
-.sp
-\fB\-o\fP \fIfilename\fP
-.INDENT 0.0
-.INDENT 3.5
-Specify the output file name.  If \fIfilename\fP is \fB\-\fP, then \fBllvm\-link\fP will
-write its output to standard output.
-.UNINDENT
+.TP
+.B \-o filename
+Specify the output file name.  If \fBfilename\fP is "\fB\-\fP", then
+\fBllvm\-link\fP will write its output to standard output.
 .UNINDENT
-.sp
-\fB\-S\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-S
 Write output in LLVM intermediate language (instead of bitcode).
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-d\fP
 .INDENT 0.0
-.INDENT 3.5
-If specified, \fBllvm\-link\fP prints a human\-readable version of the output
-bitcode file to standard error.
+.TP
+.B \-d
+If specified, \fBllvm\-link\fP prints a human\-readable version of the
+output bitcode file to standard error.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-help\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-help
 Print a summary of command line options.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-v\fP
 .INDENT 0.0
-.INDENT 3.5
-Verbose mode.  Print information about what \fBllvm\-link\fP is doing.  This
-typically includes a message for each bitcode file linked in and for each
+.TP
+.B \-v
+Verbose mode.  Print information about what \fBllvm\-link\fP is doing.
+This typically includes a message for each bitcode file linked in and for each
 library found.
 .UNINDENT
-.UNINDENT
 .SH EXIT STATUS
 .sp
 If \fBllvm\-link\fP succeeds, it will exit with 0.  Otherwise, if an error
 occurs, it will exit with a non\-zero value.
-.SH SEE ALSO
-.sp
-gccld|gccld
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile
index c3821c4..55a702b 100644
--- a/usr.bin/clang/llvm-mc/Makefile
+++ b/usr.bin/clang/llvm-mc/Makefile
@@ -11,33 +11,34 @@ SRCS=	llvm-mc.cpp \
 
 LIBDEPS=llvmmcdisassembler \
 	llvmarmdisassembler \
-	llvmarmasmparser \
 	llvmarmcodegen \
+	llvmarmasmparser \
 	llvmarmdesc \
 	llvmarminfo \
 	llvmarminstprinter \
-	llvmmipsasmparser \
+	llvmmipsdisassembler \
 	llvmmipscodegen \
+	llvmmipsasmparser \
 	llvmmipsdesc \
-	llvmmipsinstprinter \
-	llvmmipsdisassembler \
 	llvmmipsinfo \
+	llvmmipsinstprinter \
 	llvmpowerpccodegen \
 	llvmpowerpcdesc \
 	llvmpowerpcinfo \
 	llvmpowerpcinstprinter \
+	llvmx86disassembler \
 	llvmx86asmparser \
 	llvmx86codegen \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmmcparser \
 	llvmcodegen \
+	llvmobjcarcopts \
 	llvmscalaropts \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmx86disassembler \
 	llvmx86desc \
 	llvmx86info \
 	llvmtarget \
diff --git a/usr.bin/clang/llvm-nm/llvm-nm.1 b/usr.bin/clang/llvm-nm/llvm-nm.1
index 8df8f3f..ddfabad 100644
--- a/usr.bin/clang/llvm-nm/llvm-nm.1
+++ b/usr.bin/clang/llvm-nm/llvm-nm.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "LLVM-NM" "1" "2012-08-16" "3.2" "LLVM"
+.TH "LLVM-NM" "1" "2013-04-11" "3.3" "LLVM"
 .SH NAME
 llvm-nm \- list LLVM bitcode and object file's symbol table
 .
@@ -208,6 +208,6 @@ llvm\-dis|llvm\-dis, ar(1), nm(1)
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile
index b7e5031..9e215a1 100644
--- a/usr.bin/clang/llvm-objdump/Makefile
+++ b/usr.bin/clang/llvm-objdump/Makefile
@@ -4,42 +4,47 @@ NO_MAN=
 .include <bsd.own.mk>
 
 PROG_CXX=llvm-objdump
+DPADD=	${LIBZ}
+LDADD=	-lz
 
 SRCDIR=	tools/llvm-objdump
 SRCS=	llvm-objdump.cpp \
+	COFFDump.cpp \
+	ELFDump.cpp \
 	MachODump.cpp \
-	MCFunction.cpp \
+	MCFunction.cpp
 
 LIBDEPS=llvmmcdisassembler \
 	llvmdebuginfo \
 	llvmarmdisassembler \
-	llvmarmasmparser \
 	llvmarmcodegen \
+	llvmarmasmparser \
 	llvmarmdesc \
 	llvmarminfo \
 	llvmarminstprinter \
-	llvmmipsasmparser \
+	llvmmipsdisassembler \
 	llvmmipscodegen \
+	llvmmipsasmparser \
 	llvmmipsdesc \
-	llvmmipsinstprinter \
-	llvmmipsdisassembler \
 	llvmmipsinfo \
+	llvmmipsinstprinter \
 	llvmpowerpccodegen \
 	llvmpowerpcdesc \
 	llvmpowerpcinfo \
 	llvmpowerpcinstprinter \
+	llvmx86disassembler \
 	llvmx86asmparser \
 	llvmx86codegen \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmmcparser \
 	llvmcodegen \
+	llvmobjcarcopts \
 	llvmscalaropts \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmx86disassembler \
 	llvmx86desc \
 	llvmx86info \
 	llvmtarget \
diff --git a/usr.bin/clang/llvm-prof/llvm-prof.1 b/usr.bin/clang/llvm-prof/llvm-prof.1
index fd34cd7..ab5b603 100644
--- a/usr.bin/clang/llvm-prof/llvm-prof.1
+++ b/usr.bin/clang/llvm-prof/llvm-prof.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "LLVM-PROF" "1" "2012-08-16" "3.2" "LLVM"
+.TH "LLVM-PROF" "1" "2013-04-11" "3.3" "LLVM"
 .SH NAME
 llvm-prof \- print execution profile of LLVM program
 .
@@ -81,6 +81,6 @@ information. Otherwise, it exits with zero.
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/clang/llvm-ranlib/Makefile b/usr.bin/clang/llvm-ranlib/Makefile
index 108ca78..2414e1f 100644
--- a/usr.bin/clang/llvm-ranlib/Makefile
+++ b/usr.bin/clang/llvm-ranlib/Makefile
@@ -6,7 +6,6 @@ PROG_CXX=llvm-ranlib
 
 SRCDIR=	tools/llvm-ranlib
 SRCS=	llvm-ranlib.cpp
-LLVM_REQUIRES_EH=
 
 LIBDEPS=llvmarchive \
 	llvmbitreader \
diff --git a/usr.bin/clang/llvm-ranlib/llvm-ranlib.1 b/usr.bin/clang/llvm-ranlib/llvm-ranlib.1
index 60ada02..ead004a 100644
--- a/usr.bin/clang/llvm-ranlib/llvm-ranlib.1
+++ b/usr.bin/clang/llvm-ranlib/llvm-ranlib.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "LLVM-RANLIB" "1" "2012-08-16" "3.2" "LLVM"
+.TH "LLVM-RANLIB" "1" "2013-04-11" "3.3" "LLVM"
 .SH NAME
 llvm-ranlib \- Generate index for LLVM archive
 .
@@ -75,6 +75,6 @@ llvm\-ar|llvm\-ar, ranlib(1)
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile
index b9b49ce..aae366a 100644
--- a/usr.bin/clang/llvm-rtdyld/Makefile
+++ b/usr.bin/clang/llvm-rtdyld/Makefile
@@ -4,41 +4,45 @@ NO_MAN=
 .include <bsd.own.mk>
 
 PROG_CXX=llvm-rtdyld
+DPADD=	${LIBZ}
+LDADD=	-lz
 
 SRCDIR=	tools/llvm-rtdyld
 SRCS=	llvm-rtdyld.cpp
 
-LIBDEPS=llvmjit \
+LIBDEPS=llvmdebuginfo \
+	llvmjit \
 	llvmexecutionengine \
 	llvmruntimedyld \
 	llvmarmdisassembler \
-	llvmarmasmparser \
 	llvmarmcodegen \
+	llvmarmasmparser \
 	llvmarmdesc \
 	llvmarminfo \
 	llvmarminstprinter \
-	llvmmipsasmparser \
+	llvmmipsdisassembler \
 	llvmmipscodegen \
+	llvmmipsasmparser \
 	llvmmipsdesc \
-	llvmmipsinstprinter \
-	llvmmipsdisassembler \
 	llvmmipsinfo \
+	llvmmipsinstprinter \
 	llvmpowerpccodegen \
 	llvmpowerpcdesc \
 	llvmpowerpcinfo \
 	llvmpowerpcinstprinter \
+	llvmx86disassembler \
 	llvmx86asmparser \
 	llvmx86codegen \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmmcparser \
 	llvmcodegen \
+	llvmobjcarcopts \
 	llvmscalaropts \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmx86disassembler \
 	llvmx86desc \
 	llvmx86info \
 	llvmtarget \
diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile
index 3af07d4..e881329 100644
--- a/usr.bin/clang/opt/Makefile
+++ b/usr.bin/clang/opt/Makefile
@@ -12,34 +12,35 @@ SRCS=	AnalysisWrappers.cpp \
 
 TGHDRS=	Intrinsics
 LIBDEPS=llvmarmdisassembler \
-	llvmarmasmparser \
 	llvmarmcodegen \
+	llvmarmasmparser \
 	llvmarmdesc \
 	llvmarminfo \
 	llvmarminstprinter \
-	llvmmipsasmparser \
+	llvmmipsdisassembler \
 	llvmmipscodegen \
+	llvmmipsasmparser \
 	llvmmipsdesc \
-	llvmmipsinstprinter \
-	llvmmipsdisassembler \
 	llvmmipsinfo \
+	llvmmipsinstprinter \
 	llvmpowerpccodegen \
 	llvmpowerpcdesc \
 	llvmpowerpcinfo \
 	llvmpowerpcinstprinter \
+	llvmx86disassembler \
 	llvmx86asmparser \
 	llvmx86codegen \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmmcparser \
 	llvmcodegen \
-	llvmx86disassembler \
 	llvmx86desc \
 	llvmx86info \
 	llvmx86instprinter \
 	llvmx86utils \
 	llvmipo \
 	llvmvectorize \
+	llvmobjcarcopts \
 	llvmscalaropts \
 	llvminstcombine \
 	llvminstrumentation \
@@ -49,6 +50,7 @@ LIBDEPS=llvmarmdisassembler \
 	llvmtarget \
 	llvmmc \
 	llvmobject \
+	llvmirreader \
 	llvmasmparser \
 	llvmbitwriter \
 	llvmbitreader \
diff --git a/usr.bin/clang/opt/opt.1 b/usr.bin/clang/opt/opt.1
index a69bb65..4ac0caa 100644
--- a/usr.bin/clang/opt/opt.1
+++ b/usr.bin/clang/opt/opt.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "OPT" "1" "2012-08-16" "3.2" "LLVM"
+.TH "OPT" "1" "2013-06-10" "3.3" "LLVM"
 .SH NAME
 opt \- LLVM optimizer
 .
@@ -36,78 +36,70 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 \fBopt\fP [\fIoptions\fP] [\fIfilename\fP]
 .SH DESCRIPTION
 .sp
-The \fBopt\fP command is the modular LLVM optimizer and analyzer.  It takes LLVM
-source files as input, runs the specified optimizations or analyses on it, and then
-outputs the optimized file or the analysis results.  The function of
-\fBopt\fP depends on whether the \fB\-analyze\fP option is given.
+The \fBopt\fP command is the modular LLVM optimizer and analyzer.  It
+takes LLVM source files as input, runs the specified optimizations or analyses
+on it, and then outputs the optimized file or the analysis results.  The
+function of \fBopt\fP depends on whether the \fI\-analyze\fP option is
+given.
 .sp
-When \fB\-analyze\fP is specified, \fBopt\fP performs various analyses of the input
-source.  It will usually print the results on standard output, but in a few
-cases, it will print output to standard error or generate a file with the
-analysis output, which is usually done when the output is meant for another
+When \fI\-analyze\fP is specified, \fBopt\fP performs various analyses
+of the input source.  It will usually print the results on standard output, but
+in a few cases, it will print output to standard error or generate a file with
+the analysis output, which is usually done when the output is meant for another
 program.
 .sp
-While \fB\-analyze\fP is \fInot\fP given, \fBopt\fP attempts to produce an optimized
-output file.  The optimizations available via \fBopt\fP depend upon what
-libraries were linked into it as well as any additional libraries that have
-been loaded with the \fB\-load\fP option.  Use the \fB\-help\fP option to determine
-what optimizations you can use.
+While \fI\-analyze\fP is \fInot\fP given, \fBopt\fP attempts to produce an
+optimized output file.  The optimizations available via \fBopt\fP depend
+upon what libraries were linked into it as well as any additional libraries
+that have been loaded with the \fI\%-load\fP option.  Use the \fI\%-help\fP
+option to determine what optimizations you can use.
 .sp
-If \fIfilename\fP is omitted from the command line or is \fI\-\fP, \fBopt\fP reads its
-input from standard input. Inputs can be in either the LLVM assembly language
-format (.ll) or the LLVM bitcode format (.bc).
+If \fBfilename\fP is omitted from the command line or is "\fB\-\fP", \fBopt\fP
+reads its input from standard input.  Inputs can be in either the LLVM assembly
+language format (\fB.ll\fP) or the LLVM bitcode format (\fB.bc\fP).
 .sp
-If an output filename is not specified with the \fB\-o\fP option, \fBopt\fP
-writes its output to the standard output.
+If an output filename is not specified with the \fI\%-o\fP option,
+\fBopt\fP writes its output to the standard output.
 .SH OPTIONS
-.sp
-\fB\-f\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-f
 Enable binary output on terminals.  Normally, \fBopt\fP will refuse to
-write raw bitcode output if the output stream is a terminal. With this option,
+write raw bitcode output if the output stream is a terminal.  With this option,
 \fBopt\fP will write raw bitcode regardless of the output device.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-help\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-help
 Print a summary of command line options.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-o\fP \fIfilename\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-o <filename>
 Specify the output filename.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-S\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-S
 Write output in LLVM intermediate language (instead of bitcode).
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-{passname}\fP
 .INDENT 0.0
-.INDENT 3.5
-\fBopt\fP provides the ability to run any of LLVM\(aqs optimization or analysis passes
-in any order. The \fB\-help\fP option lists all the passes available. The order in
-which the options occur on the command line are the order in which they are
-executed (within pass constraints).
-.UNINDENT
+.TP
+.B \-{passname}
+\fBopt\fP provides the ability to run any of LLVM\(aqs optimization or
+analysis passes in any order.  The \fI\%-help\fP option lists all the passes
+available.  The order in which the options occur on the command line are the
+order in which they are executed (within pass constraints).
 .UNINDENT
-.sp
-\fB\-std\-compile\-opts\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-std\-compile\-opts
 This is short hand for a standard list of \fIcompile time optimization\fP passes.
-This is typically used to optimize the output from the llvm\-gcc front end. It
-might be useful for other front end compilers as well. To discover the full set
-of options available, use the following command:
+This is typically used to optimize the output from the llvm\-gcc front end.  It
+might be useful for other front end compilers as well.  To discover the full
+set of options available, use the following command:
+.INDENT 7.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
@@ -116,82 +108,70 @@ llvm\-as < /dev/null | opt \-std\-compile\-opts \-disable\-output \-debug\-pass=
 .fi
 .UNINDENT
 .UNINDENT
-.sp
-\fB\-disable\-inlining\fP
-.INDENT 0.0
-.INDENT 3.5
-This option is only meaningful when \fB\-std\-compile\-opts\fP is given. It simply
-removes the inlining pass from the standard list.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-disable\-opt\fP
 .INDENT 0.0
-.INDENT 3.5
-This option is only meaningful when \fB\-std\-compile\-opts\fP is given. It disables
-most, but not all, of the \fB\-std\-compile\-opts\fP. The ones that remain are
-\fB\-verify\fP, \fB\-lower\-setjmp\fP, and \fB\-funcresolve\fP.
+.TP
+.B \-disable\-inlining
+This option is only meaningful when \fI\%-std-compile-opts\fP is given.  It
+simply removes the inlining pass from the standard list.
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-disable\-opt
+This option is only meaningful when \fI\%-std-compile-opts\fP is given.  It
+disables most, but not all, of the \fI\%-std-compile-opts\fP.  The ones that
+remain are \fI\-verify\fP, \fI\-lower\-setjmp\fP, and
+\fI\-funcresolve\fP.
 .UNINDENT
-.sp
-\fB\-strip\-debug\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-strip\-debug
 This option causes opt to strip debug information from the module before
-applying other optimizations. It is essentially the same as \fB\-strip\fP but it
-ensures that stripping of debug information is done first.
+applying other optimizations.  It is essentially the same as \fI\-strip\fP
+but it ensures that stripping of debug information is done first.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-verify\-each\fP
 .INDENT 0.0
-.INDENT 3.5
-This option causes opt to add a verify pass after every pass otherwise specified
-on the command line (including \fB\-verify\fP).  This is useful for cases where it
-is suspected that a pass is creating an invalid module but it is not clear which
-pass is doing it. The combination of \fB\-std\-compile\-opts\fP and \fB\-verify\-each\fP
-can quickly track down this kind of problem.
+.TP
+.B \-verify\-each
+This option causes opt to add a verify pass after every pass otherwise
+specified on the command line (including \fI\-verify\fP).  This is useful
+for cases where it is suspected that a pass is creating an invalid module but
+it is not clear which pass is doing it.  The combination of
+\fI\%-std-compile-opts\fP and \fI\%-verify-each\fP can quickly track down
+this kind of problem.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-profile\-info\-file\fP \fIfilename\fP
 .INDENT 0.0
-.INDENT 3.5
-Specify the name of the file loaded by the \-profile\-loader option.
+.TP
+.B \-profile\-info\-file <filename>
+Specify the name of the file loaded by the \fB\-profile\-loader\fP option.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-stats\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-stats
 Print statistics.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-time\-passes\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-time\-passes
 Record the amount of time needed for each pass and print it to standard
 error.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-debug\fP
 .INDENT 0.0
-.INDENT 3.5
-If this is a debug build, this option will enable debug printouts
-from passes which use the \fIDEBUG()\fP macro.  See the \fBLLVM Programmer\(aqs
-Manual\fP, section \fI#DEBUG\fP for more information.
+.TP
+.B \-debug
+If this is a debug build, this option will enable debug printouts from passes
+which use the \fBDEBUG()\fP macro.  See the \fI\%LLVM Programmer's Manual\fP, section \fB#DEBUG\fP for more information.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-load\fP=\fIplugin\fP
 .INDENT 0.0
+.TP
+.B \-load=<plugin>
+Load the dynamic object \fBplugin\fP.  This object should register new
+optimization or analysis passes.  Once loaded, the object will add new command
+line options to enable various optimizations or analyses.  To see the new
+complete list of optimizations, use the \fI\%-help\fP and \fI\%-load\fP
+options together.  For example:
+.INDENT 7.0
 .INDENT 3.5
-Load the dynamic object \fIplugin\fP.  This object should register new optimization
-or analysis passes. Once loaded, the object will add new command line options to
-enable various optimizations or analyses.  To see the new complete list of
-optimizations, use the \fB\-help\fP and \fB\-load\fP options together. For example:
 .sp
 .nf
 .ft C
@@ -200,13 +180,12 @@ opt \-load=plugin.so \-help
 .fi
 .UNINDENT
 .UNINDENT
-.sp
-\fB\-p\fP
+.UNINDENT
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-p
 Print module after each transformation.
 .UNINDENT
-.UNINDENT
 .SH EXIT STATUS
 .sp
 If \fBopt\fP succeeds, it will exit with 0.  Otherwise, if an error
@@ -214,6 +193,6 @@ occurs, it will exit with a non\-zero value.
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/clang/tblgen/Makefile b/usr.bin/clang/tblgen/Makefile
index 7cae5da..f06150e 100644
--- a/usr.bin/clang/tblgen/Makefile
+++ b/usr.bin/clang/tblgen/Makefile
@@ -8,6 +8,7 @@ SRCDIR=	utils/TableGen
 SRCS=	AsmMatcherEmitter.cpp \
 	AsmWriterEmitter.cpp \
 	AsmWriterInst.cpp \
+	CTagsEmitter.cpp \
 	CallingConvEmitter.cpp \
 	CodeEmitterGen.cpp \
 	CodeGenDAGPatterns.cpp \
@@ -23,11 +24,11 @@ SRCS=	AsmMatcherEmitter.cpp \
 	DAGISelMatcherOpt.cpp \
 	DFAPacketizerEmitter.cpp \
 	DisassemblerEmitter.cpp \
-	EDEmitter.cpp \
 	FastISelEmitter.cpp \
 	FixedLenDecoderEmitter.cpp \
 	InstrInfoEmitter.cpp \
 	IntrinsicEmitter.cpp \
+	OptParserEmitter.cpp \
 	PseudoLoweringEmitter.cpp \
 	RegisterInfoEmitter.cpp \
 	SetTheory.cpp \
@@ -37,7 +38,6 @@ SRCS=	AsmMatcherEmitter.cpp \
 	X86DisassemblerTables.cpp \
 	X86ModRMFilters.cpp \
 	X86RecognizableInstr.cpp
-LLVM_REQUIRES_EH=
 
 LIBDEPS=llvmtablegen \
 	llvmsupport
diff --git a/usr.bin/clang/tblgen/tblgen.1 b/usr.bin/clang/tblgen/tblgen.1
index d6d127e..b0d0697 100644
--- a/usr.bin/clang/tblgen/tblgen.1
+++ b/usr.bin/clang/tblgen/tblgen.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "TBLGEN" "1" "2012-08-16" "3.2" "LLVM"
+.TH "TBLGEN" "1" "2013-04-11" "3.3" "LLVM"
 .SH NAME
 tblgen \- Target Description To C++ Code Generator
 .
@@ -36,188 +36,140 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 \fBtblgen\fP [\fIoptions\fP] [\fIfilename\fP]
 .SH DESCRIPTION
 .sp
-\fBtblgen\fP translates from target description (.td) files into C++ code that can
-be included in the definition of an LLVM target library. Most users of LLVM will
-not need to use this program. It is only for assisting with writing an LLVM
-target backend.
+\fBtblgen\fP translates from target description (\fB.td\fP) files into C++
+code that can be included in the definition of an LLVM target library.  Most
+users of LLVM will not need to use this program.  It is only for assisting with
+writing an LLVM target backend.
 .sp
 The input and output of \fBtblgen\fP is beyond the scope of this short
-introduction. Please see the \fICodeGeneration\fP page in the LLVM documentation.
+introduction.  Please see \fB../TableGenFundamentals\fP.
 .sp
-The \fIfilename\fP argument specifies the name of a Target Description (.td) file
-to read as input.
+The \fIfilename\fP argument specifies the name of a Target Description (\fB.td\fP)
+file to read as input.
 .SH OPTIONS
-.sp
-\fB\-help\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-help
 Print a summary of command line options.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-o\fP \fIfilename\fP
 .INDENT 0.0
-.INDENT 3.5
-Specify the output file name.  If \fIfilename\fP is \fB\-\fP, then \fBtblgen\fP
-sends its output to standard output.
+.TP
+.B \-o filename
+Specify the output file name.  If \fBfilename\fP is \fB\-\fP, then
+\fBtblgen\fP sends its output to standard output.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-I\fP \fIdirectory\fP
 .INDENT 0.0
-.INDENT 3.5
-Specify where to find other target description files for inclusion. The
-\fIdirectory\fP value should be a full or partial path to a directory that contains
-target description files.
-.UNINDENT
+.TP
+.B \-I directory
+Specify where to find other target description files for inclusion.  The
+\fBdirectory\fP value should be a full or partial path to a directory that
+contains target description files.
 .UNINDENT
-.sp
-\fB\-asmparsernum\fP \fIN\fP
 .INDENT 0.0
-.INDENT 3.5
-Make \-gen\-asm\-parser emit assembly writer number \fIN\fP.
-.UNINDENT
+.TP
+.B \-asmparsernum N
+Make \-gen\-asm\-parser emit assembly writer number \fBN\fP.
 .UNINDENT
-.sp
-\fB\-asmwriternum\fP \fIN\fP
 .INDENT 0.0
-.INDENT 3.5
-Make \-gen\-asm\-writer emit assembly writer number \fIN\fP.
+.TP
+.B \-asmwriternum N
+Make \-gen\-asm\-writer emit assembly writer number \fBN\fP.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-class\fP \fIclass Name\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-class className
 Print the enumeration list for this class.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-print\-records\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-print\-records
 Print all records to standard output (default).
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-print\-enums\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-print\-enums
 Print enumeration values for a class.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-print\-sets\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-print\-sets
 Print expanded sets for testing DAG exprs.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-emitter\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-emitter
 Generate machine code emitter.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-register\-info\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-register\-info
 Generate registers and register classes info.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-instr\-info\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-instr\-info
 Generate instruction descriptions.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-asm\-writer\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-asm\-writer
 Generate the assembly writer.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-disassembler\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-disassembler
 Generate disassembler.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-pseudo\-lowering\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-pseudo\-lowering
 Generate pseudo instruction lowering.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-dag\-isel\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-dag\-isel
 Generate a DAG (Directed Acycle Graph) instruction selector.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-asm\-matcher\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-asm\-matcher
 Generate assembly instruction matcher.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-dfa\-packetizer\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-dfa\-packetizer
 Generate DFA Packetizer for VLIW targets.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-fast\-isel\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-fast\-isel
 Generate a "fast" instruction selector.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-subtarget\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-subtarget
 Generate subtarget enumerations.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-intrinsic\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-intrinsic
 Generate intrinsic information.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-tgt\-intrinsic\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-tgt\-intrinsic
 Generate target intrinsic information.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-enhanced\-disassembly\-info\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-enhanced\-disassembly\-info
 Generate enhanced disassembly info.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-version\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-version
 Show the version number of this program.
 .UNINDENT
-.UNINDENT
 .SH EXIT STATUS
 .sp
 If \fBtblgen\fP succeeds, it will exit with 0.  Otherwise, if an error
@@ -225,6 +177,6 @@ occurs, it will exit with a non\-zero value.
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .
diff --git a/usr.bin/csup/token.l b/usr.bin/csup/token.l
index 267e61f..69f5ea4 100644
--- a/usr.bin/csup/token.l
+++ b/usr.bin/csup/token.l
@@ -35,12 +35,11 @@
 #include "misc.h"
 #include "token.h"
 
-#define	YY_NO_UNPUT
-
 int lineno = 1;
 
 %}
 
+%option nounput
 %option noyywrap
 
 %%
diff --git a/usr.bin/csup/updater.h b/usr.bin/csup/updater.h
index 9ec9ed7..b71c9c5 100644
--- a/usr.bin/csup/updater.h
+++ b/usr.bin/csup/updater.h
@@ -26,7 +26,7 @@
  * $FreeBSD$
  */
 #ifndef _UPDATER_H_
-#define _UPDATER_H
+#define _UPDATER_H_
 
 void	*updater(void *);
 
diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index ec11dc4..b76a0ca 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -20,7 +20,7 @@ CFLAGS+=	-DWITH_IDN -I/usr/local/include
 CFLAGS+=	-L/usr/local/lib -lidnkit -R/usr/local/lib -liconv
 .endif
 
-WARNS?=		1
+WARNS?=		0
 
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
diff --git a/usr.bin/dtc/checking.cc b/usr.bin/dtc/checking.cc
index 5462a49..9c7f43c 100644
--- a/usr.bin/dtc/checking.cc
+++ b/usr.bin/dtc/checking.cc
@@ -33,6 +33,8 @@
 #include "checking.hh"
 #include <stdio.h>
 
+
+
 namespace dtc
 {
 namespace fdt
@@ -40,6 +42,54 @@ namespace fdt
 namespace checking
 {
 
+namespace
+{
+	/**
+	 * Checker that verifies that every node that has children has
+	 * #address-cells and #size-cells properties.
+	 */
+	struct address_cells_checker : public checker
+	{
+		address_cells_checker(const char *name) : checker(name) {}
+		virtual bool check_node(device_tree *tree, node *n)
+		{
+			// If this has no children, it trivially meets the
+			// conditions.
+			if (n->child_begin() == n->child_end())
+			{
+				return true;
+			}
+			bool found_address = false;
+			bool found_size = false;
+			for (node::property_iterator i=n->property_begin(),
+			     e=n->property_end() ; i!=e ; ++i)
+			{
+				if (!found_address)
+				{
+					found_address = ((*i)->get_key() == "#address-cells");
+				}
+				if (!found_size)
+				{
+					found_size = ((*i)->get_key() == "#size-cells");
+				}
+				if (found_size && found_address)
+				{
+						break;
+				}
+			}
+			if (!found_address)
+			{
+					report_error("Missing #address-cells property");
+			}
+			if (!found_size)
+			{
+					report_error("Missing #size-cells property");
+			}
+			return found_address && found_size;
+		}
+	};
+} // anonymous namespace
+
 bool
 checker::visit_node(device_tree *tree, node *n)
 {
@@ -145,6 +195,7 @@ check_manager::~check_manager()
 	while (disabled_checkers.begin() != disabled_checkers.end())
 	{
 		delete disabled_checkers.begin()->second;
+		disabled_checkers.erase(disabled_checkers.begin());
 	}
 }
 
@@ -157,6 +208,8 @@ check_manager::check_manager()
 	add_property_type_checker<property_value::STRING>(
 			"type-model", string("model"));
 	add_property_size_checker("type-phandle", string("phandle"), 4);
+	disabled_checkers.insert(std::make_pair(string("cells-attributes"),
+		new address_cells_checker("cells-attributes")));
 }
 
 bool
diff --git a/usr.bin/dtc/dtc.1 b/usr.bin/dtc/dtc.1
index 567aa03..afb94f7 100644
--- a/usr.bin/dtc/dtc.1
+++ b/usr.bin/dtc/dtc.1
@@ -51,6 +51,7 @@
 .Op Fl p Ar bytes
 .Op Fl V Ar blob_version
 .Op Fl W Ar [no-]checker_name
+.Op Fl P Ar predefined_properties
 .Ar input_file
 .Sh DESCRIPTION
 The
@@ -132,6 +133,22 @@ The ASCII representation of the FDT.
 .El
 .It Fl o Ar output_file
 The file to which to write the output.
+.It Fl P Ar predefined_macro
+Defines a macro, in the form
+.Ar name=value
+or
+.Ar name
+to be used for device tree source files that contain conditional components.
+This tool supports two extensions to the standard to support conditional
+compilation of device trees.
+The first is an
+.Ar /include/if [property]/ "file.dts"
+directive that is allowed at the start of a file and which will only include
+the specified file if it the specified property is passed with this flag.
+The second is the
+.Ar $NAME
+format for property values.
+These allow property value to be specified on the command line.
 .It Fl R Ar entries
 The number of empty reservation table entries to pad the table with.
 This is
@@ -214,6 +231,12 @@ property.
 Checks the type of the
 .Va compatible
 property.
+.It cells-attributes
+Checks that all nodes with children have both
+.Va #address-cells
+and
+.Va #size-cells
+properties.
 .El
 .Sh EXAMPLES
 The command:
diff --git a/usr.bin/dtc/dtc.cc b/usr.bin/dtc/dtc.cc
index cffb3eb..c04f016 100644
--- a/usr.bin/dtc/dtc.cc
+++ b/usr.bin/dtc/dtc.cc
@@ -100,7 +100,7 @@ main(int argc, char **argv)
 	clock_t c0 = clock();
 	class device_tree tree;
 	fdt::checking::check_manager checks;
-	const char *options = "hqI:O:o:V:d:R:S:p:b:fisvH:W:E:D";
+	const char *options = "hqI:O:o:V:d:R:S:p:b:fisvH:W:E:DP:";
 
 	// Don't forget to update the man page if any more options are added.
 	while ((ch = getopt(argc, argv, options)) != -1)
@@ -267,6 +267,13 @@ main(int argc, char **argv)
 		case 'p':
 			tree.set_blob_padding(strtoll(optarg, 0, 10));
 			break;
+		case 'P':
+			if (!tree.parse_define(optarg))
+			{
+				fprintf(stderr, "Invalid predefine value %s\n",
+				        optarg);
+			}
+			break;
 		default:
 			fprintf(stderr, "Unknown option %c\n", ch);
 			return EXIT_FAILURE;
diff --git a/usr.bin/dtc/fdt.cc b/usr.bin/dtc/fdt.cc
index b6e7d56..eb944fc 100644
--- a/usr.bin/dtc/fdt.cc
+++ b/usr.bin/dtc/fdt.cc
@@ -30,6 +30,8 @@
  * $FreeBSD$
  */
 
+#define __STDC_LIMIT_MACROS 1
+
 #include "fdt.hh"
 
 #include <algorithm>
@@ -281,6 +283,12 @@ property::parse_cells(input_buffer &input)
 				valid = false;
 				return;
 			}
+			if ((val < 0) || (val > UINT32_MAX))
+			{
+				input.parse_error("Value out of range");
+				valid = false;
+				return;
+			}
 			push_big_endian(v.byte_data, (uint32_t)val);
 			input.next_token();
 		}
@@ -374,13 +382,45 @@ property::property(input_buffer &structs, input_buffer &strings)
 	values.push_back(v);
 }
 
-property::property(input_buffer &input, string k, string l) : key(k), label(l),
-	valid(true)
+void property::parse_define(input_buffer &input, define_map *defines)
+{
+	input.consume('$');
+	if (!defines)
+	{
+		input.parse_error("No predefined properties to match name\n");
+		valid = false;
+		return;
+	}
+	string name = string::parse_property_name(input);
+	define_map::iterator found;
+	if ((name == string()) ||
+	    ((found = defines->find(name)) == defines->end()))
+	{
+		input.parse_error("Undefined property name\n");
+		valid = false;
+		return;
+	}
+	values.push_back((*found).second->values[0]);
+}
+
+property::property(input_buffer &input,
+                   string k,
+                   string l,
+                   bool semicolonTerminated,
+                   define_map *defines) : key(k), label(l), valid(true)
 {
 	do {
 		input.next_token();
 		switch (input[0])
 		{
+			case '$':
+			{
+				parse_define(input, defines);
+				if (valid)
+				{
+					break;
+				}
+			}
 			default:
 				input.parse_error("Invalid property value.");
 				valid = false;
@@ -404,7 +444,7 @@ property::property(input_buffer &input, string k, string l) : key(k), label(l),
 		}
 		input.next_token();
 	} while (input.consume(','));
-	if (!input.consume(';'))
+	if (semicolonTerminated && !input.consume(';'))
 	{
 		input.parse_error("Expected ; at end of property");
 		valid = false;
@@ -424,9 +464,10 @@ property::parse_dtb(input_buffer &structs, input_buffer &strings)
 }
 
 property*
-property::parse(input_buffer &input, string key, string label)
+property::parse(input_buffer &input, string key, string label,
+                bool semicolonTerminated, define_map *defines)
 {
-	property *p = new property(input, key, label);
+	property *p = new property(input, key, label, semicolonTerminated, defines);
 	if (!p->valid)
 	{
 		delete p;
@@ -583,7 +624,7 @@ node::node(input_buffer &structs, input_buffer &strings) : valid(true)
 	return;
 }
 
-node::node(input_buffer &input, string n, string l, string a) : 
+node::node(input_buffer &input, string n, string l, string a, define_map *defines) : 
 	label(l), name(n), unit_address(a), valid(true)
 {
 	if (!input.consume('{'))
@@ -620,7 +661,7 @@ node::node(input_buffer &input, string n, string l, string a) :
 		if (input.consume('='))
 		{
 			property *p= property::parse(input, child_name,
-					child_label);
+					child_label, true, defines);
 			if (p == 0)
 			{
 				valid = false;
@@ -633,7 +674,7 @@ node::node(input_buffer &input, string n, string l, string a) :
 		else if (!is_property && input[0] == ('{'))
 		{
 			node *child = node::parse(input, child_name,
-					child_label, child_address);
+					child_label, child_address, defines);
 			if (child)
 			{
 				children.push_back(child);
@@ -685,9 +726,13 @@ node::sort()
 }
 
 node*
-node::parse(input_buffer &input, string name, string label, string address)
+node::parse(input_buffer &input,
+            string name,
+            string label,
+            string address,
+            define_map *defines)
 {
-	node *n = new node(input, name, label, address);
+	node *n = new node(input, name, label, address, defines);
 	if (!n->valid)
 	{
 		delete n;
@@ -1000,7 +1045,7 @@ device_tree::parse_roots(input_buffer &input, std::vector<node*> &roots)
 	while (valid && input.consume('/'))
 	{
 		input.next_token();
-		node *n = node::parse(input, string("", 1));
+		node *n = node::parse(input, string("", 1), string(), string(), &defines);
 		if (n)
 		{
 			roots.push_back(n);
@@ -1233,6 +1278,18 @@ device_tree::parse_dts(const char *fn, FILE *depfile)
 	input.next_token();
 	while(input.consume("/include/"))
 	{
+		bool reallyInclude = true;
+		if (input.consume("if "))
+		{
+			input.next_token();
+			string name = string::parse_property_name(input);
+			// XXX: Error handling
+			if (defines.find(name) == defines.end())
+			{
+				reallyInclude = false;
+			}
+			input.consume('/');
+		}
 		input.next_token();
 		if (!input.consume('"'))
 		{
@@ -1251,6 +1308,14 @@ device_tree::parse_dts(const char *fn, FILE *depfile)
 		include_file[dir_length] = '/';
 		memcpy(include_file+dir_length+1, file, length);
 		include_file[dir_length+length+1] = 0;
+
+		input.consume(include_file+dir_length+1);
+		input.consume('"');
+		if (!reallyInclude)
+		{
+			continue;
+		}
+
 		input_buffer *include_buffer = buffer_for_file(include_file);
 
 		if (include_buffer == 0)
@@ -1284,8 +1349,6 @@ device_tree::parse_dts(const char *fn, FILE *depfile)
 			return;
 		}
 		input_buffer &include = *include_buffer;
-		input.consume(include_file+dir_length+1);
-		input.consume('"');
 		free((void*)include_file);
 
 		if (!read_header)
@@ -1353,6 +1416,33 @@ device_tree::~device_tree()
 		delete buffers.back();
 		buffers.pop_back();
 	}
+	for (define_map::iterator i=defines.begin(), e=defines.end() ;
+	     i!=e ; ++i)
+	{
+		delete i->second;
+	}
+}
+
+bool device_tree::parse_define(const char *def)
+{
+	char *val = strchr(def, '=');
+	if (!val)
+	{
+		if (strlen(def) != 0)
+		{
+			string name(def);
+			defines[name];
+			return true;
+		}
+		return false;
+	}
+	string name(def, val-def);
+	val++;
+	input_buffer in = input_buffer(val, strlen(val));
+	property *p = property::parse(in, name, string(), false);
+	if (p)
+		defines[name] = p;
+	return p;
 }
 
 } // namespace fdt
diff --git a/usr.bin/dtc/fdt.hh b/usr.bin/dtc/fdt.hh
index b00ea48..3ac1084 100644
--- a/usr.bin/dtc/fdt.hh
+++ b/usr.bin/dtc/fdt.hh
@@ -48,6 +48,8 @@ class string_table;
 
 namespace fdt
 {
+class property;
+typedef std::map<string, property*> define_map;
 /**
  * Properties may contain a number of different value, each with a different
  * label.  This class encapsulates a single value.
@@ -263,6 +265,10 @@ class property
 	 */
 	void parse_reference(input_buffer &input);
 	/**
+	 * Parse a predefined macro definition for a property.
+	 */
+	void parse_define(input_buffer &input, define_map *defines);
+	/**
 	 * Constructs a new property from two input buffers, pointing to the
 	 * struct and strings tables in the device tree blob, respectively.
 	 * The structs input buffer is assumed to have just consumed the
@@ -272,7 +278,11 @@ class property
 	/**
 	 * Parses a new property from the input buffer.  
 	 */
-	property(input_buffer &input, string k, string l);
+	property(input_buffer &input,
+	         string k,
+	         string l,
+	         bool terminated,
+	         define_map *defines);
 	public:
 	/**
 	 * Creates an empty property.
@@ -298,7 +308,9 @@ class property
 	 */
 	static property* parse(input_buffer &input,
 	                       string key,
-	                       string label=string());
+	                       string label=string(),
+	                       bool semicolonTerminated=true,
+	                       define_map *defines=0);
 	/**
 	 * Iterator type used for accessing the values of a property.
 	 */
@@ -398,7 +410,7 @@ class node
 	 * node.  The name, and optionally label and unit address, should have
 	 * already been parsed.
 	 */
-	node(input_buffer &input, string n, string l, string a);
+	node(input_buffer &input, string n, string l, string a, define_map*);
 	/**
 	 * Comparison function for properties, used when sorting the properties
 	 * vector.  Orders the properties based on their names.
@@ -476,7 +488,8 @@ class node
 	static node* parse(input_buffer &input,
 	                   string name,
 	                   string label=string(),
-	                   string address=string());
+	                   string address=string(),
+	                   define_map *defines=0);
 	/**
 	 * Factory method for constructing a new node.  Attempts to parse a
 	 * node in DTB format from the input, and returns it on success.  On
@@ -617,6 +630,10 @@ class device_tree
 	 */
 	std::vector<const char*> include_paths;
 	/**
+	 * Dictionary of predefined macros provided on the command line.
+	 */
+	define_map               defines;
+	/**
 	 * The default boot CPU, specified in the device tree header.
 	 */
 	uint32_t boot_cpu;
@@ -773,6 +790,10 @@ class device_tree
 	{
 		blob_padding = p;
 	}
+	/**
+	 * Parses a predefined macro value.
+	 */
+	bool parse_define(const char *def);
 };
 
 } // namespace fdt
diff --git a/usr.bin/dtc/input_buffer.cc b/usr.bin/dtc/input_buffer.cc
index 10b3a00..8f055fe 100644
--- a/usr.bin/dtc/input_buffer.cc
+++ b/usr.bin/dtc/input_buffer.cc
@@ -216,7 +216,8 @@ input_buffer::parse_error(const char *msg)
 	putc('\n', stderr);
 	for (int i=0 ; i<(cursor-line_start) ; ++i)
 	{
-		putc(' ', stderr);
+		char c = (buffer[i+line_start] == '\t') ? '\t' : ' ';
+		putc(c, stderr);
 	}
 	putc('^', stderr);
 	putc('\n', stderr);
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index 900c0ee..6053518 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -1,5 +1,6 @@
 .\"-
-.\" Copyright (c) 2000-2011 Dag-Erling Smørgrav
+.\" Copyright (c) 2000-2013 Dag-Erling Smørgrav
+.\" Copyright (c) 2013 Michael Gmelin <freebsd@grem.de>
 .\" All rights reserved.
 .\" Portions Copyright (c) 1999 Massachusetts Institute of Technology; used
 .\" by permission.
@@ -29,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 27, 2011
+.Dd July 30, 2013
 .Dt FETCH 1
 .Os
 .Sh NAME
@@ -38,22 +39,51 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl 146AadFlMmnPpqRrsUv
+.Op Fl -allow-sslv2
 .Op Fl B Ar bytes
+.Op Fl -bind-address= Ns Ar host
+.Op Fl -ca-cert= Ns Ar file
+.Op Fl -ca-path= Ns Ar dir
+.Op Fl -cert= Ns Ar file
+.Op Fl -crl= Ns Ar file
 .Op Fl i Ar file
+.Op Fl -key= Ns Ar file
 .Op Fl N Ar file
+.Op Fl -no-passive
+.Op Fl -no-proxy= Ns Ar list
+.Op Fl -no-sslv3
+.Op Fl -no-tlsv1
+.Op Fl -no-verify-hostname
+.Op Fl -no-verify-peer
 .Op Fl o Ar file
+.Op Fl -referer= Ns Ar URL
 .Op Fl S Ar bytes
 .Op Fl T Ar seconds
+.Op Fl -user-agent= Ns Ar agent-string
 .Op Fl w Ar seconds
 .Ar URL ...
 .Nm
 .Op Fl 146AadFlMmnPpqRrsUv
 .Op Fl B Ar bytes
+.Op Fl -bind-address= Ns Ar host
+.Op Fl -ca-cert= Ns Ar file
+.Op Fl -ca-path= Ns Ar dir
+.Op Fl -cert= Ns Ar file
+.Op Fl -crl= Ns Ar file
 .Op Fl i Ar file
+.Op Fl -key= Ns Ar file
 .Op Fl N Ar file
+.Op Fl -no-passive
+.Op Fl -no-proxy= Ns Ar list
+.Op Fl -no-sslv3
+.Op Fl -no-tlsv1
+.Op Fl -no-verify-hostname
+.Op Fl -no-verify-peer
 .Op Fl o Ar file
+.Op Fl -referer= Ns Ar URL
 .Op Fl S Ar bytes
 .Op Fl T Ar seconds
+.Op Fl -user-agent= Ns Ar agent-string
 .Op Fl w Ar seconds
 .Fl h Ar host Fl f Ar file Oo Fl c Ar dir Oc
 .Sh DESCRIPTION
@@ -67,23 +97,26 @@ command line.
 .Pp
 The following options are available:
 .Bl -tag -width Fl
-.It Fl 1
+.It Fl 1 , -one-file
 Stop and return exit code 0 at the first successfully retrieved file.
-.It Fl 4
+.It Fl 4 , -ipv4-only
 Forces
 .Nm
 to use IPv4 addresses only.
-.It Fl 6
+.It Fl 6 , -ipv6-only
 Forces
 .Nm
 to use IPv6 addresses only.
-.It Fl A
+.It Fl A , -no-redirect
 Do not automatically follow ``temporary'' (302) redirects.
 Some broken Web sites will return a redirect instead of a not-found
 error when the requested object does not exist.
-.It Fl a
+.It Fl a , -retry
 Automatically retry the transfer upon soft failures.
-.It Fl B Ar bytes
+.It Fl -allow-sslv2
+[SSL]
+Allow SSL version 2 when negotiating the connection.
+.It Fl B Ar bytes , Fl -buffer-size= Ns Ar bytes
 Specify the read buffer size in bytes.
 The default is 4096 bytes.
 Attempts to set a buffer size lower than this will be silently
@@ -92,15 +125,43 @@ The number of reads actually performed is reported at verbosity level
 two or higher (see the
 .Fl v
 flag).
+.It Fl -bind-address= Ns Ar host
+Specifies a hostname or IP address to which sockets used for outgoing
+connections will be bound.
 .It Fl c Ar dir
 The file to retrieve is in directory
 .Ar dir
 on the remote host.
 This option is deprecated and is provided for backward compatibility
 only.
-.It Fl d
+.It Fl -ca-cert= Ns Ar file
+[SSL]
+Path to certificate bundle containing trusted CA certificates.
+If not specified,
+.Pa /etc/ssl/cert.pem
+is used.
+The file may contain multiple CA certificates. The port
+.Pa security/ca_root_nss
+is a common source of a current CA bundle.
+.It Fl -ca-path= Ns Ar dir
+[SSL]
+The directory
+.Ar dir
+contains trusted CA hashes.
+.It Fl -cert= Ns Ar file
+[SSL]
+.Ar file
+is a PEM encoded client certificate/key which will be used in
+client certificate authentication.
+.It Fl -crl= Ns Ar file
+[SSL]
+Points to certificate revocation list
+.Ar file ,
+which has to be in PEM format and may contain peer certificates that have
+been revoked.
+.It Fl d , -direct
 Use a direct connection even if a proxy is configured.
-.It Fl F
+.It Fl F , -force-restart
 In combination with the
 .Fl r
 flag, forces a restart even if the local and remote files have
@@ -118,17 +179,22 @@ The file to retrieve is located on the host
 .Ar host .
 This option is deprecated and is provided for backward compatibility
 only.
-.It Fl i Ar file
+.It Fl i Ar file , Fl -if-modified-since= Ns Ar file
 If-Modified-Since mode: the remote file will only be retrieved if it
 is newer than
 .Ar file
 on the local host.
 (HTTP only)
-.It Fl l
+.It Fl -key= Ns Ar file
+[SSL]
+.Ar file
+is a PEM encoded client key that will be used in client certificate
+authentication in case key and client certificate are stored separately.
+.It Fl l , -symlink
 If the target is a file-scheme URL, make a symbolic link to the target
 rather than trying to copy it.
 .It Fl M
-.It Fl m
+.It Fl m , -mirror
 Mirror mode: if the file already exists locally and has the same size
 and modification time as the remote file, it will not be fetched.
 Note that the
@@ -136,7 +202,7 @@ Note that the
 and
 .Fl r
 flags are mutually exclusive.
-.It Fl N Ar file
+.It Fl N Ar file , Fl -netrc= Ns Ar file
 Use
 .Ar file
 instead of
@@ -146,9 +212,28 @@ See
 .Xr ftp 1
 for a description of the file format.
 This feature is experimental.
-.It Fl n
+.It Fl n , -no-mtime
 Do not preserve the modification time of the transferred file.
-.It Fl o Ar file
+.It Fl -no-passive
+Forces the FTP code to use active mode.
+.It Fl -no-proxy= Ns Ar list
+Either a single asterisk, which disables the use of proxies
+altogether, or a comma- or whitespace-separated list of hosts for
+which proxies should not be used.
+.It Fl -no-sslv3
+[SSL]
+Don't allow SSL version 3 when negotiating the connection.
+.It Fl -no-tlsv1
+[SSL]
+Don't allow TLS version 1 when negotiating the connection.
+.It Fl -no-verify-hostname
+[SSL]
+Do not verify that the hostname matches the subject of the
+certificate presented by the server.
+.It Fl -no-verify-peer
+[SSL]
+Do not verify the peer certificate against trusted CAs.
+.It Fl o Ar file , Fl output= Ns Ar file
 Set the output file name to
 .Ar file .
 By default, a ``pathname'' is extracted from the specified URI, and
@@ -163,36 +248,45 @@ If the
 argument is a directory, fetched file(s) will be placed within the
 directory, with name(s) selected as in the default behaviour.
 .It Fl P
-.It Fl p
+.It Fl p , -passive
 Use passive FTP.
 These flags have no effect, since passive FTP is the default, but are
 provided for compatibility with earlier versions where active FTP was
 the default.
-To force active mode, set the
+To force active mode, use the
+.Fl -no-passive
+flag or set the
 .Ev FTP_PASSIVE_MODE
 environment variable to
 .Ql NO .
-.It Fl q
+.It Fl -referer= Ns Ar URL
+Specifies the referrer URL to use for HTTP requests.
+If
+.Ar URL
+is set to
+.Dq auto ,
+the document URL will be used as referrer URL.
+.It Fl q , -quiet
 Quiet mode.
-.It Fl R
+.It Fl R , -keep-output
 The output files are precious, and should not be deleted under any
 circumstances, even if the transfer failed or was incomplete.
-.It Fl r
+.It Fl r , -restart
 Restart a previously interrupted transfer.
 Note that the
 .Fl m
 and
 .Fl r
 flags are mutually exclusive.
-.It Fl S Ar bytes
+.It Fl S Ar bytes , Fl -require-size= Ns Ar bytes
 Require the file size reported by the server to match the specified
 value.
 If it does not, a message is printed and the file is not fetched.
 If the server does not support reporting file sizes, this option is
 ignored and the file is fetched unconditionally.
-.It Fl s
+.It Fl s , -print-size
 Print the size in bytes of each requested file, without fetching it.
-.It Fl T Ar seconds
+.It Fl T Ar seconds , Fl -timeout= Ns Ar seconds
 Set timeout value to
 .Ar seconds .
 Overrides the environment variables
@@ -200,15 +294,19 @@ Overrides the environment variables
 for FTP transfers or
 .Ev HTTP_TIMEOUT
 for HTTP transfers if set.
-.It Fl U
+.It Fl U , -passive-portrange-default
 When using passive FTP, allocate the port for the data connection from
 the low (default) port range.
 See
 .Xr ip 4
 for details on how to specify which port range this corresponds to.
-.It Fl v
+.It Fl -user-agent= Ns Ar agent-string
+Specifies the User-Agent string to use for HTTP requests.
+This can be useful when working with HTTP origin or proxy servers that
+differentiate between user agents.
+.It Fl v , -verbose
 Increase verbosity level.
-.It Fl w Ar seconds
+.It Fl w Ar seconds , Fl -retry-delay= Ns Ar seconds
 When the
 .Fl a
 flag is specified, wait this many seconds between successive retries.
@@ -242,6 +340,7 @@ for a description of additional environment variables, including
 .Ev FTP_PASSWORD ,
 .Ev FTP_PROXY ,
 .Ev ftp_proxy ,
+.Ev HTTP_ACCEPT ,
 .Ev HTTP_AUTH ,
 .Ev HTTP_PROXY ,
 .Ev http_proxy ,
@@ -249,8 +348,19 @@ for a description of additional environment variables, including
 .Ev HTTP_REFERER ,
 .Ev HTTP_USER_AGENT ,
 .Ev NETRC ,
-.Ev NO_PROXY No and
-.Ev no_proxy .
+.Ev NO_PROXY ,
+.Ev no_proxy ,
+.Ev SSL_ALLOW_SSL2 ,
+.Ev SSL_CA_CERT_FILE ,
+.Ev SSL_CA_CERT_PATH ,
+.Ev SSL_CLIENT_CERT_FILE ,
+.Ev SSL_CLIENT_KEY_FILE ,
+.Ev SSL_CRL_FILE ,
+.Ev SSL_NO_SSL3 ,
+.Ev SSL_NO_TLS1 ,
+.Ev SSL_NO_VERIFY_HOSTNAME
+and
+.Ev SSL_NO_VERIFY_PEER .
 .Sh EXIT STATUS
 The
 .Nm
@@ -287,7 +397,9 @@ by
 and later completely rewritten to use the
 .Xr fetch 3
 library by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org
+and
+.An Michael Gmelin Aq freebsd@grem.de .
 .Sh NOTES
 The
 .Fl b
diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c
index d3e9b21..c61e88e 100644
--- a/usr.bin/fetch/fetch.c
+++ b/usr.bin/fetch/fetch.c
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2000-2011 Dag-Erling Smørgrav
+ * Copyright (c) 2013 Michael Gmelin <freebsd@grem.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#include <getopt.h>
 #include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -93,6 +95,78 @@ static long	 ftp_timeout = TIMEOUT;	/* default timeout for FTP transfers */
 static long	 http_timeout = TIMEOUT;/* default timeout for HTTP transfers */
 static char	*buf;		/* transfer buffer */
 
+enum options
+{
+	OPTION_BIND_ADDRESS,
+	OPTION_NO_FTP_PASSIVE_MODE,
+	OPTION_HTTP_REFERER,
+	OPTION_HTTP_USER_AGENT,
+	OPTION_NO_PROXY,
+	OPTION_SSL_ALLOW_SSL2,
+	OPTION_SSL_CA_CERT_FILE,
+	OPTION_SSL_CA_CERT_PATH,
+	OPTION_SSL_CLIENT_CERT_FILE,
+	OPTION_SSL_CLIENT_KEY_FILE,
+	OPTION_SSL_CRL_FILE,
+	OPTION_SSL_NO_SSL3,
+	OPTION_SSL_NO_TLS1,	
+	OPTION_SSL_NO_VERIFY_HOSTNAME,
+	OPTION_SSL_NO_VERIFY_PEER
+};
+
+
+static struct option longopts[] =
+{
+	/* mapping to single character argument */
+	{ "one-file", no_argument, NULL, '1' },
+	{ "ipv4-only", no_argument, NULL, '4' },
+	{ "ipv6-only", no_argument, NULL, '6' },
+	{ "no-redirect", no_argument, NULL, 'A' },
+	{ "retry", no_argument, NULL, 'a' },
+	{ "buffer-size", required_argument, NULL, 'B' },
+	/* -c not mapped, since it's deprecated */
+	{ "direct", no_argument, NULL, 'd' },
+	{ "force-restart", no_argument, NULL, 'F' },
+	/* -f not mapped, since it's deprecated */
+	/* -h not mapped, since it's deprecated */
+	{ "if-modified-since", required_argument, NULL, 'i' },
+	{ "symlink", no_argument, NULL, 'l' },
+	/* -M not mapped since it's the same as -m */
+	{ "mirror", no_argument, NULL, 'm' },
+	{ "netrc", required_argument, NULL, 'N' },
+	{ "no-mtime", no_argument, NULL, 'n' },
+	{ "output", required_argument, NULL, 'o' },
+	/* -P not mapped since it's the same as -p */
+	{ "passive", no_argument, NULL, 'p' },
+	{ "quiet", no_argument, NULL, 'q' },
+	{ "keep-output", no_argument, NULL, 'R' },
+	{ "restart", no_argument, NULL, 'r' },
+	{ "require-size", required_argument, NULL, 'S' },
+	{ "print-size", no_argument, NULL, 's' },
+	{ "timeout", required_argument, NULL, 'T' },
+	{ "passive-portrange-default", no_argument, NULL, 'T' },
+	{ "verbose", no_argument, NULL, 'v' },
+	{ "retry-delay", required_argument, NULL, 'w' },
+	
+	/* options without a single character equivalent */
+	{ "bind-address", required_argument, NULL, OPTION_BIND_ADDRESS },
+	{ "no-passive", no_argument, NULL, OPTION_NO_FTP_PASSIVE_MODE },
+	{ "referer", required_argument, NULL, OPTION_HTTP_REFERER },
+	{ "user-agent", required_argument, NULL, OPTION_HTTP_USER_AGENT },
+	{ "no-proxy", required_argument, NULL, OPTION_NO_PROXY },
+	{ "allow-sslv2", no_argument, NULL, OPTION_SSL_ALLOW_SSL2 },
+	{ "ca-cert", required_argument, NULL, OPTION_SSL_CA_CERT_FILE },
+	{ "ca-path", required_argument, NULL, OPTION_SSL_CA_CERT_PATH },
+	{ "cert", required_argument, NULL, OPTION_SSL_CLIENT_CERT_FILE },
+	{ "key", required_argument, NULL, OPTION_SSL_CLIENT_KEY_FILE },
+	{ "crl", required_argument, NULL, OPTION_SSL_CRL_FILE },
+	{ "no-sslv3", no_argument, NULL, OPTION_SSL_NO_SSL3 },
+	{ "no-tlsv1", no_argument, NULL, OPTION_SSL_NO_TLS1 },
+	{ "no-verify-hostname", no_argument, NULL, OPTION_SSL_NO_VERIFY_HOSTNAME },
+	{ "no-verify-peer", no_argument, NULL, OPTION_SSL_NO_VERIFY_PEER },
+
+	{ NULL, 0, NULL, 0 }
+};
 
 /*
  * Signal handler
@@ -565,7 +639,7 @@ fetch(char *URL, const char *path)
 				goto failure;
 			}
 			if (nsb.st_dev != sb.st_dev ||
-			    nsb.st_ino != nsb.st_ino ||
+			    nsb.st_ino != sb.st_ino ||
 			    nsb.st_size != sb.st_size) {
 				warnx("%s: file has changed", URL);
 				fclose(of);
@@ -769,11 +843,19 @@ fetch(char *URL, const char *path)
 static void
 usage(void)
 {
-	fprintf(stderr, "%s\n%s\n%s\n%s\n",
-"usage: fetch [-146AadFlMmnPpqRrsUv] [-B bytes] [-N file] [-o file] [-S bytes]",
-"       [-T seconds] [-w seconds] [-i file] URL ...",
-"       fetch [-146AadFlMmnPpqRrsUv] [-B bytes] [-N file] [-o file] [-S bytes]",
-"       [-T seconds] [-w seconds] [-i file] -h host -f file [-c dir]");
+	fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
+"usage: fetch [-146AadFlMmnPpqRrsUv] [--allow-sslv2] [-B bytes]",
+"       [--bind-address=host] [--ca-cert=file] [--ca-path=dir] [--cert=file]",
+"       [--crl=file] [-i file] [--key=file] [-N file] [--no-passive]",
+"       [--no-proxy=list] [--no-sslv3] [--no-tlsv1] [--no-verify-hostname]",
+"       [--no-verify-peer] [-o file] [--referer=URL] [-S bytes] [-T seconds]",
+"       [--user-agent=agent-string] [-w seconds] URL ...",
+"       fetch [-146AadFlMmnPpqRrsUv] [--allow-sslv2] [-B bytes]",
+"       [--bind-address=host] [--ca-cert=file] [--ca-path=dir] [--cert=file]",
+"       [--crl=file] [-i file] [--key=file] [-N file] [--no-passive]",
+"       [--no-proxy=list] [--no-sslv3] [--no-tlsv1] [--no-verify-hostname]",
+"       [--no-verify-peer] [-o file] [--referer=URL] [-S bytes] [-T seconds]",
+"       [--user-agent=agent-string] [-w seconds] -h host -f file [-c dir]");
 }
 
 
@@ -789,8 +871,10 @@ main(int argc, char *argv[])
 	char *end, *q;
 	int c, e, r;
 
-	while ((c = getopt(argc, argv,
-	    "146AaB:bc:dFf:Hh:i:lMmN:nPpo:qRrS:sT:tUvw:")) != -1)
+
+	while ((c = getopt_long(argc, argv,
+	    "146AaB:bc:dFf:Hh:i:lMmN:nPpo:qRrS:sT:tUvw:",
+	    longopts, NULL)) != -1)
 		switch (c) {
 		case '1':
 			once_flag = 1;
@@ -904,6 +988,51 @@ main(int argc, char *argv[])
 			if (*optarg == '\0' || *end != '\0')
 				errx(1, "invalid delay (%s)", optarg);
 			break;
+		case OPTION_BIND_ADDRESS:
+			setenv("FETCH_BIND_ADDRESS", optarg, 1);
+			break;
+		case OPTION_NO_FTP_PASSIVE_MODE:
+			setenv("FTP_PASSIVE_MODE", "no", 1);
+			break;
+		case OPTION_HTTP_REFERER:
+			setenv("HTTP_REFERER", optarg, 1);
+			break;
+		case OPTION_HTTP_USER_AGENT:
+			setenv("HTTP_USER_AGENT", optarg, 1);
+			break;
+		case OPTION_NO_PROXY:
+			setenv("NO_PROXY", optarg, 1);
+			break;
+		case OPTION_SSL_ALLOW_SSL2:
+			setenv("SSL_ALLOW_SSL2", "", 1);
+			break;
+		case OPTION_SSL_CA_CERT_FILE:
+			setenv("SSL_CA_CERT_FILE", optarg, 1);
+			break;
+		case OPTION_SSL_CA_CERT_PATH:
+			setenv("SSL_CA_CERT_PATH", optarg, 1);
+			break;
+		case OPTION_SSL_CLIENT_CERT_FILE:
+			setenv("SSL_CLIENT_CERT_FILE", optarg, 1);
+			break;
+		case OPTION_SSL_CLIENT_KEY_FILE:
+			setenv("SSL_CLIENT_KEY_FILE", optarg, 1);
+			break;
+		case OPTION_SSL_CRL_FILE:
+			setenv("SSL_CLIENT_CRL_FILE", optarg, 1);
+			break;
+		case OPTION_SSL_NO_SSL3:
+			setenv("SSL_NO_SSL3", "", 1);
+			break;
+		case OPTION_SSL_NO_TLS1:
+			setenv("SSL_NO_TLS1", "", 1);
+			break;
+		case OPTION_SSL_NO_VERIFY_HOSTNAME:
+			setenv("SSL_NO_VERIFY_HOSTNAME", "", 1);
+			break;
+		case OPTION_SSL_NO_VERIFY_PEER:
+			setenv("SSL_NO_VERIFY_PEER", "", 1);
+			break;
 		default:
 			usage();
 			exit(1);
diff --git a/usr.bin/find/Makefile b/usr.bin/find/Makefile
index 0c7bb70..cd10f12 100644
--- a/usr.bin/find/Makefile
+++ b/usr.bin/find/Makefile
@@ -6,4 +6,6 @@ SRCS=	find.c function.c ls.c main.c misc.c operator.c option.c \
 	getdate.y
 YFLAGS=
 
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index 7f16a8f..56d361c 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -442,7 +442,8 @@ f_delete(PLAN *plan __unused, FTSENT *entry)
 		errx(1, "-delete: forbidden when symlinks are followed");
 
 	/* Potentially unsafe - do not accept relative paths whatsoever */
-	if (strchr(entry->fts_accpath, '/') != NULL)
+	if (entry->fts_level > FTS_ROOTLEVEL &&
+	    strchr(entry->fts_accpath, '/') != NULL)
 		errx(1, "-delete: %s: relative path potentially not safe",
 			entry->fts_accpath);
 
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 7403a8e..268b70f 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -155,6 +155,8 @@ using a symbolic format (see
 otherwise, the mode is printed
 as an octal number.
 .It Li SZ\&|DV
+If the file is a semaphore,
+prints the current value of the semaphore.
 If the file is not a character or block special, prints the size of
 the file in bytes.
 Otherwise, if the
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 265791d..1aeee67 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -84,6 +84,8 @@ static void	print_pipe_info(struct procstat *procstat,
     struct filestat *fst);
 static void	print_pts_info(struct procstat *procstat,
     struct filestat *fst);
+static void	print_sem_info(struct procstat *procstat,
+    struct filestat *fst);
 static void	print_shm_info(struct procstat *procstat,
     struct filestat *fst);
 static void	print_socket_info(struct procstat *procstat,
@@ -294,6 +296,9 @@ print_file_info(struct procstat *procstat, struct filestat *fst,
 	case PS_FST_TYPE_SHM:
 		print_shm_info(procstat, fst);
 		break;
+	case PS_FST_TYPE_SEM:
+		print_sem_info(procstat, fst);
+		break;
 	default:	
 		if (vflg)
 			fprintf(stderr,
@@ -424,6 +429,30 @@ print_pts_info(struct procstat *procstat, struct filestat *fst)
 }
 
 static void
+print_sem_info(struct procstat *procstat, struct filestat *fst)
+{
+	struct semstat sem;
+	char errbuf[_POSIX2_LINE_MAX];
+	char mode[15];
+	int error;
+
+	error = procstat_get_sem_info(procstat, fst, &sem, errbuf);
+	if (error != 0) {
+		printf("* error");
+		return;
+	}
+	if (nflg) {
+		printf("             ");
+		(void)snprintf(mode, sizeof(mode), "%o", sem.mode);
+	} else {
+		printf(" %-15s", fst->fs_path != NULL ? fst->fs_path : "-");
+		strmode(sem.mode, mode);
+	}
+	printf(" %10s %6u", mode, sem.value);
+	print_access_flags(fst->fs_fflags);
+}
+
+static void
 print_shm_info(struct procstat *procstat, struct filestat *fst)
 {
 	struct shmstat shm;
diff --git a/usr.bin/gcore/Makefile b/usr.bin/gcore/Makefile
index e83a48f..0f37281 100644
--- a/usr.bin/gcore/Makefile
+++ b/usr.bin/gcore/Makefile
@@ -3,8 +3,8 @@
 
 PROG=	gcore
 SRCS=	elfcore.c gcore.c
-DPADD=	${LIBUTIL}
-LDADD=	-lutil
+DPADD=	${LIBSBUF} ${LIBUTIL}
+LDADD=	-lsbuf -lutil
 
 WARNS?=	1
 
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index 8228c57..20e801a 100644
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/ptrace.h>
 #include <sys/queue.h>
 #include <sys/linker_set.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
 #include <sys/wait.h>
@@ -41,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
+#include <assert.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -71,16 +73,33 @@ struct sseg_closure {
 	size_t size;		/* Total size of all writable segments. */
 };
 
+typedef void* (*notefunc_t)(void *, size_t *);
+
 static void cb_put_phdr(vm_map_entry_t, void *);
 static void cb_size_segment(vm_map_entry_t, void *);
 static void each_writable_segment(vm_map_entry_t, segment_callback,
     void *closure);
 static void elf_detach(void);	/* atexit() handler. */
-static void elf_puthdr(pid_t, vm_map_entry_t, void *, size_t *, int numsegs);
-static void elf_putnote(void *dst, size_t *off, const char *name, int type,
-    const void *desc, size_t descsz);
+static void *elf_note_fpregset(void *, size_t *);
+static void *elf_note_prpsinfo(void *, size_t *);
+static void *elf_note_prstatus(void *, size_t *);
+static void *elf_note_thrmisc(void *, size_t *);
+static void *elf_note_procstat_auxv(void *, size_t *);
+static void *elf_note_procstat_files(void *, size_t *);
+static void *elf_note_procstat_groups(void *, size_t *);
+static void *elf_note_procstat_osrel(void *, size_t *);
+static void *elf_note_procstat_proc(void *, size_t *);
+static void *elf_note_procstat_psstrings(void *, size_t *);
+static void *elf_note_procstat_rlimit(void *, size_t *);
+static void *elf_note_procstat_umask(void *, size_t *);
+static void *elf_note_procstat_vmmap(void *, size_t *);
+static void elf_puthdr(pid_t, vm_map_entry_t, void *, size_t, size_t, size_t,
+    int);
+static void elf_putnote(int, notefunc_t, void *, struct sbuf *);
+static void elf_putnotes(pid_t, struct sbuf *, size_t *);
 static void freemap(vm_map_entry_t);
 static vm_map_entry_t readmap(pid_t);
+static void *procstat_sysctl(void *, int, size_t, size_t *sizep);
 
 static pid_t g_pid;		/* Pid being dumped, global for elf_detach */
 
@@ -114,8 +133,10 @@ elf_coredump(int efd __unused, int fd, pid_t pid)
 {
 	vm_map_entry_t map;
 	struct sseg_closure seginfo;
+	struct sbuf *sb;
 	void *hdr;
-	size_t hdrsize;
+	size_t hdrsize, notesz, segoff;
+	ssize_t n, old_len;
 	Elf_Phdr *php;
 	int i;
 
@@ -139,27 +160,32 @@ elf_coredump(int efd __unused, int fd, pid_t pid)
 	each_writable_segment(map, cb_size_segment, &seginfo);
 
 	/*
-	 * Calculate the size of the core file header area by making
-	 * a dry run of generating it.  Nothing is written, but the
-	 * size is calculated.
+	 * Build the header and the notes using sbuf and write to the file.
 	 */
-	hdrsize = 0;
-	elf_puthdr(pid, map, NULL, &hdrsize, seginfo.count);
-
-	/*
-	 * Allocate memory for building the header, fill it up,
-	 * and write it out.
-	 */
-	if ((hdr = calloc(1, hdrsize)) == NULL)
-		errx(1, "out of memory");
-
+	sb = sbuf_new_auto();
+	hdrsize = sizeof(Elf_Ehdr) + sizeof(Elf_Phdr) * (1 + seginfo.count);
+	/* Start header + notes section. */
+	sbuf_start_section(sb, NULL);
+	/* Make empty header subsection. */
+	sbuf_start_section(sb, &old_len);
+	sbuf_putc(sb, 0);
+	sbuf_end_section(sb, old_len, hdrsize, 0);
+	/* Put notes. */
+	elf_putnotes(pid, sb, &notesz);
+	/* Align up to a page boundary for the program segments. */
+	sbuf_end_section(sb, -1, PAGE_SIZE, 0);
+	if (sbuf_finish(sb) != 0)
+		err(1, "sbuf_finish");
+	hdr = sbuf_data(sb);
+	segoff = sbuf_len(sb);
 	/* Fill in the header. */
-	hdrsize = 0;
-	elf_puthdr(pid, map, hdr, &hdrsize, seginfo.count);
+	elf_puthdr(pid, map, hdr, hdrsize, notesz, segoff, seginfo.count);
 
-	/* Write it to the core file. */
-	if (write(fd, hdr, hdrsize) == -1)
+	n = write(fd, hdr, segoff);
+	if (n == -1)
 		err(1, "write");
+	if (n < segoff)
+              errx(1, "short write");
 
 	/* Write the contents of all of the writable segments. */
 	php = (Elf_Phdr *)((char *)hdr + sizeof(Elf_Ehdr)) + 1;
@@ -195,7 +221,7 @@ elf_coredump(int efd __unused, int fd, pid_t pid)
 		}
 		php++;
 	}
-	free(hdr);
+	sbuf_delete(sb);
 	freemap(map);
 }
 
@@ -257,209 +283,136 @@ each_writable_segment(vm_map_entry_t map, segment_callback func, void *closure)
 }
 
 static void
-elf_getstatus(pid_t pid, prpsinfo_t *psinfo)
-{
-	struct kinfo_proc kobj;
-	int name[4];
-	size_t len;
-
-	name[0] = CTL_KERN;
-	name[1] = KERN_PROC;
-	name[2] = KERN_PROC_PID;
-	name[3] = pid;
-
-	len = sizeof(kobj);
-	if (sysctl(name, 4, &kobj, &len, NULL, 0) == -1)
-		err(1, "error accessing kern.proc.pid.%u sysctl", pid);
-	if (kobj.ki_pid != pid)
-		err(1, "error accessing kern.proc.pid.%u sysctl datas", pid);
-	strncpy(psinfo->pr_fname, kobj.ki_comm, MAXCOMLEN);
-	strncpy(psinfo->pr_psargs, psinfo->pr_fname, PRARGSZ);
-}
-
-/*
- * Generate the ELF coredump header into the buffer at "dst".  "dst" may
- * be NULL, in which case the header is sized but not actually generated.
- */
-static void
-elf_puthdr(pid_t pid, vm_map_entry_t map, void *dst, size_t *off, int numsegs)
+elf_putnotes(pid_t pid, struct sbuf *sb, size_t *sizep)
 {
-	struct ptrace_lwpinfo lwpinfo;
-	struct {
-		prstatus_t status;
-		prfpregset_t fpregset;
-		prpsinfo_t psinfo;
-		thrmisc_t thrmisc;
-	} *tempdata;
-	size_t ehoff;
-	size_t phoff;
-	size_t noteoff;
-	size_t notesz;
-	size_t threads;
 	lwpid_t *tids;
+	size_t threads, old_len;
+	ssize_t size;
 	int i;
 
-	prstatus_t *status;
-	prfpregset_t *fpregset;
-	prpsinfo_t *psinfo;
-	thrmisc_t *thrmisc;
-
-	ehoff = *off;
-	*off += sizeof(Elf_Ehdr);
-
-	phoff = *off;
-	*off += (numsegs + 1) * sizeof(Elf_Phdr);
-
-	noteoff = *off;
-
-	if (dst != NULL) {
-		if ((tempdata = calloc(1, sizeof(*tempdata))) == NULL)
-			errx(1, "out of memory");
-		status = &tempdata->status;
-		fpregset = &tempdata->fpregset;
-		psinfo = &tempdata->psinfo;
-		thrmisc = &tempdata->thrmisc;
-	} else {
-		tempdata = NULL;
-		status = NULL;
-		fpregset = NULL;
-		psinfo = NULL;
-		thrmisc = NULL;
-	}
-
 	errno = 0;
 	threads = ptrace(PT_GETNUMLWPS, pid, NULL, 0);
 	if (errno)
 		err(1, "PT_GETNUMLWPS");
+	tids = malloc(threads * sizeof(*tids));
+	if (tids == NULL)
+		errx(1, "out of memory");
+	errno = 0;
+	ptrace(PT_GETLWPLIST, pid, (void *)tids, threads);
+	if (errno)
+		err(1, "PT_GETLWPLIST");
 
-	if (dst != NULL) {
-		psinfo->pr_version = PRPSINFO_VERSION;
-		psinfo->pr_psinfosz = sizeof(prpsinfo_t);
-		elf_getstatus(pid, psinfo);
-
-	}
-	elf_putnote(dst, off, "FreeBSD", NT_PRPSINFO, psinfo,
-	    sizeof *psinfo);
+	sbuf_start_section(sb, &old_len);
+	elf_putnote(NT_PRPSINFO, elf_note_prpsinfo, &pid, sb);
 
-	if (dst != NULL) {
-		tids = malloc(threads * sizeof(*tids));
-		if (tids == NULL)
-			errx(1, "out of memory");
-		errno = 0;
-		ptrace(PT_GETLWPLIST, pid, (void *)tids, threads);
-		if (errno)
-			err(1, "PT_GETLWPLIST");
-	}
 	for (i = 0; i < threads; ++i) {
-		if (dst != NULL) {
-			status->pr_version = PRSTATUS_VERSION;
-			status->pr_statussz = sizeof(prstatus_t);
-			status->pr_gregsetsz = sizeof(gregset_t);
-			status->pr_fpregsetsz = sizeof(fpregset_t);
-			status->pr_osreldate = __FreeBSD_version;
-			status->pr_pid = tids[i];
-
-			ptrace(PT_GETREGS, tids[i], (void *)&status->pr_reg, 0);
-			ptrace(PT_GETFPREGS, tids[i], (void *)fpregset, 0);
-			ptrace(PT_LWPINFO, tids[i], (void *)&lwpinfo,
-			    sizeof(lwpinfo));
-			memset(&thrmisc->_pad, 0, sizeof(thrmisc->_pad));
-			strcpy(thrmisc->pr_tname, lwpinfo.pl_tdname);
-		}
-		elf_putnote(dst, off, "FreeBSD", NT_PRSTATUS, status,
-		    sizeof *status);
-		elf_putnote(dst, off, "FreeBSD", NT_FPREGSET, fpregset,
-		    sizeof *fpregset);
-		elf_putnote(dst, off, "FreeBSD", NT_THRMISC, thrmisc,
-		    sizeof *thrmisc);
-	}
-
-	notesz = *off - noteoff;
-
-	if (dst != NULL) {
-		free(tids);
-		free(tempdata);
+		elf_putnote(NT_PRSTATUS, elf_note_prstatus, tids + i, sb);
+		elf_putnote(NT_FPREGSET, elf_note_fpregset, tids + i, sb);
+		elf_putnote(NT_THRMISC, elf_note_thrmisc, tids + i, sb);
 	}
 
-	/* Align up to a page boundary for the program segments. */
-	*off = round_page(*off);
-
-	if (dst != NULL) {
-		Elf_Ehdr *ehdr;
-		Elf_Phdr *phdr;
-		struct phdr_closure phc;
-
-		/*
-		 * Fill in the ELF header.
-		 */
-		ehdr = (Elf_Ehdr *)((char *)dst + ehoff);
-		ehdr->e_ident[EI_MAG0] = ELFMAG0;
-		ehdr->e_ident[EI_MAG1] = ELFMAG1;
-		ehdr->e_ident[EI_MAG2] = ELFMAG2;
-		ehdr->e_ident[EI_MAG3] = ELFMAG3;
-		ehdr->e_ident[EI_CLASS] = ELF_CLASS;
-		ehdr->e_ident[EI_DATA] = ELF_DATA;
-		ehdr->e_ident[EI_VERSION] = EV_CURRENT;
-		ehdr->e_ident[EI_OSABI] = ELFOSABI_FREEBSD;
-		ehdr->e_ident[EI_ABIVERSION] = 0;
-		ehdr->e_ident[EI_PAD] = 0;
-		ehdr->e_type = ET_CORE;
-		ehdr->e_machine = ELF_ARCH;
-		ehdr->e_version = EV_CURRENT;
-		ehdr->e_entry = 0;
-		ehdr->e_phoff = phoff;
-		ehdr->e_flags = 0;
-		ehdr->e_ehsize = sizeof(Elf_Ehdr);
-		ehdr->e_phentsize = sizeof(Elf_Phdr);
-		ehdr->e_phnum = numsegs + 1;
-		ehdr->e_shentsize = sizeof(Elf_Shdr);
-		ehdr->e_shnum = 0;
-		ehdr->e_shstrndx = SHN_UNDEF;
-
-		/*
-		 * Fill in the program header entries.
-		 */
-		phdr = (Elf_Phdr *)((char *)dst + phoff);
-
-		/* The note segment. */
-		phdr->p_type = PT_NOTE;
-		phdr->p_offset = noteoff;
-		phdr->p_vaddr = 0;
-		phdr->p_paddr = 0;
-		phdr->p_filesz = notesz;
-		phdr->p_memsz = 0;
-		phdr->p_flags = 0;
-		phdr->p_align = 0;
-		phdr++;
-
-		/* All the writable segments from the program. */
-		phc.phdr = phdr;
-		phc.offset = *off;
-		each_writable_segment(map, cb_put_phdr, &phc);
-	}
+	elf_putnote(NT_PROCSTAT_PROC, elf_note_procstat_proc, &pid, sb);
+	elf_putnote(NT_PROCSTAT_FILES, elf_note_procstat_files, &pid, sb);
+	elf_putnote(NT_PROCSTAT_VMMAP, elf_note_procstat_vmmap, &pid, sb);
+	elf_putnote(NT_PROCSTAT_GROUPS, elf_note_procstat_groups, &pid, sb);
+	elf_putnote(NT_PROCSTAT_UMASK, elf_note_procstat_umask, &pid, sb);
+	elf_putnote(NT_PROCSTAT_RLIMIT, elf_note_procstat_rlimit, &pid, sb);
+	elf_putnote(NT_PROCSTAT_OSREL, elf_note_procstat_osrel, &pid, sb);
+	elf_putnote(NT_PROCSTAT_PSSTRINGS, elf_note_procstat_psstrings, &pid,
+	    sb);
+	elf_putnote(NT_PROCSTAT_AUXV, elf_note_procstat_auxv, &pid, sb);
+
+	size = sbuf_end_section(sb, old_len, 1, 0);
+	if (size == -1)
+		err(1, "sbuf_end_section");
+	free(tids);
+	*sizep = size;
 }
 
 /*
- * Emit one note section to "dst", or just size it if "dst" is NULL.
+ * Emit one note section to sbuf.
  */
 static void
-elf_putnote(void *dst, size_t *off, const char *name, int type,
-    const void *desc, size_t descsz)
+elf_putnote(int type, notefunc_t notefunc, void *arg, struct sbuf *sb)
 {
 	Elf_Note note;
+	size_t descsz;
+	ssize_t old_len;
+	void *desc;
 
-	note.n_namesz = strlen(name) + 1;
+	desc = notefunc(arg, &descsz);
+	note.n_namesz = 8; /* strlen("FreeBSD") + 1 */
 	note.n_descsz = descsz;
 	note.n_type = type;
-	if (dst != NULL)
-		bcopy(&note, (char *)dst + *off, sizeof note);
-	*off += sizeof note;
-	if (dst != NULL)
-		bcopy(name, (char *)dst + *off, note.n_namesz);
-	*off += roundup2(note.n_namesz, sizeof(Elf_Size));
-	if (dst != NULL)
-		bcopy(desc, (char *)dst + *off, note.n_descsz);
-	*off += roundup2(note.n_descsz, sizeof(Elf_Size));
+
+	sbuf_bcat(sb, &note, sizeof(note));
+	sbuf_start_section(sb, &old_len);
+	sbuf_bcat(sb, "FreeBSD", note.n_namesz);
+	sbuf_end_section(sb, old_len, sizeof(Elf32_Size), 0);
+	if (descsz == 0)
+		return;
+	sbuf_start_section(sb, &old_len);
+	sbuf_bcat(sb, desc, descsz);
+	sbuf_end_section(sb, old_len, sizeof(Elf32_Size), 0);
+	free(desc);
+}
+
+/*
+ * Generate the ELF coredump header.
+ */
+static void
+elf_puthdr(pid_t pid, vm_map_entry_t map, void *hdr, size_t hdrsize,
+    size_t notesz, size_t segoff, int numsegs)
+{
+	Elf_Ehdr *ehdr;
+	Elf_Phdr *phdr;
+	struct phdr_closure phc;
+
+	ehdr = (Elf_Ehdr *)hdr;
+	phdr = (Elf_Phdr *)((char *)hdr + sizeof(Elf_Ehdr));
+
+	ehdr->e_ident[EI_MAG0] = ELFMAG0;
+	ehdr->e_ident[EI_MAG1] = ELFMAG1;
+	ehdr->e_ident[EI_MAG2] = ELFMAG2;
+	ehdr->e_ident[EI_MAG3] = ELFMAG3;
+	ehdr->e_ident[EI_CLASS] = ELF_CLASS;
+	ehdr->e_ident[EI_DATA] = ELF_DATA;
+	ehdr->e_ident[EI_VERSION] = EV_CURRENT;
+	ehdr->e_ident[EI_OSABI] = ELFOSABI_FREEBSD;
+	ehdr->e_ident[EI_ABIVERSION] = 0;
+	ehdr->e_ident[EI_PAD] = 0;
+	ehdr->e_type = ET_CORE;
+	ehdr->e_machine = ELF_ARCH;
+	ehdr->e_version = EV_CURRENT;
+	ehdr->e_entry = 0;
+	ehdr->e_phoff = sizeof(Elf_Ehdr);
+	ehdr->e_flags = 0;
+	ehdr->e_ehsize = sizeof(Elf_Ehdr);
+	ehdr->e_phentsize = sizeof(Elf_Phdr);
+	ehdr->e_phnum = numsegs + 1;
+	ehdr->e_shentsize = sizeof(Elf_Shdr);
+	ehdr->e_shnum = 0;
+	ehdr->e_shstrndx = SHN_UNDEF;
+
+	/*
+	 * Fill in the program header entries.
+	 */
+
+	/* The note segement. */
+	phdr->p_type = PT_NOTE;
+	phdr->p_offset = hdrsize;
+	phdr->p_vaddr = 0;
+	phdr->p_paddr = 0;
+	phdr->p_filesz = notesz;
+	phdr->p_memsz = 0;
+	phdr->p_flags = PF_R;
+	phdr->p_align = sizeof(Elf32_Size);
+	phdr++;
+
+	/* All the writable segments from the program. */
+	phc.phdr = phdr;
+	phc.offset = segoff;
+	each_writable_segment(map, cb_put_phdr, &phc);
 }
 
 /*
@@ -530,5 +483,222 @@ readmap(pid_t pid)
 	return (map);
 }
 
+/*
+ * Miscellaneous note out functions.
+ */
+
+static void *
+elf_note_prpsinfo(void *arg, size_t *sizep)
+{
+	pid_t pid;
+	prpsinfo_t *psinfo;
+	struct kinfo_proc kip;
+	size_t len;
+	int name[4];
+
+	pid = *(pid_t *)arg;
+	psinfo = calloc(1, sizeof(*psinfo));
+	if (psinfo == NULL)
+		errx(1, "out of memory");
+	psinfo->pr_version = PRPSINFO_VERSION;
+	psinfo->pr_psinfosz = sizeof(prpsinfo_t);
+
+	name[0] = CTL_KERN;
+	name[1] = KERN_PROC;
+	name[2] = KERN_PROC_PID;
+	name[3] = pid;
+	len = sizeof(kip);
+	if (sysctl(name, 4, &kip, &len, NULL, 0) == -1)
+		err(1, "kern.proc.pid.%u", pid);
+	if (kip.ki_pid != pid)
+		err(1, "kern.proc.pid.%u", pid);
+	strncpy(psinfo->pr_fname, kip.ki_comm, MAXCOMLEN);
+	strncpy(psinfo->pr_psargs, psinfo->pr_fname, PRARGSZ);
+
+	*sizep = sizeof(*psinfo);
+	return (psinfo);
+}
+
+static void *
+elf_note_prstatus(void *arg, size_t *sizep)
+{
+	lwpid_t tid;
+	prstatus_t *status;
+
+	tid = *(lwpid_t *)arg;
+	status = calloc(1, sizeof(*status));
+	if (status == NULL)
+		errx(1, "out of memory");
+	status->pr_version = PRSTATUS_VERSION;
+	status->pr_statussz = sizeof(prstatus_t);
+	status->pr_gregsetsz = sizeof(gregset_t);
+	status->pr_fpregsetsz = sizeof(fpregset_t);
+	status->pr_osreldate = __FreeBSD_version;
+	status->pr_pid = tid;
+	ptrace(PT_GETREGS, tid, (void *)&status->pr_reg, 0);
+
+	*sizep = sizeof(*status);
+	return (status);
+}
+
+static void *
+elf_note_fpregset(void *arg, size_t *sizep)
+{
+	lwpid_t tid;
+	prfpregset_t *fpregset;
+
+	tid = *(lwpid_t *)arg;
+	fpregset = calloc(1, sizeof(*fpregset));
+	if (fpregset == NULL)
+		errx(1, "out of memory");
+	ptrace(PT_GETFPREGS, tid, (void *)fpregset, 0);
+
+	*sizep = sizeof(*fpregset);
+	return (fpregset);
+}
+
+static void *
+elf_note_thrmisc(void *arg, size_t *sizep)
+{
+	lwpid_t tid;
+	struct ptrace_lwpinfo lwpinfo;
+	thrmisc_t *thrmisc;
+
+	tid = *(lwpid_t *)arg;
+	thrmisc = calloc(1, sizeof(*thrmisc));
+	if (thrmisc == NULL)
+		errx(1, "out of memory");
+	ptrace(PT_LWPINFO, tid, (void *)&lwpinfo,
+	    sizeof(lwpinfo));
+	memset(&thrmisc->_pad, 0, sizeof(thrmisc->_pad));
+	strcpy(thrmisc->pr_tname, lwpinfo.pl_tdname);
+
+	*sizep = sizeof(*thrmisc);
+	return (thrmisc);
+}
+
+static void *
+procstat_sysctl(void *arg, int what, size_t structsz, size_t *sizep)
+{
+	size_t len, oldlen;
+	pid_t pid;
+	int name[4], structsize;
+	void *buf, *p;
+
+	pid = *(pid_t *)arg;
+	structsize = structsz;
+	name[0] = CTL_KERN;
+	name[1] = KERN_PROC;
+	name[2] = what;
+	name[3] = pid;
+	len = 0;
+	if (sysctl(name, 4, NULL, &len, NULL, 0) == -1)
+		err(1, "kern.proc.%d.%u", what, pid);
+	buf = calloc(1, sizeof(structsize) + len * 4 / 3);
+	if (buf == NULL)
+		errx(1, "out of memory");
+	bcopy(&structsize, buf, sizeof(structsize));
+	p = (char *)buf + sizeof(structsize);
+	if (sysctl(name, 4, p, &len, NULL, 0) == -1)
+		err(1, "kern.proc.%d.%u", what, pid);
+
+	*sizep = sizeof(structsize) + len;
+	return (buf);
+}
+
+static void *
+elf_note_procstat_proc(void *arg, size_t *sizep)
+{
+
+	return (procstat_sysctl(arg, KERN_PROC_PID | KERN_PROC_INC_THREAD,
+	    sizeof(struct kinfo_proc), sizep));
+}
+
+static void *
+elf_note_procstat_files(void *arg, size_t *sizep)
+{
+
+	return (procstat_sysctl(arg, KERN_PROC_FILEDESC,
+	    sizeof(struct kinfo_file), sizep));
+}
+
+static void *
+elf_note_procstat_vmmap(void *arg, size_t *sizep)
+{
+
+	return (procstat_sysctl(arg, KERN_PROC_VMMAP,
+	    sizeof(struct kinfo_vmentry), sizep));
+}
+
+static void *
+elf_note_procstat_groups(void *arg, size_t *sizep)
+{
+
+	return (procstat_sysctl(arg, KERN_PROC_GROUPS, sizeof(gid_t), sizep));
+}
+
+static void *
+elf_note_procstat_umask(void *arg, size_t *sizep)
+{
+
+	return (procstat_sysctl(arg, KERN_PROC_UMASK, sizeof(u_short), sizep));
+}
+
+static void *
+elf_note_procstat_osrel(void *arg, size_t *sizep)
+{
+
+	return (procstat_sysctl(arg, KERN_PROC_OSREL, sizeof(int), sizep));
+}
+
+static void *
+elf_note_procstat_psstrings(void *arg, size_t *sizep)
+{
+
+	return (procstat_sysctl(arg, KERN_PROC_PS_STRINGS,
+	    sizeof(vm_offset_t), sizep));
+}
+
+static void *
+elf_note_procstat_auxv(void *arg, size_t *sizep)
+{
+
+	return (procstat_sysctl(arg, KERN_PROC_AUXV,
+	    sizeof(Elf_Auxinfo), sizep));
+}
+
+static void *
+elf_note_procstat_rlimit(void *arg, size_t *sizep)
+{
+	pid_t pid;
+	size_t len;
+	int i, name[5], structsize;
+	void *buf, *p;
+
+	pid = *(pid_t *)arg;
+	structsize = sizeof(struct rlimit) * RLIM_NLIMITS;
+	buf = calloc(1, sizeof(structsize) + structsize);
+	if (buf == NULL)
+		errx(1, "out of memory");
+	bcopy(&structsize, buf, sizeof(structsize));
+	p = (char *)buf + sizeof(structsize);
+	name[0] = CTL_KERN;
+	name[1] = KERN_PROC;
+	name[2] = KERN_PROC_RLIMIT;
+	name[3] = pid;
+	len = sizeof(struct rlimit);
+	for (i = 0; i < RLIM_NLIMITS; i++) {
+		name[4] = i;
+		if (sysctl(name, 5, p, &len, NULL, 0) == -1)
+			err(1, "kern.proc.rlimit.%u", pid);
+		if (len != sizeof(struct rlimit))
+			errx(1, "kern.proc.rlimit.%u: short read", pid);
+		p += len;
+	}
+
+	*sizep = sizeof(structsize) + structsize;
+	return (buf);
+}
+
 struct dumpers elfdump = { elf_ident, elf_coredump };
 TEXT_SET(dumpset, elfdump);
diff --git a/usr.bin/getent/getent.c b/usr.bin/getent/getent.c
index 7424577..89c58a2 100644
--- a/usr.bin/getent/getent.c
+++ b/usr.bin/getent/getent.c
@@ -61,6 +61,7 @@ static int	parsenum(const char *, unsigned long *);
 static int	ethers(int, char *[]);
 static int	group(int, char *[]);
 static int	hosts(int, char *[]);
+static int	netgroup(int, char *[]);
 static int	networks(int, char *[]);
 static int	passwd(int, char *[]);
 static int	protocols(int, char *[]);
@@ -89,6 +90,7 @@ static struct getentdb {
 	{	"rpc",		rpc,		},
 	{	"services",	services,	},
 	{	"shells",	shells,		},
+	{	"netgroup",	netgroup,	},
 	{	"utmpx",	utmpx,		},
 
 	{	NULL,		NULL,		},
@@ -571,6 +573,47 @@ shells(int argc, char *argv[])
 }
 
 /*
+ * netgroup
+ */
+static int
+netgroup(int argc, char *argv[])
+{
+	char		*host, *user, *domain;
+	int		first;
+	int		rv, i;
+
+	assert(argc > 1);
+	assert(argv != NULL);
+
+#define NETGROUPPRINT(s)	(((s) != NULL) ? (s) : "")
+
+	rv = RV_OK;
+	if (argc == 2) {
+		fprintf(stderr, "Enumeration not supported on netgroup\n");
+		rv = RV_NOENUM;
+	} else {
+		for (i = 2; i < argc; i++) {
+			setnetgrent(argv[i]);
+			first = 1;
+			while (getnetgrent(&host, &user, &domain) != 0) {
+				if (first) {
+					first = 0;
+					(void)fputs(argv[i], stdout);
+				}
+				(void)printf(" (%s,%s,%s)",
+				    NETGROUPPRINT(host),
+				    NETGROUPPRINT(user),
+				    NETGROUPPRINT(domain));
+			}
+			if (!first)
+				(void)putchar('\n');
+			endnetgrent();
+		}
+	}
+	return rv;
+}
+
+/*
  * utmpx
  */
 
diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile
index 359954b..8b2fa0c 100644
--- a/usr.bin/grep/Makefile
+++ b/usr.bin/grep/Makefile
@@ -74,7 +74,7 @@ CFLAGS+= -DWITHOUT_BZIP2
 .endif
 
 .if !defined(WITHOUT_GNU_COMPAT)
-CFLAGS+= -I/usr/include/gnu
+CFLAGS+= -I${DESTDIR}/usr/include/gnu
 LDADD+=	-lgnuregex
 DPADD+=	${LIBGNUREGEX}
 .endif
diff --git a/usr.bin/grep/regex/tre-fastmatch.c b/usr.bin/grep/regex/tre-fastmatch.c
index b7a7c91..4b58900 100644
--- a/usr.bin/grep/regex/tre-fastmatch.c
+++ b/usr.bin/grep/regex/tre-fastmatch.c
@@ -395,7 +395,7 @@ static int	fastcmp(const fastmatch_t *fg, const void *data,
 	    if (p == NULL)						\
 	      return REG_ESPACE;					\
 	    for (unsigned int i = 0; i < plen; i++)			\
-	      p[i] = tolower(pat[i]);					\
+	      p[i] = tolower((unsigned char)pat[i]);                    \
 	    _CALC_BMGS(arr, p, plen);					\
 	    xfree(p);							\
 	  }								\
@@ -1030,7 +1030,7 @@ fastcmp(const fastmatch_t *fg, const void *data, tre_str_type_t type)
 	    continue;
 
 	  /* Compare */
-	  if (fg->icase ? (tolower(pat_byte[i]) == tolower(str_byte[i]))
+	  if (fg->icase ? (tolower((unsigned char)pat_byte[i]) == tolower((unsigned char)str_byte[i]))
 		    : (pat_byte[i] == str_byte[i]))
 	  continue;
       }
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index e2909e1..d168a92 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -15,7 +15,7 @@ SRCS+=		dighost.c host.c
 CFLAGS+=	-I${SRCDIR}/include
 CFLAGS+=	-I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include
 
-WARNS?=		1
+WARNS?=		0
 
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
diff --git a/usr.bin/iconv/iconv.c b/usr.bin/iconv/iconv.c
index 0da65a0..77dd11a 100644
--- a/usr.bin/iconv/iconv.c
+++ b/usr.bin/iconv/iconv.c
@@ -47,8 +47,7 @@ static void		 do_conv(FILE *, const char *, const char *, bool, bool);
 static int		 do_list(unsigned int, const char * const *, void *);
 static void		 usage(void);
 
-struct option long_options[] =
-{
+static struct option long_options[] = {
 	{"from-code",		required_argument,	NULL, 'f'},
 	{"list",		no_argument,		NULL, 'l'},
 	{"silent",		no_argument,		NULL, 's'},
@@ -75,7 +74,7 @@ do_conv(FILE *fp, const char *from, const char *to, bool silent,
 {
 	iconv_t cd;
 	char inbuf[INBUFSIZE], outbuf[OUTBUFSIZE], *out;
-	char *in;
+	const char *in;
 	size_t inbytes, outbytes, ret;
 
 	if ((cd = iconv_open(to, from)) == (iconv_t)-1)
diff --git a/usr.bin/indent/Makefile b/usr.bin/indent/Makefile
index 8d9ff94..dcd7e39 100644
--- a/usr.bin/indent/Makefile
+++ b/usr.bin/indent/Makefile
@@ -1,6 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	indent
 SRCS=	indent.c io.c lexi.c parse.c pr_comment.c args.c
 
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index 82317f2..0de183c 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -46,6 +46,7 @@ extern int errno;
 #include <sys/errno.h>
 #undef _KERNEL
 #include <sys/param.h>
+#include <sys/capability.h>
 #include <sys/errno.h>
 #define _KERNEL
 #include <sys/time.h>
@@ -73,10 +74,13 @@ extern int errno;
 #include <grp.h>
 #include <inttypes.h>
 #include <locale.h>
+#include <netdb.h>
+#include <nl_types.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <termios.h>
 #include <time.h>
 #include <unistd.h>
 #include <vis.h>
@@ -99,12 +103,14 @@ void ktrcsw_old(struct ktr_csw_old *);
 void ktruser_malloc(unsigned char *);
 void ktruser_rtld(int, unsigned char *);
 void ktruser(int, unsigned char *);
+void ktrcaprights(cap_rights_t *);
 void ktrsockaddr(struct sockaddr *);
 void ktrstat(struct stat *);
 void ktrstruct(char *, size_t);
 void ktrcapfail(struct ktr_cap_fail *);
 void ktrfault(struct ktr_fault *);
 void ktrfaultend(struct ktr_faultend *);
+void limitfd(int fd);
 void usage(void);
 void ioctlname(unsigned long, int);
 
@@ -160,6 +166,31 @@ struct proc_info
 
 TAILQ_HEAD(trace_procs, proc_info) trace_procs;
 
+static void
+strerror_init(void)
+{
+
+	/*
+	 * Cache NLS data before entering capability mode.
+	 * XXXPJD: There should be strerror_init() and strsignal_init() in libc.
+	 */
+	(void)catopen("libc", NL_CAT_LOCALE);
+}
+
+static void
+localtime_init(void)
+{
+	time_t ltime;
+
+	/*
+	 * Allow localtime(3) to cache /etc/localtime content before entering
+	 * capability mode.
+	 * XXXPJD: There should be localtime_init() in libc.
+	 */
+	(void)time(&ltime);
+	(void)localtime(&ltime);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -230,6 +261,18 @@ main(int argc, char *argv[])
 		errx(1, "%s", strerror(ENOMEM));
 	if (!freopen(tracefile, "r", stdin))
 		err(1, "%s", tracefile);
+
+	strerror_init();
+	localtime_init();
+
+	if (resolv == 0) {
+		if (cap_enter() < 0 && errno != ENOSYS)
+			err(1, "unable to enter capability mode");
+	}
+	limitfd(STDIN_FILENO);
+	limitfd(STDOUT_FILENO);
+	limitfd(STDERR_FILENO);
+
 	TAILQ_INIT(&trace_procs);
 	drop_logged = 0;
 	while (fread_tail(&ktr_header, sizeof(struct ktr_header), 1)) {
@@ -331,6 +374,40 @@ main(int argc, char *argv[])
 	return 0;
 }
 
+void
+limitfd(int fd)
+{
+	cap_rights_t rights;
+	unsigned long cmd;
+
+	cap_rights_init(&rights, CAP_FSTAT);
+	cmd = -1;
+
+	switch (fd) {
+	case STDIN_FILENO:
+		cap_rights_set(&rights, CAP_READ);
+		break;
+	case STDOUT_FILENO:
+		cap_rights_set(&rights, CAP_IOCTL, CAP_WRITE);
+		cmd = TIOCGETA;	/* required by isatty(3) in printf(3) */
+		break;
+	case STDERR_FILENO:
+		cap_rights_set(&rights, CAP_WRITE);
+		if (!suppressdata) {
+			cap_rights_set(&rights, CAP_IOCTL);
+			cmd = TIOCGWINSZ;
+		}
+		break;
+	default:
+		abort();
+	}
+
+	if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS)
+		err(1, "unable to limit rights for descriptor %d", fd);
+	if (cmd != -1 && cap_ioctls_limit(fd, &cmd, 1) < 0 && errno != ENOSYS)
+		err(1, "unable to limit ioctls for descriptor %d", fd);
+}
+
 int
 fread_tail(void *buf, int size, int num)
 {
@@ -530,6 +607,29 @@ ktrsyscall(struct ktr_syscall *ktr, u_int flags)
 		if (fancy &&
 		    (flags == 0 || (flags & SV_ABI_MASK) == SV_ABI_FREEBSD)) {
 			switch (ktr->ktr_code) {
+			case SYS_bindat:
+			case SYS_connectat:
+			case SYS_faccessat:
+			case SYS_fchmodat:
+			case SYS_fchownat:
+			case SYS_fstatat:
+			case SYS_futimesat:
+			case SYS_linkat:
+			case SYS_mkdirat:
+			case SYS_mkfifoat:
+			case SYS_mknodat:
+			case SYS_openat:
+			case SYS_readlinkat:
+			case SYS_renameat:
+			case SYS_unlinkat:
+				putchar('(');
+				atfdname(*ip, decimal);
+				c = ',';
+				ip++;
+				narg--;
+				break;
+			}
+			switch (ktr->ktr_code) {
 			case SYS_ioctl: {
 				print_number(ip, narg, c);
 				putchar(c);
@@ -548,6 +648,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_int flags)
 				break;
 			case SYS_access:
 			case SYS_eaccess:
+			case SYS_faccessat:
 				print_number(ip, narg, c);
 				putchar(',');
 				accessmodename(*ip);
@@ -555,6 +656,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_int flags)
 				narg--;
 				break;
 			case SYS_open:
+			case SYS_openat:
 				print_number(ip, narg, c);
 				putchar(',');
 				flagsandmodename(ip[0], ip[1], decimal);
@@ -579,6 +681,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_int flags)
 				narg--;
 				break;
 			case SYS_mknod:
+			case SYS_mknodat:
 				print_number(ip, narg, c);
 				putchar(',');
 				modename(*ip);
@@ -728,7 +831,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_int flags)
 				ip++;
 				narg--;
 				putchar(',');
-				socktypename(*ip);
+				socktypenamewithflags(*ip);
 				ip++;
 				narg--;
 				if (sockdomain == PF_INET ||
@@ -784,7 +887,9 @@ ktrsyscall(struct ktr_syscall *ktr, u_int flags)
 				narg--;
 				break;
 			case SYS_mkfifo:
+			case SYS_mkfifoat:
 			case SYS_mkdir:
+			case SYS_mkdirat:
 				print_number(ip, narg, c);
 				putchar(',');
 				modename(*ip);
@@ -804,7 +909,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_int flags)
 				ip++;
 				narg--;
 				putchar(',');
-				socktypename(*ip);
+				socktypenamewithflags(*ip);
 				ip++;
 				narg--;
 				c = ',';
@@ -1007,34 +1112,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_int flags)
 				ip++;
 				narg--;
 				break;
-			case SYS_cap_new:
-			case SYS_cap_rights_limit:
+			case SYS_linkat:
+			case SYS_renameat:
+			case SYS_symlinkat:
 				print_number(ip, narg, c);
 				putchar(',');
-				arg = *ip;
+				atfdname(*ip, decimal);
 				ip++;
 				narg--;
-				/*
-				 * Hack: the second argument is a
-				 * cap_rights_t, which 64 bits wide, so on
-				 * 32-bit systems, it is split between two
-				 * registers.
-				 *
-				 * Since sizeof() is not evaluated by the
-				 * preprocessor, we can't use an #ifdef,
-				 * but the compiler will probably optimize
-				 * the code out anyway.
-				 */
-				if (sizeof(cap_rights_t) > sizeof(register_t)) {
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-					arg = ((intmax_t)*ip << 32) + arg;
-#else
-					arg = (arg << 32) + *ip;
-#endif
-					ip++;
-					narg--;
-				}
-				capname(arg);
 				break;
 			case SYS_cap_fcntls_limit:
 				print_number(ip, narg, c);
@@ -1205,6 +1290,11 @@ ktrgenio(struct ktr_genio *ktr, int len)
 	static int screenwidth = 0;
 	int i, binary;
 
+	printf("fd %d %s %d byte%s\n", ktr->ktr_fd,
+		ktr->ktr_rw == UIO_READ ? "read" : "wrote", datalen,
+		datalen == 1 ? "" : "s");
+	if (suppressdata)
+		return;
 	if (screenwidth == 0) {
 		struct winsize ws;
 
@@ -1214,11 +1304,6 @@ ktrgenio(struct ktr_genio *ktr, int len)
 		else
 			screenwidth = 80;
 	}
-	printf("fd %d %s %d byte%s\n", ktr->ktr_fd,
-		ktr->ktr_rw == UIO_READ ? "read" : "wrote", datalen,
-		datalen == 1 ? "" : "s");
-	if (suppressdata)
-		return;
 	if (maxdata && datalen > maxdata)
 		datalen = maxdata;
 
@@ -1423,12 +1508,23 @@ ktruser(int len, unsigned char *p)
 }
 
 void
+ktrcaprights(cap_rights_t *rightsp)
+{
+
+	printf("cap_rights_t ");
+	capname(rightsp);
+	printf("\n");
+}
+
+void
 ktrsockaddr(struct sockaddr *sa)
 {
 /*
  TODO: Support additional address families
 	#include <netnatm/natm.h>
 	struct sockaddr_natm	*natm;
+	#include <netsmb/netbios.h>
+	struct sockaddr_nb	*nb;
 */
 	char addr[64];
 
@@ -1479,7 +1575,8 @@ ktrsockaddr(struct sockaddr *sa)
 		memset(&sa_in6, 0, sizeof(sa_in6));
 		memcpy(&sa_in6, sa, sa->sa_len);
 		check_sockaddr_len(in6);
-		inet_ntop(AF_INET6, &sa_in6.sin6_addr, addr, sizeof addr);
+		getnameinfo((struct sockaddr *)&sa_in6, sizeof(sa_in6),
+		    addr, sizeof(addr), NULL, 0, NI_NUMERICHOST);
 		printf("[%s]:%u", addr, htons(sa_in6.sin6_port));
 		break;
 	}
@@ -1596,6 +1693,7 @@ ktrstruct(char *buf, size_t buflen)
 	char *name, *data;
 	size_t namelen, datalen;
 	int i;
+	cap_rights_t rights;
 	struct stat sb;
 	struct sockaddr_storage ss;
 
@@ -1615,7 +1713,12 @@ ktrstruct(char *buf, size_t buflen)
 	for (i = 0; i < (int)namelen; ++i)
 		if (!isalpha(name[i]))
 			goto invalid;
-	if (strcmp(name, "stat") == 0) {
+	if (strcmp(name, "caprights") == 0) {
+		if (datalen != sizeof(cap_rights_t))
+			goto invalid;
+		memcpy(&rights, data, datalen);
+		ktrcaprights(&rights);
+	} else if (strcmp(name, "stat") == 0) {
 		if (datalen != sizeof(struct stat))
 			goto invalid;
 		memcpy(&sb, data, datalen);
@@ -1642,16 +1745,16 @@ ktrcapfail(struct ktr_cap_fail *ktr)
 	case CAPFAIL_NOTCAPABLE:
 		/* operation on fd with insufficient capabilities */
 		printf("operation requires ");
-		capname((intmax_t)ktr->cap_needed);
+		capname(&ktr->cap_needed);
 		printf(", process holds ");
-		capname((intmax_t)ktr->cap_held);
+		capname(&ktr->cap_held);
 		break;
 	case CAPFAIL_INCREASE:
 		/* requested more capabilities than fd already has */
 		printf("attempt to increase capabilities from ");
-		capname((intmax_t)ktr->cap_held);
+		capname(&ktr->cap_held);
 		printf(" to ");
-		capname((intmax_t)ktr->cap_needed);
+		capname(&ktr->cap_needed);
 		break;
 	case CAPFAIL_SYSCALL:
 		/* called restricted syscall */
@@ -1663,9 +1766,9 @@ ktrcapfail(struct ktr_cap_fail *ktr)
 		break;
 	default:
 		printf("unknown capability failure: ");
-		capname((intmax_t)ktr->cap_needed);
+		capname(&ktr->cap_needed);
 		printf(" ");
-		capname((intmax_t)ktr->cap_held);
+		capname(&ktr->cap_held);
 		break;
 	}
 	printf("\n");
diff --git a/usr.bin/kdump/mksubr b/usr.bin/kdump/mksubr
index aed8291..676e9e2 100644
--- a/usr.bin/kdump/mksubr
+++ b/usr.bin/kdump/mksubr
@@ -209,6 +209,18 @@ cat <<_EOF_
 	while (0)
 
 /* MANUAL */
+void
+atfdname(int fd, int decimal)
+{
+	if (fd == AT_FDCWD)
+		printf("AT_FDCWD");
+	else if (decimal)
+		printf("%d", fd);
+	else
+		printf("%#x", fd);
+}
+
+/* MANUAL */
 extern char *signames[]; /* from kdump.c */
 void
 signame(int sig)
@@ -356,11 +368,23 @@ vmprotname (int type)
 	if_print_or(type, VM_PROT_EXECUTE, or);
 	if_print_or(type, VM_PROT_COPY, or);
 }
+
+/*
+ * MANUAL
+ */
+void
+socktypenamewithflags(int type)
+{
+	if (type & SOCK_CLOEXEC)
+		printf("SOCK_CLOEXEC|"), type &= ~SOCK_CLOEXEC;
+	if (type & SOCK_NONBLOCK)
+		printf("SOCK_NONBLOCK|"), type &= ~SOCK_NONBLOCK;
+	socktypename(type);
+}
 _EOF_
 
 auto_or_type     "accessmodename"      "[A-Z]_OK[[:space:]]+0?x?[0-9A-Fa-f]+"         "sys/unistd.h"
 auto_switch_type "acltypename"         "ACL_TYPE_[A-Z4_]+[[:space:]]+0x[0-9]+"        "sys/acl.h"
-auto_or_type     "capname"             "CAP_[A-Z]+[[:space:]]+0x[01248]{16}ULL"       "sys/capability.h"
 auto_or_type     "capfcntlname"        "CAP_FCNTL_[A-Z]+[[:space:]]+\(1"              "sys/capability.h"
 auto_switch_type "extattrctlname"      "EXTATTR_NAMESPACE_[A-Z]+[[:space:]]+0x[0-9]+" "sys/extattr.h"
 auto_switch_type "fadvisebehavname"    "POSIX_FADV_[A-Z]+[[:space:]]+[0-9]+"          "sys/fcntl.h"
@@ -373,7 +397,6 @@ auto_switch_type "lio_listioname"      "LIO_(NO)?WAIT[[:space:]]+[0-9]+"
 auto_switch_type "madvisebehavname"    "_?MADV_[A-Z]+[[:space:]]+[0-9]+"              "sys/mman.h"
 auto_switch_type "minheritname"        "INHERIT_[A-Z]+[[:space:]]+[0-9]+"             "sys/mman.h"
 auto_or_type     "mlockallname"        "MCL_[A-Z]+[[:space:]]+0x[0-9]+"               "sys/mman.h"
-auto_or_type     "mmapflagsname"       "MAP_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+"         "sys/mman.h"
 auto_or_type     "mmapprotname"        "PROT_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+"        "sys/mman.h"
 auto_or_type     "modename"            "S_[A-Z]+[[:space:]]+[0-6]{7}"                 "sys/stat.h"
 auto_or_type     "mountflagsname"      "MNT_[A-Z]+[[:space:]]+0x[0-9]+"               "sys/mount.h"
@@ -457,6 +480,40 @@ cat <<_EOF_
 /*
  * AUTO - Special
  *
+ * The MAP_ALIGNED flag requires special handling.
+ */
+void
+mmapflagsname(int flags)
+{
+	int align;
+	int or = 0;
+	printf("%#x<", flags);
+_EOF_
+egrep "^#[[:space:]]*define[[:space:]]+MAP_[A-Z_]+[[:space:]]+0x[0-9A-Fa-f]+[[:space:]]*" \
+	$include_dir/sys/mman.h | grep -v MAP_ALIGNED | \
+	awk '{ for (i = 1; i <= NF; i++) \
+		if ($i ~ /define/) \
+			break; \
+		++i; \
+		printf "\tif (!((flags > 0) ^ ((%s) > 0)))\n\t\tif_print_or(flags, %s, or);\n", $i, $i }'
+cat <<_EOF_
+	align = flags & MAP_ALIGNMENT_MASK;
+	if (align != 0) {
+		if (align == MAP_ALIGNED_SUPER)
+			print_or("MAP_ALIGNED_SUPER", or);
+		else {
+			print_or("MAP_ALIGNED", or);
+			printf("(%d)", align >> MAP_ALIGNMENT_SHIFT);
+		}
+	}
+	printf(">");
+	if (or == 0)
+		printf("<invalid>%d", flags);
+}
+
+/*
+ * AUTO - Special
+ *
  * The only reason this is not fully automated is due to the
  * grep -v RTP_PRIO statement. A better egrep line should
  * make this capable of being a auto_switch_type() function.
@@ -551,3 +608,26 @@ cat <<_EOF_
 		}
 	}
 }
+
+_EOF_
+egrep '#define[[:space:]]+CAP_[A-Z_]+[[:space:]]+CAPRIGHT\([0-9],[[:space:]]+0x[0-9]{16}ULL\)' \
+	$include_dir/sys/capability.h | \
+	sed -E 's/[	]+/ /g' | \
+	awk -F '[   \(,\)]' '
+	BEGIN {
+		printf "void\n"
+		printf "capname(const cap_rights_t *rightsp)\n"
+		printf "{\n"
+		printf "\tint comma = 0;\n\n"
+		printf "\tprintf(\"<\");\n"
+	}
+	{
+		printf "\tif ((rightsp->cr_rights[%s] & %s) == %s) {\n", $4, $2, $2
+		printf "\t\tif (comma) printf(\",\"); else comma = 1;\n"
+		printf "\t\tprintf(\"%s\");\n", $2
+		printf "\t}\n"
+	}
+	END {
+		printf "\tprintf(\">\");\n"
+		printf "}\n"
+	}'
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index 7beaadb..be813f7 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 27, 2012
+.Dd June 30, 2013
 .Dt KILLALL 1
 .Os
 .Sh NAME
@@ -110,6 +110,8 @@ the specified
 Limit potentially matching processes to those matching
 the specified
 .Ar procname .
+.It Fl q
+Suppress error message if no processes are matched.
 .It Fl z
 Do not skip zombies.
 This should not have any effect except to print a few error messages
diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c
index 83e829a..dd22a83 100644
--- a/usr.bin/killall/killall.c
+++ b/usr.bin/killall/killall.c
@@ -53,7 +53,7 @@ static void __dead2
 usage(void)
 {
 
-	fprintf(stderr, "usage: killall [-delmsvz] [-help] [-I] [-j jail]\n");
+	fprintf(stderr, "usage: killall [-delmsqvz] [-help] [-I] [-j jail]\n");
 	fprintf(stderr,
 	    "               [-u user] [-t tty] [-c cmd] [-SIGNAL] [cmd]...\n");
 	fprintf(stderr, "At least one option or argument to specify processes must be given.\n");
@@ -101,6 +101,7 @@ main(int ac, char **av)
 	char		*user = NULL;
 	char		*tty = NULL;
 	char		*cmd = NULL;
+	int		qflag = 0;
 	int		vflag = 0;
 	int		sflag = 0;
 	int		dflag = 0;
@@ -191,6 +192,9 @@ main(int ac, char **av)
 				    	errx(1, "must specify procname");
 				cmd = *av;
 				break;
+			case 'q':
+				qflag++;
+				break;
 			case 'v':
 				vflag++;
 				break;
@@ -417,8 +421,9 @@ main(int ac, char **av)
 		}
 	}
 	if (killed == 0) {
-		fprintf(stderr, "No matching processes %swere found\n",
-		    getuid() != 0 ? "belonging to you " : "");
+		if (!qflag)
+			fprintf(stderr, "No matching processes %swere found\n",
+			    getuid() != 0 ? "belonging to you " : "");
 		errors = 1;
 	}
 	exit(errors);
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index 00c8797..bc4dbb6 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -49,12 +49,6 @@ __FBSDID("$FreeBSD$");
 
 #include "extern.h"
 
-#ifdef COMPAT_32BIT
-#define	LD_	"LD_32_"
-#else
-#define	LD_	"LD_"
-#endif
-
 /*
  * 32-bit ELF data structures can only be used if the system header[s] declare
  * them.  There is no official macro for determining whether they are declared,
@@ -64,6 +58,16 @@ __FBSDID("$FreeBSD$");
 #define	ELF32_SUPPORTED
 #endif
 
+#define	LDD_SETENV(name, value, overwrite) do {		\
+	setenv("LD_" name, value, overwrite);		\
+	setenv("LD_32_" name, value, overwrite);	\
+} while (0)
+
+#define	LDD_UNSETENV(name) do {		\
+	unsetenv("LD_" name);		\
+	unsetenv("LD_32_" name);	\
+} while (0)
+
 static int	is_executable(const char *fname, int fd, int *is_shlib,
 		    int *type);
 static void	usage(void);
@@ -82,7 +86,7 @@ execldd32(char *file, char *fmt1, char *fmt2, int aflag, int vflag)
 	char *argv[8];
 	int i, rval, status;
 
-	unsetenv(LD_ "TRACE_LOADED_OBJECTS");
+	LDD_UNSETENV("TRACE_LOADED_OBJECTS");
 	rval = 0;
 	i = 0;
 	argv[i++] = strdup(_PATH_LDD32);
@@ -121,7 +125,7 @@ execldd32(char *file, char *fmt1, char *fmt2, int aflag, int vflag)
 	}
 	while (i--)
 		free(argv[i]);
-	setenv(LD_ "TRACE_LOADED_OBJECTS", "yes", 1);
+	LDD_SETENV("TRACE_LOADED_OBJECTS", "yes", 1);
 	return (rval);
 }
 #endif
@@ -210,15 +214,15 @@ main(int argc, char *argv[])
 		}
 
 		/* ld.so magic */
-		setenv(LD_ "TRACE_LOADED_OBJECTS", "yes", 1);
+		LDD_SETENV("TRACE_LOADED_OBJECTS", "yes", 1);
 		if (fmt1 != NULL)
-			setenv(LD_ "TRACE_LOADED_OBJECTS_FMT1", fmt1, 1);
+			LDD_SETENV("TRACE_LOADED_OBJECTS_FMT1", fmt1, 1);
 		if (fmt2 != NULL)
-			setenv(LD_ "TRACE_LOADED_OBJECTS_FMT2", fmt2, 1);
+			LDD_SETENV("TRACE_LOADED_OBJECTS_FMT2", fmt2, 1);
 
-		setenv(LD_ "TRACE_LOADED_OBJECTS_PROGNAME", *argv, 1);
+		LDD_SETENV("TRACE_LOADED_OBJECTS_PROGNAME", *argv, 1);
 		if (aflag)
-			setenv(LD_ "TRACE_LOADED_OBJECTS_ALL", "1", 1);
+			LDD_SETENV("TRACE_LOADED_OBJECTS_ALL", "1", 1);
 		else if (fmt1 == NULL && fmt2 == NULL)
 			/* Default formats */
 			printf("%s:\n", *argv);
diff --git a/usr.bin/lex/COPYING b/usr.bin/lex/COPYING
deleted file mode 100644
index dcb775e..0000000
--- a/usr.bin/lex/COPYING
+++ /dev/null
@@ -1,38 +0,0 @@
-Flex carries the copyright used for BSD software, slightly modified
-because it originated at the Lawrence Berkeley (not Livermore!) Laboratory,
-which operates under a contract with the Department of Energy:
-
-	Copyright (c) 1990 The Regents of the University of California.
-	All rights reserved.
-
-	This code is derived from software contributed to Berkeley by
-	Vern Paxson.
-
-	The United States Government has rights in this work pursuant
-	to contract no. DE-AC03-76SF00098 between the United States
-	Department of Energy and the University of California.
-
-	Redistribution and use in source and binary forms are permitted
-	provided that: (1) source distributions retain this entire
-	copyright notice and comment, and (2) distributions including
-	binaries display the following acknowledgement:  ``This product
-	includes software developed by the University of California,
-	Berkeley and its contributors'' in the documentation or other
-	materials provided with the distribution and in all advertising
-	materials mentioning features or use of this software.  Neither the
-	name of the University nor the names of its contributors may be
-	used to endorse or promote products derived from this software
-	without specific prior written permission.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-	IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-	PURPOSE.
-
-This basically says "do whatever you please with this software except
-remove this notice or take advantage of the University's (or the flex
-authors') name".
-
-Note that the "flex.skl" scanner skeleton carries no copyright notice.
-You are free to do whatever you please with scanners generated using flex;
-for them, you are not even bound by the above copyright.
diff --git a/usr.bin/lex/FlexLexer.h b/usr.bin/lex/FlexLexer.h
deleted file mode 100644
index 12e8ec3..0000000
--- a/usr.bin/lex/FlexLexer.h
+++ /dev/null
@@ -1,186 +0,0 @@
-// $Header: /home/daffy/u0/vern/flex/RCS/FlexLexer.h,v 1.19 96/05/25 20:43:02 vern Exp $
-// $FreeBSD$
-
-// FlexLexer.h -- define interfaces for lexical analyzer classes generated
-//		  by flex
-
-// Copyright (c) 1993 The Regents of the University of California.
-// All rights reserved.
-//
-// This code is derived from software contributed to Berkeley by
-// Kent Williams and Tom Epperly.
-//
-// Redistribution and use in source and binary forms are permitted provided
-// that: (1) source distributions retain this entire copyright notice and
-// comment, and (2) distributions including binaries display the following
-// acknowledgement:  ``This product includes software developed by the
-// University of California, Berkeley and its contributors'' in the
-// documentation or other materials provided with the distribution and in
-// all advertising materials mentioning features or use of this software.
-// Neither the name of the University nor the names of its contributors may
-// be used to endorse or promote products derived from this software without
-// specific prior written permission.
-// THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-// This file defines FlexLexer, an abstract class which specifies the
-// external interface provided to flex C++ lexer objects, and yyFlexLexer,
-// which defines a particular lexer class.
-//
-// If you want to create multiple lexer classes, you use the -P flag
-// to rename each yyFlexLexer to some other xxFlexLexer.  You then
-// include <FlexLexer.h> in your other sources once per lexer class:
-//
-//	#undef yyFlexLexer
-//	#define yyFlexLexer xxFlexLexer
-//	#include <FlexLexer.h>
-//
-//	#undef yyFlexLexer
-//	#define yyFlexLexer zzFlexLexer
-//	#include <FlexLexer.h>
-//	...
-
-#ifndef __FLEX_LEXER_H
-// Never included before - need to define base class.
-#define __FLEX_LEXER_H
-#include <iostream>
-
-extern "C++" {
-
-struct yy_buffer_state;
-typedef int yy_state_type;
-
-class FlexLexer {
-public:
-	virtual ~FlexLexer()	{ }
-
-	const char* YYText()	{ return yytext; }
-	int YYLeng()		{ return yyleng; }
-
-	virtual void
-		yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
-	virtual struct yy_buffer_state*
-		yy_create_buffer( std::istream* s, int size ) = 0;
-	virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
-	virtual void yyrestart( std::istream* s ) = 0;
-
-	virtual int yylex() = 0;
-
-	// Call yylex with new input/output sources.
-	int yylex( std::istream* new_in, std::ostream* new_out = 0 )
-		{
-		switch_streams( new_in, new_out );
-		return yylex();
-		}
-
-	// Switch to new input/output streams.  A nil stream pointer
-	// indicates "keep the current one".
-	virtual void switch_streams( std::istream* new_in = 0,
-					std::ostream* new_out = 0 ) = 0;
-
-	int lineno() const		{ return yylineno; }
-
-	int debug() const		{ return yy_flex_debug; }
-	void set_debug( int flag )	{ yy_flex_debug = flag; }
-
-protected:
-	char* yytext;
-	int yyleng;
-	int yylineno;		// only maintained if you use %option yylineno
-	int yy_flex_debug;	// only has effect with -d or "%option debug"
-};
-
-}
-#endif
-
-#if defined(yyFlexLexer) || ! defined(yyFlexLexerOnce)
-// Either this is the first time through (yyFlexLexerOnce not defined),
-// or this is a repeated include to define a different flavor of
-// yyFlexLexer, as discussed in the flex man page.
-#define yyFlexLexerOnce
-
-class yyFlexLexer : public FlexLexer {
-public:
-	// arg_yyin and arg_yyout default to the cin and cout, but we
-	// only make that assignment when initializing in yylex().
-	yyFlexLexer( std::istream* arg_yyin = 0, std::ostream* arg_yyout = 0 );
-
-	virtual ~yyFlexLexer();
-
-	void yy_switch_to_buffer( struct yy_buffer_state* new_buffer );
-	struct yy_buffer_state* yy_create_buffer( std::istream* s, int size );
-	void yy_delete_buffer( struct yy_buffer_state* b );
-	void yyrestart( std::istream* s );
-
-	virtual int yylex();
-	virtual void switch_streams( std::istream* new_in, std::ostream* new_out );
-
-protected:
-	virtual int LexerInput( char* buf, int max_size );
-	virtual void LexerOutput( const char* buf, int size );
-	virtual void LexerError( const char* msg );
-
-	void yyunput( int c, char* buf_ptr );
-	int yyinput();
-
-	void yy_load_buffer_state();
-	void yy_init_buffer( struct yy_buffer_state* b, std::istream* s );
-	void yy_flush_buffer( struct yy_buffer_state* b );
-
-	int yy_start_stack_ptr;
-	int yy_start_stack_depth;
-	int* yy_start_stack;
-
-	void yy_push_state( int new_state );
-	void yy_pop_state();
-	int yy_top_state();
-
-	yy_state_type yy_get_previous_state();
-	yy_state_type yy_try_NUL_trans( yy_state_type current_state );
-	int yy_get_next_buffer();
-
-	std::istream* yyin;	// input source for default LexerInput
-	std::ostream* yyout;	// output sink for default LexerOutput
-
-	struct yy_buffer_state* yy_current_buffer;
-
-	// yy_hold_char holds the character lost when yytext is formed.
-	char yy_hold_char;
-
-	// Number of characters read into yy_ch_buf.
-	int yy_n_chars;
-
-	// Points to current character in buffer.
-	char* yy_c_buf_p;
-
-	int yy_init;		// whether we need to initialize
-	int yy_start;		// start state number
-
-	// Flag which is used to allow yywrap()'s to do buffer switches
-	// instead of setting up a fresh yyin.  A bit of a hack ...
-	int yy_did_buffer_switch_on_eof;
-
-	// The following are not always needed, but may be depending
-	// on use of certain flex features (like REJECT or yymore()).
-
-	yy_state_type yy_last_accepting_state;
-	char* yy_last_accepting_cpos;
-
-	yy_state_type* yy_state_buf;
-	yy_state_type* yy_state_ptr;
-
-	char* yy_full_match;
-	int* yy_full_state;
-	int yy_full_lp;
-
-	int yy_lp;
-	int yy_looking_for_trail_begin;
-
-	int yy_more_flag;
-	int yy_more_len;
-	int yy_more_offset;
-	int yy_prev_more_offset;
-};
-
-#endif
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index 947eba1..f896092 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -14,37 +14,51 @@ LINKS+=	${BINDIR}/lex ${BINDIR}/lex++
 LINKS+=	${BINDIR}/lex ${BINDIR}/flex
 LINKS+=	${BINDIR}/lex ${BINDIR}/flex++
 
-SRCS=		scan.c ccl.c dfa.c ecs.c gen.c main.c misc.c nfa.c parse.y \
-		skel.c sym.c tblcmp.c yylex.c
+FLEXDIR=	${.CURDIR}/../../contrib/flex
+
+.PATH:		${FLEXDIR}
+
+SRCS=		buf.c ccl.c dfa.c ecs.c filter.c gen.c main.c misc.c \
+		nfa.c options.c parse.y regex.c scan.c scanflags.c \
+		scanopt.c skel.c sym.c tables.c tables_shared.c \
+		tblcmp.c yylex.c
 LFLAGS+=	-is
-CFLAGS+=	-I. -I${.CURDIR}
+CFLAGS+=	-I. -I${.CURDIR} -I${FLEXDIR} -DHAVE_CONFIG_H
 INCS=		FlexLexer.h
 INCSDIR=	${INCLUDEDIR}
 MLINKS+=	lex.1 flex.1
 MLINKS+=	lex.1 flex++.1
 MLINKS+=	lex.1 lex++.1
 
-WARNS?=		2
+WARNS?=		3
 
 CLEANFILES=	scan.c skel.c
+GENFILES=	parse.c parse.h scan.c skel.c
 
 SUBDIR=		lib
 
-skel.c: mkskel.sh flex.skl
-	sh ${.CURDIR}/mkskel.sh ${.CURDIR}/flex.skl > skel.c
+FLEX_VERSION=	`awk -f ${.CURDIR}/version.awk ${.CURDIR}/config.h`
+
+skel.c: config.h mkskel.sh flex.skl version.awk
+	sed 's/m4_/m4postproc_/g; s/m4preproc_/m4_/g' \
+	    ${FLEXDIR}/flex.skl | \
+	m4 -I${FLEXDIR} -P ${FLEX_VERSION} | \
+	sed 's/m4postproc_/m4_/g' | \
+	sh ${FLEXDIR}/mkskel.sh > ${.TARGET}
 
-bootstrap: initscan.c
-	@cmp -s ${.CURDIR}/initscan.c scan.c || { \
-		echo "Bootstrapping flex" ; \
-		rm -f scan.c ; \
-		cp -f ${.CURDIR}/initscan.c scan.c ; \
+bootstrap: ${GENFILES:S/^/init/g}
+.for _f in ${GENFILES}
+	@diff -I '^#line ' -I '\$$FreeBS[D]: .*\$$' -q \
+	    ${.CURDIR}/init${_f} ${_f} 2> /dev/null || { \
+		echo "Bootstrapping ${_f}" ; \
+		cp -f ${.CURDIR}/init${_f} ${_f} ; \
 	}
+.endfor
 
 test: check
-check: $(PROG)
-	./$(PROG) $(LFLAGS) -t $(COMPRESSION) $(.CURDIR)/scan.l \
-	| sed s,\"$(.CURDIR)/scan.l",\"scan.l", \
-	| diff -I '\$$FreeBS[D]:.*\$$' $(.CURDIR)/initscan.c -
+check: ${PROG}
+	./${PROG} ${LFLAGS} -t ${COMPRESSION} ${FLEXDIR}/scan.l | \
+	diff -I '^#line ' -I '\$$FreeBS[D]: .*\$$' ${.CURDIR}/initscan.c -
 	@echo "Check successful"
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/lex/NEWS b/usr.bin/lex/NEWS
deleted file mode 100644
index 1f8a8cc..0000000
--- a/usr.bin/lex/NEWS
+++ /dev/null
@@ -1,1235 +0,0 @@
-$FreeBSD$
-
-Changes between release 2.5.4 (11Sep96) and release 2.5.3:
-
-	- Fixed a bug introduced in 2.5.3 that blew it when a call
-	  to input() occurred at the end of an input file.
-
-	- Fixed scanner skeleton so the example in the man page of
-	  scanning strings using exclusive start conditions works.
-
-	- Minor Makefile tweaks.
-
-
-Changes between release 2.5.3 (29May96) and release 2.5.2:
-
-	- Some serious bugs in yymore() have been fixed.  In particular,
-	  when using AT&T-lex-compatibility or %array, you can intermix
-	  calls to input(), unput(), and yymore().  (This still doesn't
-	  work for %pointer, and isn't likely to in the future.)
-
-	- A bug in handling NUL's in the input stream of scanners using
-	  REJECT has been fixed.
-
-	- The default main() in libfl.a now repeatedly calls yylex() until
-	  it returns 0, rather than just calling it once.
-
-	- Minor tweak for Windows NT Makefile, MISC/NT/Makefile.
-
-
-Changes between release 2.5.2 (25Apr95) and release 2.5.1:
-
-	- The --prefix configuration option now works.
-
-	- A bug that completely broke the "-Cf" table compression
-	  option has been fixed.
-
-	- A major headache involving "const" declarators and Solaris
-	  systems has been fixed.
-
-	- An octal escape sequence in a flex regular expression must
-	  now contain only the digits 0-7.
-
-	- You can now use "--" on the flex command line to mark the
-	  end of flex options.
-
-	- You can now specify the filename '-' as a synonym for stdin.
-
-	- By default, the scanners generated by flex no longer
-	  statically initialize yyin and yyout to stdin and stdout.
-	  This change is necessary because in some ANSI environments,
-	  stdin and stdout are not compile-time constant.  You can
-	  force the initialization using "%option stdinit" in the first
-	  section of your flex input.
-
-	- "%option nounput" now correctly omits the unput() routine
-	  from the output.
-
-	- "make clean" now removes config.log, config.cache, and the
-	  flex binary.  The fact that it removes the flex binary means
-	  you should take care if making changes to scan.l, to make
-	  sure you don't wind up in a bootstrap problem.
-
-	- In general, the Makefile has been reworked somewhat (thanks
-	  to Francois Pinard) for added flexibility - more changes will
-	  follow in subsequent releases.
-
-	- The .texi and .info files in MISC/texinfo/ have been updated,
-	  thanks also to Francois Pinard.
-
-	- The FlexLexer::yylex(istream* new_in, ostream* new_out) method
-	  now does not have a default for the first argument, to disambiguate
-	  it from FlexLexer::yylex().
-
-	- A bug in destructing a FlexLexer object before doing any scanning
-	  with it has been fixed.
-
-	- A problem with including FlexLexer.h multiple times has been fixed.
-
-	- The alloca() chud necessary to accommodate bison has grown
-	  even uglier, but hopefully more correct.
-
-	- A portability tweak has been added to accommodate compilers that
-	  use char* generic pointers.
-
-	- EBCDIC contact information in the file MISC/EBCDIC has been updated.
-
-	- An OS/2 Makefile and config.h for flex 2.5 is now available in
-	  MISC/OS2/, contributed by Kai Uwe Rommel.
-
-	- The descrip.mms file for building flex under VMS has been updated,
-	  thanks to Pat Rankin.
-
-	- The notes on building flex for the Amiga have been updated for
-	  flex 2.5, contributed by Andreas Scherer.
-
-
-Changes between release 2.5.1 (28Mar95) and release 2.4.7:
-
-	- A new concept of "start condition" scope has been introduced.
-	  A start condition scope is begun with:
-
-		<SCs>{
-
-	  where SCs is a list of one or more start conditions.  Inside
-	  the start condition scope, every rule automatically has the
-	  prefix <SCs> applied to it, until a '}' which matches the
-	  initial '{'.  So, for example:
-
-		<ESC>{
-			"\\n"	return '\n';
-			"\\r"	return '\r';
-			"\\f"	return '\f';
-			"\\0"	return '\0';
-		}
-
-	  is equivalent to:
-
-		<ESC>"\\n"	return '\n';
-		<ESC>"\\r"	return '\r';
-		<ESC>"\\f"	return '\f';
-		<ESC>"\\0"	return '\0';
-
-	  As indicated in this example, rules inside start condition scopes
-	  (and any rule, actually, other than the first) can be indented,
-	  to better show the extent of the scope.
-
-	  Start condition scopes may be nested.
-
-	- The new %option directive can be used in the first section of
-	  a flex scanner to control scanner-generation options.  Most
-	  options are given simply as names, optionally preceded by the
-	  word "no" (with no intervening whitespace) to negate their
-	  meaning.  Some are equivalent to flex flags, so putting them
-	  in your scanner source is equivalent to always specifying
-	  the flag (%option's take precedence over flags):
-
-		7bit	-7 option
-		8bit	-8 option
-		align	-Ca option
-		backup	-b option
-		batch	-B option
-		c++	-+ option
-		caseful	opposite of -i option (caseful is the default);
-		case-sensitive	same as above
-		caseless	-i option;
-		case-insensitive	same as above
-		debug	-d option
-		default	opposite of -s option
-		ecs	-Ce option
-		fast	-F option
-		full	-f option
-		interactive	-I option
-		lex-compat	-l option
-		meta-ecs	-Cm option
-		perf-report	-p option
-		read	-Cr option
-		stdout	-t option
-		verbose	-v option
-		warn	opposite of -w option (so use "%option nowarn" for -w)
-
-		array	equivalent to "%array"
-		pointer	equivalent to "%pointer" (default)
-
-	  Some provide new features:
-
-		always-interactive	generate a scanner which always
-			considers its input "interactive" (no call to isatty()
-			will be made when the scanner runs)
-		main	supply a main program for the scanner, which
-			simply calls yylex().  Implies %option noyywrap.
-		never-interactive	generate a scanner which never
-			considers its input "interactive" (no call to isatty()
-			will be made when the scanner runs)
-		stack	if set, enable start condition stacks (see below)
-		stdinit	if unset ("%option nostdinit"), initialize yyin
-			and yyout statically to nil FILE* pointers, instead
-			of stdin and stdout
-		yylineno	if set, keep track of the current line
-			number in global yylineno (this option is expensive
-			in terms of performance).  The line number is available
-			to C++ scanning objects via the new member function
-			lineno().
-		yywrap	if unset ("%option noyywrap"), scanner does not
-			call yywrap() upon EOF but simply assumes there
-			are no more files to scan
-
-	  Flex scans your rule actions to determine whether you use the
-	  REJECT or yymore features (this is not new).  Two %options can be
-	  used to override its decision, either by setting them to indicate
-	  the feature is indeed used, or unsetting them to indicate it
-	  actually is not used:
-
-		reject
-		yymore
-
-	  Three %option's take string-delimited values, offset with '=':
-
-		outfile="<name>"	equivalent to -o<name>
-		prefix="<name>"		equivalent to -P<name>
-		yyclass="<name>"	set the name of the C++ scanning class
-					(see below)
-
-	  A number of %option's are available for lint purists who
-	  want to suppress the appearance of unneeded routines in
-	  the generated scanner.  Each of the following, if unset,
-	  results in the corresponding routine not appearing in the
-	  generated scanner:
-
-		input, unput
-		yy_push_state, yy_pop_state, yy_top_state
-		yy_scan_buffer, yy_scan_bytes, yy_scan_string
-
-	  You can specify multiple options with a single %option directive,
-	  and multiple directives in the first section of your flex input file.
-
-	- The new function:
-
-		YY_BUFFER_STATE yy_scan_string( const char *str )
-
-	  returns a YY_BUFFER_STATE (which also becomes the current input
-	  buffer) for scanning the given string, which occurs starting
-	  with the next call to yylex().  The string must be NUL-terminated.
-	  A related function:
-
-		YY_BUFFER_STATE yy_scan_bytes( const char *bytes, int len )
-
-	  creates a buffer for scanning "len" bytes (including possibly NUL's)
-	  starting at location "bytes".
-
-	  Note that both of these functions create and scan a *copy* of
-	  the string/bytes.  (This may be desirable, since yylex() modifies
-	  the contents of the buffer it is scanning.)  You can avoid the
-	  copy by using:
-
-		YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-
-	  which scans in place the buffer starting at "base", consisting
-	  of "size" bytes, the last two bytes of which *must* be
-	  YY_END_OF_BUFFER_CHAR (these bytes are not scanned; thus, scanning
-	  consists of base[0] through base[size-2], inclusive).  If you
-	  fail to set up "base" in this manner, yy_scan_buffer returns a
-	  nil pointer instead of creating a new input buffer.
-
-	  The type yy_size_t is an integral type to which you can cast
-	  an integer expression reflecting the size of the buffer.
-
-	- Three new routines are available for manipulating stacks of
-	  start conditions:
-
-		void yy_push_state( int new_state )
-
-	  pushes the current start condition onto the top of the stack
-	  and BEGIN's "new_state" (recall that start condition names are
-	  also integers).
-
-		void yy_pop_state()
-
-	  pops the top of the stack and BEGIN's to it, and
-
-		int yy_top_state()
-
-	  returns the top of the stack without altering the stack's
-	  contents.
-
-	  The start condition stack grows dynamically and so has no built-in
-	  size limitation.  If memory is exhausted, program execution
-	  is aborted.
-
-	  To use start condition stacks, your scanner must include
-	  a "%option stack" directive.
-
-	- flex now supports POSIX character class expressions.  These
-	  are expressions enclosed inside "[:" and ":]" delimiters (which
-	  themselves must appear between the '[' and ']' of a character
-	  class; other elements may occur inside the character class, too).
-	  The expressions flex recognizes are:
-
-		[:alnum:] [:alpha:] [:blank:] [:cntrl:] [:digit:] [:graph:]	
-		[:lower:] [:print:] [:punct:] [:space:] [:upper:] [:xdigit:]
-
-	  These expressions all designate a set of characters equivalent to
-	  the corresponding isXXX function (for example, [:alnum:] designates
-	  those characters for which isalnum() returns true - i.e., any
-	  alphabetic or numeric).  Some systems don't provide isblank(),
-	  so flex defines [:blank:] as a blank or a tab.
-
-	  For example, the following character classes are all equivalent:
-
-		[[:alnum:]]
-		[[:alpha:][:digit:]
-		[[:alpha:]0-9]
-		[a-zA-Z0-9]
-
-	  If your scanner is case-insensitive (-i flag), then [:upper:]
-	  and [:lower:] are equivalent to [:alpha:].
-
-	- The promised rewrite of the C++ FlexLexer class has not yet
-	  been done.  Support for FlexLexer is limited at the moment to
-	  fixing show-stopper bugs, so, for example, the new functions
-	  yy_scan_string() & friends are not available to FlexLexer
-	  objects.
-
-	- The new macro
-
-		yy_set_interactive(is_interactive)
-
-	  can be used to control whether the current buffer is considered
-	  "interactive".  An interactive buffer is processed more slowly,
-	  but must be used when the scanner's input source is indeed
-	  interactive to avoid problems due to waiting to fill buffers
-	  (see the discussion of the -I flag in flex.1).  A non-zero value
-	  in the macro invocation marks the buffer as interactive, a zero
-	  value as non-interactive.  Note that use of this macro overrides
-	  "%option always-interactive" or "%option never-interactive".
-
-	  yy_set_interactive() must be invoked prior to beginning to
-	  scan the buffer.
-
-	- The new macro
-
-		yy_set_bol(at_bol)
-
-	  can be used to control whether the current buffer's scanning
-	  context for the next token match is done as though at the
-	  beginning of a line (non-zero macro argument; makes '^' anchored
-	  rules active) or not at the beginning of a line (zero argument,
-	  '^' rules inactive).
-
-	- Related to this change, the mechanism for determining when a scan is
-	  starting at the beginning of a line has changed.  It used to be
-	  that '^' was active iff the character prior to that at which the
-	  scan started was a newline.  The mechanism now is that '^' is
-	  active iff the last token ended in a newline (or the last call to
-	  input() returned a newline).  For most users, the difference in
-	  mechanisms is negligible.  Where it will make a difference,
-	  however, is if unput() or yyless() is used to alter the input
-	  stream.  When in doubt, use yy_set_bol().
-
-	- The new beginning-of-line mechanism involved changing some fairly
-	  twisted code, so it may have introduced bugs - beware ...
-
-	- The macro YY_AT_BOL() returns true if the next token scanned from
-	  the current buffer will have '^' rules active, false otherwise.
-
-	- The new function
-
-		void yy_flush_buffer( struct yy_buffer_state* b )
-
-	  flushes the contents of the current buffer (i.e., next time
-	  the scanner attempts to match a token using b as the current
-	  buffer, it will begin by invoking YY_INPUT to fill the buffer).
-	  This routine is also available to C++ scanners (unlike some
-	  of the other new routines).
-
-	  The related macro
-
-		YY_FLUSH_BUFFER
-
-	  flushes the contents of the current buffer.
-
-	- A new "-ooutput" option writes the generated scanner to "output".
-	  If used with -t, the scanner is still written to stdout, but
-	  its internal #line directives (see previous item) use "output".
-
-	- Flex now generates #line directives relating the code it
-	  produces to the output file; this means that error messages
-	  in the flex-generated code should be correctly pinpointed.
-
-	- When generating #line directives, filenames with embedded '\'s
-	  have those characters escaped (i.e., turned into '\\').  This
-	  feature helps with reporting filenames for some MS-DOS and OS/2
-	  systems.
-
-	- The FlexLexer class includes two new public member functions:
-
-		virtual void switch_streams( istream* new_in = 0,
-						ostream* new_out = 0 )
-
-	  reassigns yyin to new_in (if non-nil) and yyout to new_out
-	  (ditto), deleting the previous input buffer if yyin is
-	  reassigned.  It is used by:
-
-		int yylex( istream* new_in = 0, ostream* new_out = 0 )
-
-	  which first calls switch_streams() and then returns the value
-	  of calling yylex().
-
-	- C++ scanners now have yy_flex_debug as a member variable of
-	  FlexLexer rather than a global, and member functions for testing
-	  and setting it.
-
-	- When generating a C++ scanning class, you can now use
-
-		%option yyclass="foo"
-
-	  to inform flex that you have derived "foo" as a subclass of
-	  yyFlexLexer, so flex will place your actions in the member
-	  function foo::yylex() instead of yyFlexLexer::yylex().  It also
-	  generates a yyFlexLexer::yylex() member function that generates a
-	  run-time error if called (by invoking yyFlexLexer::LexerError()).
-	  This feature is necessary if your subclass "foo" introduces some
-	  additional member functions or variables that you need to access
-	  from yylex().
-
-	- Current texinfo files in MISC/texinfo, contributed by Francois
-	  Pinard.
-
-	- You can now change the name "flex" to something else (e.g., "lex")
-	  by redefining $(FLEX) in the Makefile.
-
-	- Two bugs (one serious) that could cause "bigcheck" to fail have
-	  been fixed.
-
-	- A number of portability/configuration changes have been made
-	  for easier portability.
-
-	- You can use "YYSTATE" in your scanner as an alias for YY_START
-	  (for AT&T lex compatibility).
-
-	- input() now maintains yylineno.
-
-	- input() no longer trashes yytext.
-
-	- interactive scanners now read characters in YY_INPUT up to a
-	  newline, a large performance gain.
-
-	- C++ scanner objects now work with the -P option.  You include
-	  <FlexLexer.h> once per scanner - see comments in <FlexLexer.h>
-	  (or flex.1) for details.
-
-	- C++ FlexLexer objects now use the "cerr" stream to report -d output
-	  instead of stdio.
-
-	- The -c flag now has its full glorious POSIX interpretation (do
-	  nothing), rather than being interpreted as an old-style -C flag.
-
-	- Scanners generated by flex now include two #define's giving
-	  the major and minor version numbers (YY_FLEX_MAJOR_VERSION,
-	  YY_FLEX_MINOR_VERSION).  These can then be tested to see
-	  whether certain flex features are available.
-
-	- Scanners generated using -l lex compatibility now have the symbol
-	  YY_FLEX_LEX_COMPAT #define'd.
-
-	- When initializing (i.e., yy_init is non-zero on entry to yylex()),
-	  generated scanners now set yy_init to zero before executing
-	  YY_USER_INIT.  This means that you can set yy_init back to a
-	  non-zero value in YY_USER_INIT if you need the scanner to be
-	  reinitialized on the next call.
-
-	- You can now use "#line" directives in the first section of your
-	  scanner specification.
-
-	- When generating full-table scanners (-Cf), flex now puts braces
-	  around each row of the 2-d array initialization, to silence warnings
-	  on over-zealous compilers.
-
-	- Improved support for MS-DOS.  The flex sources have been successfully
-	  built, unmodified, for Borland 4.02 (all that's required is a
-	  Borland Makefile and config.h file, which are supplied in
-	  MISC/Borland - contributed by Terrence O Kane).
-
-	- Improved support for Macintosh using Think C - the sources should
-	  build for this platform "out of the box".  Contributed by Scott
-	  Hofmann.
-
-	- Improved support for VMS, in MISC/VMS/, contributed by Pat Rankin.
-
-	- Support for the Amiga, in MISC/Amiga/, contributed by Andreas
-	  Scherer.  Note that the contributed files were developed for
-	  flex 2.4 and have not been tested with flex 2.5.
-
-	- Some notes on support for the NeXT, in MISC/NeXT, contributed
-	  by Raf Schietekat.
-
-	- The MISC/ directory now includes a preformatted version of flex.1
-	  in flex.man, and pre-yacc'd versions of parse.y in parse.{c,h}.
-
-	- The flex.1 and flexdoc.1 manual pages have been merged.  There
-	  is now just one document, flex.1, which includes an overview
-	  at the beginning to help you find the section you need.
-
-	- Documentation now clarifies that start conditions persist across
-	  switches to new input files or different input buffers.  If you
-	  want to e.g., return to INITIAL, you must explicitly do so.
-
-	- The "Performance Considerations" section of the manual has been
-	  updated.
-
-	- Documented the "yy_act" variable, which when YY_USER_ACTION is
-	  invoked holds the number of the matched rule, and added an
-	  example of using yy_act to profile how often each rule is matched.
-
-	- Added YY_NUM_RULES, a definition that gives the total number
-	  of rules in the file, including the default rule (even if you
-	  use -s).
-
-	- Documentation now clarifies that you can pass a nil FILE* pointer
-	  to yy_create_buffer() or yyrestart() if you've arrange YY_INPUT
-	  to not need yyin.
-
-	- Documentation now clarifies that YY_BUFFER_STATE is a pointer to
-	  an opaque "struct yy_buffer_state".
-
-	- Documentation now stresses that you gain the benefits of removing
-	  backing-up states only if you remove *all* of them.
-
-	- Documentation now points out that traditional lex allows you
-	  to put the action on a separate line from the rule pattern if
-	  the pattern has trailing whitespace (ugh!), but flex doesn't
-	  support this.
-
-	- A broken example in documentation of the difference between
-	  inclusive and exclusive start conditions is now fixed.
-
-	- Usage (-h) report now goes to stdout.
-
-	- Version (-V) info now goes to stdout.
-
-	- More #ifdef chud has been added to the parser in attempt to
-	  deal with bison's use of alloca().
-
-	- "make clean" no longer deletes emacs backup files (*~).
-
-	- Some memory leaks have been fixed.
-
-	- A bug was fixed in which dynamically-expanded buffers were
-	  reallocated a couple of bytes too small.
-
-	- A bug was fixed which could cause flex to read and write beyond
-	  the end of the input buffer.
-
-	- -S will not be going away.
-
-
-Changes between release 2.4.7 (03Aug94) and release 2.4.6:
-
-	- Fixed serious bug in reading multiple files.
-
-	- Fixed bug in scanning NUL's.
-
-	- Fixed bug in input() returning 8-bit characters.
-
-	- Fixed bug in matching text with embedded NUL's when
-	  using %array or lex compatibility.
-
-	- Fixed multiple invocations of YY_USER_ACTION when using '|'
-	  continuation action.
-
-	- Minor prototyping fixes.
-
-Changes between release 2.4.6 (04Jan94) and release 2.4.5:
-
-	- Linking with -lfl no longer required if your program includes
-	  its own yywrap() and main() functions.  (This change will cause
-	  problems if you have a non-ANSI compiler on a system for which
-	  sizeof(int) != sizeof(void*) or sizeof(int) != sizeof(size_t).)
-
-	- The use of 'extern "C++"' in FlexLexer.h has been modified to
-	  get around an incompatibility with g++'s header files.
-
-Changes between release 2.4.5 (11Dec93) and release 2.4.4:
-
-	- Fixed bug breaking C++ scanners that use REJECT or variable
-	  trailing context.
-
-	- Fixed serious input problem for interactive scanners on
-	  systems for which char is unsigned.
-
-	- Fixed bug in incorrectly treating '$' operator as variable
-	  trailing context.
-
-	- Fixed bug in -CF table representation that could lead to
-	  corrupt tables.
-
-	- Fixed fairly benign memory leak.
-
-	- Added `extern "C++"' wrapper to FlexLexer.h header.  This
-	  should overcome the g++ 2.5.X problems mentioned in the
-	  NEWS for release 2.4.3.
-
-	- Changed #include of FlexLexer.h to use <> instead of "".
-
-	- Added feature to control whether the scanner attempts to
-	  refill the input buffer once it's exhausted.  This feature
-	  will be documented in the 2.5 release.
-
-
-Changes between release 2.4.4 (07Dec93) and release 2.4.3:
-
-	- Fixed two serious bugs in scanning 8-bit characters.
-
-	- Fixed bug in YY_USER_ACTION that caused it to be executed
-	  inappropriately (on the scanner's own internal actions, and
-	  with incorrect yytext/yyleng values).
-
-	- Fixed bug in pointing yyin at a new file and resuming scanning.
-
-	- Portability fix regarding min/max/abs macros conflicting with
-	  function definitions in standard header files.
-
-	- Added a virtual LexerError() method to the C++ yyFlexLexer class
-	  for reporting error messages instead of always using cerr.
-
-	- Added warning in flexdoc that the C++ scanning class is presently
-	  experimental and subject to considerable change between major
-	  releases.
-
-
-Changes between release 2.4.3 (03Dec93) and release 2.4.2:
-
-	- Fixed bug causing fatal scanner messages to fail to print.
-
-	- Fixed things so FlexLexer.h can be included in other C++
-	  sources.  One side-effect of this change is that -+ and -CF
-	  are now incompatible.
-
-	- libfl.a now supplies private versions of the <string.h>/
-	  <strings.h> string routines needed by flex and the scanners
-	  it generates, to enhance portability to some BSD systems.
-
-	- More robust solution to 2.4.2's flexfatal() bug fix.
-
-	- Added ranlib of installed libfl.a.
-
-	- Some lint tweaks.
-
-	- NOTE: problems have been encountered attempting to build flex
-	  C++ scanners using g++ version 2.5.X.  The problem is due to an
-	  unfortunate heuristic in g++ 2.5.X that attempts to discern between
-	  C and C++ headers.  Because FlexLexer.h is installed (by default)
-	  in /usr/local/include and not /usr/local/lib/g++-include, g++ 2.5.X
-	  decides that it's a C header :-(.  So if you have problems, install
-	  the header in /usr/local/lib/g++-include instead.
-
-
-Changes between release 2.4.2 (01Dec93) and release 2.4.1:
-
-	- Fixed bug in libfl.a referring to non-existent "flexfatal" function.
-
-	- Modified to produce both compress'd and gzip'd tar files for
-	  distributions (you probably don't care about this change!).
-
-
-Changes between release 2.4.1 (30Nov93) and release 2.3.8:
-
-	- The new '-+' flag instructs flex to generate a C++ scanner class
-	  (thanks to Kent Williams).  flex writes an implementation of the
-	  class defined in FlexLexer.h to lex.yy.cc.  You may include
-	  multiple scanner classes in your program using the -P flag.  Note
-	  that the scanner class also provides a mechanism for creating
-	  reentrant scanners.  The scanner class uses C++ streams for I/O
-	  instead of FILE*'s (thanks to Tom Epperly).  If the flex executable's
-	  name ends in '+' then the '-+' flag is automatically on, so creating
-	  a symlink or copy of "flex" to "flex++" results in a version of
-	  flex that can be used exclusively for C++ scanners.
-
-	  Note that without the '-+' flag, flex-generated scanners can still
-	  be compiled using C++ compilers, though they use FILE*'s for I/O
-	  instead of streams.
-
-	  See the "GENERATING C++ SCANNERS" section of flexdoc for details.
-
-	- The new '-l' flag turns on maximum AT&T lex compatibility.  In
-	  particular, -l includes support for "yylineno" and makes yytext
-	  be an array instead of a pointer.  It does not, however, do away
-	  with all incompatibilities.  See the "INCOMPATIBILITIES WITH LEX
-	  AND POSIX" section of flexdoc for details.
-
-	- The new '-P' option specifies a prefix to use other than "yy"
-	  for the scanner's globally-visible variables, and for the
-	  "lex.yy.c" filename.  Using -P you can link together multiple
-	  flex scanners in the same executable.
-
-	- The distribution includes a "texinfo" version of flexdoc.1,
-	  contributed by Roland Pesch (thanks also to Marq Kole, who
-	  contributed another version).  It has not been brought up to
-	  date, but reflects version 2.3.  See MISC/flex.texinfo.
-
-	  The flex distribution will soon include G.T. Nicol's flex
-	  manual; he is presently bringing it up-to-date for version 2.4.
-
-	- yywrap() is now a function, and you now *must* link flex scanners
-	  with libfl.a.
-
-	- Site-configuration is now done via an autoconf-generated
-	  "configure" script contributed by Francois Pinard.
-
-	- Scanners now use fread() (or getc(), if interactive) and not
-	  read() for input.  A new "table compression" option, -Cr,
-	  overrides this change and causes the scanner to use read()
-	  (because read() is a bit faster than fread()).  -f and -F
-	  are now equivalent to -Cfr and -CFr; i.e., they imply the
-	  -Cr option.
-
-	- In the blessed name of POSIX compliance, flex supports "%array"
-	  and "%pointer" directives in the definitions (first) section of
-	  the scanner specification.  The former specifies that yytext
-	  should be an array (of size YYLMAX), the latter, that it should
-	  be a pointer.  The array version of yytext is universally slower
-	  than the pointer version, but has the advantage that its contents
-	  remain unmodified across calls to input() and unput() (the pointer
-	  version of yytext is, still, trashed by such calls).
-
-	  "%array" cannot be used with the '-+' C++ scanner class option.
-
-	- The new '-Ca' option directs flex to trade off memory for
-	  natural alignment when generating a scanner's tables.  In
-	  particular, table entries that would otherwise be "short"
-	  become "long".
-
-	- The new '-h' option produces a summary of the flex flags.
-
-	- The new '-V' option reports the flex version number and exits.
-
-	- The new scanner macro YY_START returns an integer value
-	  corresponding to the current start condition.  You can return
-	  to that start condition by passing the value to a subsequent
-	  "BEGIN" action.  You also can implement "start condition stacks"
-	  by storing the values in an integer stack.
-
-	- You can now redefine macros such as YY_INPUT by just #define'ing
-	  them to some other value in the first section of the flex input;
-	  no need to first #undef them.
-
-	- flex now generates warnings for rules that can't be matched.
-	  These warnings can be turned off using the new '-w' flag.  If
-	  your scanner uses REJECT then you will not get these warnings.
-
-	- If you specify the '-s' flag but the default rule can be matched,
-	  flex now generates a warning.
-
-	- "yyleng" is now a global, and may be modified by the user (though
-	  doing so and then using yymore() will yield weird results).
-
-	- Name definitions in the first section of a scanner specification
-	  can now include a leading '^' or trailing '$' operator.  In this
-	  case, the definition is *not* pushed back inside of parentheses.
-
-	- Scanners with compressed tables are now "interactive" (-I option)
-	  by default.  You can suppress this attribute (which makes them
-	  run slightly slower) using the new '-B' flag.
-
-	- Flex now generates 8-bit scanners by default, unless you use the
-	  -Cf or -CF compression options (-Cfe  and -CFe result in 8-bit
-	  scanners).  You can force it to generate a 7-bit scanner using
-	  the new '-7' flag.  You can build flex to generate 8-bit scanners
-	  for -Cf and -CF, too, by adding -DDEFAULT_CSIZE=256 to CFLAGS
-	  in the Makefile.
-
-	- You no longer need to call the scanner routine yyrestart() to
-	  inform the scanner that you have switched to a new file after
-	  having seen an EOF on the current input file.  Instead, just
-	  point yyin at the new file and continue scanning.
-
-	- You no longer need to invoke YY_NEW_FILE in an <<EOF>> action
-	  to indicate you wish to continue scanning.  Simply point yyin
-	  at a new file.
-
-	- A leading '#' no longer introduces a comment in a flex input.
-
-	- flex no longer considers formfeed ('\f') a whitespace character.
-
-	- %t, I'm happy to report, has been nuked.
-
-	- The '-p' option may be given twice ('-pp') to instruct flex to
-	  report minor performance problems as well as major ones.
-
-	- The '-v' verbose output no longer includes start/finish time
-	  information.
-
-	- Newlines in flex inputs can optionally include leading or
-	  trailing carriage-returns ('\r'), in support of several PC/Mac
-	  run-time libraries that automatically include these.
-
-	- A start condition of the form "<*>" makes the following rule
-	  active in every start condition, whether exclusive or inclusive.
-
-	- The following items have been corrected in the flex documentation:
-
-		- '-C' table compression options *are* cumulative.
-
-		- You may modify yytext but not lengthen it by appending
-		  characters to the end.  Modifying its final character
-		  will affect '^' anchoring for the next rule matched
-		  if the character is changed to or from a newline.
-
-		- The term "backtracking" has been renamed "backing up",
-		  since it is a one-time repositioning and not a repeated
-		  search.  What used to be the "lex.backtrack" file is now
-		  "lex.backup".
-
-		- Unindented "/* ... */" comments are allowed in the first
-		  flex input section, but not in the second.
-
-		- yyless() can only be used in the flex input source, not
-		  externally.
-
-		- You can use "yyrestart(yyin)" to throw away the
-		  current contents of the input buffer.
-
-		- To write high-speed scanners, attempt to match as much
-		  text as possible with each rule.  See MISC/fastwc/README
-		  for more information.
-
-		- Using the beginning-of-line operator ('^') is fairly
-		  cheap.  Using unput() is expensive.  Using yyless() is
-		  cheap.
-
-		- An example of scanning strings with embedded escape
-		  sequences has been added.
-
-		- The example of backing-up in flexdoc was erroneous; it
-		  has been corrected.
-
-	- A flex scanner's internal buffer now dynamically grows if needed
-	  to match large tokens.  Note that growing the buffer presently
-	  requires rescanning the (large) token, so consuming a lot of
-	  text this way is a slow process.  Also note that presently the
-	  buffer does *not* grow if you unput() more text than can fit
-	  into the buffer.
-
-	- The MISC/ directory has been reorganized; see MISC/README for
-	  details.
-
-	- yyless() can now be used in the third (user action) section
-	  of a scanner specification, thanks to Ceriel Jacobs.  yyless()
-	  remains a macro and cannot be used outside of the scanner source.
-
-	- The skeleton file is no longer opened at run-time, but instead
-	  compiled into a large string array (thanks to John Gilmore and
-	  friends at Cygnus).  You can still use the -S flag to point flex
-	  at a different skeleton file.
-
-	- flex no longer uses a temporary file to store the scanner's
-	  actions.
-
-	- A number of changes have been made to decrease porting headaches.
-	  In particular, flex no longer uses memset() or ctime(), and
-	  provides a single simple mechanism for dealing with C compilers
-	  that still define malloc() as returning char* instead of void*.
-
-	- Flex now detects if the scanner specification requires the -8 flag
-	  but the flag was not given or on by default.
-
-	- A number of table-expansion fencepost bugs have been fixed,
-	  making flex more robust for generating large scanners.
-
-	- flex more consistently identifies the location of errors in
-	  its input.
-
-	- YY_USER_ACTION is now invoked only for "real" actions, not for
-	  internal actions used by the scanner for things like filling
-	  the buffer or handling EOF.
-
-	- The rule "[^]]" now matches any character other than a ']';
-	  formerly it matched any character at all followed by a ']'.
-	  This change was made for compatibility with AT&T lex.
-
-	- A large number of miscellaneous bugs have been found and fixed
-	  thanks to Gerhard Wilhelms.
-
-	- The source code has been heavily reformatted, making patches
-	  relative to previous flex releases no longer accurate.
-
-
-Changes between 2.3 Patch #8 (21Feb93) and 2.3 Patch #7:
-
-	- Fixed bugs in dynamic memory allocation leading to grievous
-	  fencepost problems when generating large scanners.
-	- Fixed bug causing infinite loops on character classes with 8-bit
-	  characters in them.
-	- Fixed bug in matching repetitions with a lower bound of 0.
-	- Fixed bug in scanning NUL characters using an "interactive" scanner.
-	- Fixed bug in using yymore() at the end of a file.
-	- Fixed bug in misrecognizing rules with variable trailing context.
-	- Fixed bug compiling flex on Suns using gcc 2.
-	- Fixed bug in not recognizing that input files with the character
-	  ASCII 128 in them require the -8 flag.
-	- Fixed bug that could cause an infinite loop writing out
-	  error messages.
-	- Fixed bug in not recognizing old-style lex % declarations if
-	  followed by a tab instead of a space.
-	- Fixed potential crash when flex terminated early (usually due
-	  to a bad flag) and the -v flag had been given.
-	- Added some missing declarations of void functions.
-	- Changed to only use '\a' for __STDC__ compilers.
-	- Updated mailing addresses.
-
-
-Changes between 2.3 Patch #7 (28Mar91) and 2.3 Patch #6:
-
-	- Fixed out-of-bounds array access that caused bad tables
-	  to be produced on machines where the bad reference happened
-	  to yield a 1.  This caused problems installing or running
-	  flex on some Suns, in particular.
-
-
-Changes between 2.3 Patch #6 (29Aug90) and 2.3 Patch #5:
-
-	- Fixed a serious bug in yymore() which basically made it
-	  completely broken.  Thanks goes to Jean Christophe of
-	  the Nethack development team for finding the problem
-	  and passing along the fix.
-
-
-Changes between 2.3 Patch #5 (16Aug90) and 2.3 Patch #4:
-
-	- An up-to-date version of initscan.c so "make test" will
-	  work after applying the previous patches
-
-
-Changes between 2.3 Patch #4 (14Aug90) and 2.3 Patch #3:
-
-	- Fixed bug in hexadecimal escapes which allowed only digits,
-	  not letters, in escapes
-	- Fixed bug in previous "Changes" file!
-
-
-Changes between 2.3 Patch #3 (03Aug90) and 2.3 Patch #2:
-
-	- Correction to patch #2 for gcc compilation; thanks goes to
-	  Paul Eggert for catching this.
-
-
-Changes between 2.3 Patch #2 (02Aug90) and original 2.3 release:
-
-	- Fixed (hopefully) headaches involving declaring malloc()
-	  and free() for gcc, which defines __STDC__ but (often) doesn't
-	  come with the standard include files such as <stdlib.h>.
-	  Reordered #ifdef maze in the scanner skeleton in the hope of
-	  getting the declarations right for cfront and g++, too.
-
-	- Note that this patch supercedes patch #1 for release 2.3,
-	  which was never announced but was available briefly for
-	  anonymous ftp.
-
-
-Changes between 2.3 (full) release of 28Jun90 and 2.2 (alpha) release:
-
-    User-visible:
-
-	- A lone <<EOF>> rule (that is, one which is not qualified with
-	  a list of start conditions) now specifies the EOF action for
-	  *all* start conditions which haven't already had <<EOF>> actions
-	  given.  To specify an end-of-file action for just the initial
-	  state, use <INITIAL><<EOF>>.
-
-	- -d debug output is now contingent on the global yy_flex_debug
-	  being set to a non-zero value, which it is by default.
-
-	- A new macro, YY_USER_INIT, is provided for the user to specify
-	  initialization action to be taken on the first call to the
-	  scanner.  This action is done before the scanner does its
-	  own initialization.
-
-	- yy_new_buffer() has been added as an alias for yy_create_buffer()
-
-	- Comments beginning with '#' and extending to the end of the line
-	  now work, but have been deprecated (in anticipation of making
-	  flex recognize #line directives).
-
-	- The funky restrictions on when semi-colons could follow the
-	  YY_NEW_FILE and yyless macros have been removed.  They now
-	  behave identically to functions.
-
-	- A bug in the sample redefinition of YY_INPUT in the documentation
-	  has been corrected.
-
-	- A bug in the sample simple tokener in the documentation has
-	  been corrected.
-
-	- The documentation on the incompatibilities between flex and
-	  lex has been reordered so that the discussion of yylineno
-	  and input() come first, as it's anticipated that these will
-	  be the most common source of headaches.
-
-
-    Things which didn't used to be documented but now are:
-
-	- flex interprets "^foo|bar" differently from lex.  flex interprets
-	  it as "match either a 'foo' or a 'bar', providing it comes at the
-	  beginning of a line", whereas lex interprets it as "match either
-	  a 'foo' at the beginning of a line, or a 'bar' anywhere".
-
-	- flex initializes the global "yyin" on the first call to the
-	  scanner, while lex initializes it at compile-time.
-
-	- yy_switch_to_buffer() can be used in the yywrap() macro/routine.
-
-	- flex scanners do not use stdio for their input, and hence when
-	  writing an interactive scanner one must explicitly call fflush()
-	  after writing out a prompt.
-
-	- flex scanner can be made reentrant (after a fashion) by using
-	  "yyrestart( yyin );".  This is useful for interactive scanners
-	  which have interrupt handlers that long-jump out of the scanner.
-
-	- a defense of why yylineno is not supported is included, along
-	  with a suggestion on how to convert scanners which rely on it.
-
-
-    Other changes:
-
-	- Prototypes and proper declarations of void routines have
-	  been added to the flex source code, courtesy of Kevin B. Kenny.
-
-	- Routines dealing with memory allocation now use void* pointers
-	  instead of char* - see Makefile for porting implications.
-
-	- Error-checking is now done when flex closes a file.
-
-	- Various lint tweaks were added to reduce the number of gripes.
-
-	- Makefile has been further parameterized to aid in porting.
-
-	- Support for SCO Unix added.
-
-	- Flex now sports the latest & greatest UC copyright notice
-	  (which is only slightly different from the previous one).
-
-	- A note has been added to flexdoc.1 mentioning work in progress
-	  on modifying flex to generate straight C code rather than a
-	  table-driven automaton, with an email address of whom to contact
-	  if you are working along similar lines.
-
-
-Changes between 2.2 Patch #3 (30Mar90) and 2.2 Patch #2:
-
-	- fixed bug which caused -I scanners to bomb
-
-
-Changes between 2.2 Patch #2 (27Mar90) and 2.2 Patch #1:
-
-	- fixed bug writing past end of input buffer in yyunput()
-	- fixed bug detecting NUL's at the end of a buffer
-
-
-Changes between 2.2 Patch #1 (23Mar90) and 2.2 (alpha) release:
-
-	- Makefile fixes: definition of MAKE variable for systems
-	  which don't have it; installation of flexdoc.1 along with
-	  flex.1; fixed two bugs which could cause "bigtest" to fail.
-
-	- flex.skel fix for compiling with g++.
-
-	- README and flexdoc.1 no longer list an out-of-date BITNET address
-	  for contacting me.
-
-	- minor typos and formatting changes to flex.1 and flexdoc.1.
-
-
-Changes between 2.2 (alpha) release of March '90 and previous release:
-
-    User-visible:
-
-	- Full user documentation now available.
-
-	- Support for 8-bit scanners.
-
-	- Scanners now accept NUL's.
-
-	- A facility has been added for dealing with multiple
-	  input buffers.
-
-	- Two manual entries now.  One which fully describes flex
-	  (rather than just its differences from lex), and the
-	  other for quick(er) reference.
-
-	- A number of changes to bring flex closer into compliance
-	  with the latest POSIX lex draft:
-
-		%t support
-		flex now accepts multiple input files and concatenates
-		    them together to form its input
-		previous -c (compress) flag renamed -C
-		do-nothing -c and -n flags added
-		Any indented code or code within %{}'s in section 2 is
-		    now copied to the output
-
-	- yyleng is now a bona fide global integer.
-
-	- -d debug information now gives the line number of the
-	  matched rule instead of which number rule it was from
-	  the beginning of the file.
-
-	- -v output now includes a summary of the flags used to generate
-	  the scanner.
-
-	- unput() and yyrestart() are now globally callable.
-
-	- yyrestart() no longer closes the previous value of yyin.
-
-	- C++ support; generated scanners can be compiled with C++ compiler.
-
-	- Primitive -lfl library added, containing default main()
-	  which calls yylex().  A number of routines currently living
-	  in the scanner skeleton will probably migrate to here
-	  in the future (in particular, yywrap() will probably cease
-	  to be a macro and instead be a function in the -lfl library).
-
-	- Hexadecimal (\x) escape sequences added.
-
-	- Support for MS-DOS, VMS, and Turbo-C integrated.
-
-	- The %used/%unused operators have been deprecated.  They
-	  may go away soon.
-
-
-    Other changes:
-
-	- Makefile enhanced for easier testing and installation.
-	- The parser has been tweaked to detect some erroneous
-	  constructions which previously were missed.
-	- Scanner input buffer overflow is now detected.
-	- Bugs with missing "const" declarations fixed.
-	- Out-of-date Minix/Atari patches provided.
-	- Scanners no longer require printf() unless FLEX_DEBUG is being used.
-	- A subtle input() bug has been fixed.
-	- Line numbers for "continued action" rules (those following
-	  the special '|' action) are now correct.
-	- unput() bug fixed; had been causing problems porting flex to VMS.
-	- yymore() handling rewritten to fix bug with interaction
-	  between yymore() and trailing context.
-	- EOF in actions now generates an error message.
-	- Bug involving -CFe and generating equivalence classes fixed.
-	- Bug which made -CF be treated as -Cf fixed.
-	- Support for SysV tmpnam() added.
-	- Unused #define's for scanner no longer generated.
-	- Error messages which are associated with a particular input
-	  line are now all identified with their input line in standard
-	  format.
-	- % directives which are valid to lex but not to flex are
-	  now ignored instead of generating warnings.
-	- -DSYS_V flag can now also be specified -DUSG for System V
-	  compilation.
-
-
-Changes between 2.1 beta-test release of June '89 and previous release:
-
-    User-visible:
-
-	- -p flag generates a performance report to stderr.  The report
-	  consists of comments regarding features of the scanner rules
-	  which result in slower scanners.
-
-	- -b flag generates backtracking information to lex.backtrack.
-	  This is a list of scanner states which require backtracking
-	  and the characters on which they do so.  By adding rules
-	  one can remove backtracking states.  If all backtracking states
-	  are eliminated, the generated scanner will run faster.
-	  Backtracking is not yet documented in the manual entry.
-
-	- Variable trailing context now works, i.e., one can have
-	  rules like "(foo)*/[ \t]*bletch".  Some trailing context
-	  patterns still cannot be properly matched and generate
-	  error messages.  These are patterns where the ending of the
-	  first part of the rule matches the beginning of the second
-	  part, such as "zx*/xy*", where the 'x*' matches the 'x' at
-	  the beginning of the trailing context.  Lex won't get these
-	  patterns right either.
-
-	- Faster scanners.
-
-	- End-of-file rules.  The special rule "<<EOF>>" indicates
-	  actions which are to be taken when an end-of-file is
-	  encountered and yywrap() returns non-zero (i.e., indicates
-	  no further files to process).  See manual entry for example.
-
-	- The -r (reject used) flag is gone.  flex now scans the input
-	  for occurrences of the string "REJECT" to determine if the
-	  action is needed.  It tries to be intelligent about this but
-	  can be fooled.  One can force the presence or absence of
-	  REJECT by adding a line in the first section of the form
-	  "%used REJECT" or "%unused REJECT".
-
-	- yymore() has been implemented.  Similarly to REJECT, flex
-	  detects the use of yymore(), which can be overridden using
-	  "%used" or "%unused".
-
-	- Patterns like "x{0,3}" now work (i.e., with lower-limit == 0).
-
-	- Removed '\^x' for ctrl-x misfeature.
-
-	- Added '\a' and '\v' escape sequences.
-
-	- \<digits> now works for octal escape sequences; previously
-	  \0<digits> was required.
-
-	- Better error reporting; line numbers are associated with rules.
-
-	- yyleng is a macro; it cannot be accessed outside of the
-	  scanner source file.
-
-	- yytext and yyleng should not be modified within a flex action.
-
-	- Generated scanners #define the name FLEX_SCANNER.
-
-	- Rules are internally separated by YY_BREAK in lex.yy.c rather
-	  than break, to allow redefinition.
-
-	- The macro YY_USER_ACTION can be redefined to provide an action
-	  which is always executed prior to the matched rule's action.
-	
-	- yyrestart() is a new action which can be used to restart
-	  the scanner after it has seen an end-of-file (a "real" one,
-	  that is, one for which yywrap() returned non-zero).  It takes
-	  a FILE* argument indicating a new file to scan and sets
-	  things up so that a subsequent call to yylex() will start
-	  scanning that file.
-
-	- Internal scanner names all preceded by "yy_"
-
-	- lex.yy.c is deleted if errors are encountered during processing.
-
-	- Comments may be put in the first section of the input by preceding
-	  them with '#'.
-
-
-
-    Other changes:
-
-	- Some portability-related bugs fixed, in particular for machines
-	  with unsigned characters or sizeof( int* ) != sizeof( int ).
-	  Also, tweaks for VMS and Microsoft C (MS-DOS), and identifiers all
-	  trimmed to be 31 or fewer characters.  Shortened file names
-	  for dinosaur OS's.  Checks for allocating > 64K memory
-	  on 16 bit'ers.  Amiga tweaks.  Compiles using gcc on a Sun-3.
-	- Compressed and fast scanner skeletons merged.
-	- Skeleton header files done away with.
-	- Generated scanner uses prototypes and "const" for __STDC__.
-	- -DSV flag is now -DSYS_V for System V compilation.
-	- Removed all references to FTL language.
-	- Software now covered by BSD Copyright.
-	- flex will replace lex in subsequent BSD releases.
diff --git a/usr.bin/lex/README b/usr.bin/lex/README
deleted file mode 100644
index 7a4224d..0000000
--- a/usr.bin/lex/README
+++ /dev/null
@@ -1,60 +0,0 @@
-This is release 2.5 of flex.  See "version.h" for the exact patch-level.
-
-See the file "NEWS" to find out what is new in this Flex release.
-
-Read the file "INSTALL" for general installation directives.  Peek near
-the beginning of the file "Makefile.in" for special DEFS values.  On most
-systems, you can just run the "configure" script and type "make" to build
-flex; then "make check" to test whether it built correctly; and if it did,
-then "make install" to install it.
-
-If you're feeling adventurous, you can also issue "make bigcheck" (be
-prepared to wait a while).
-
-Note that flex is distributed under a copyright very similar to that of
-BSD Unix, and not under the GNU General Public License (GPL), except for
-the "configure" script, which is covered by the GPL.
-
-Many thanks to the 2.5 beta-testers for finding bugs and helping test and
-increase portability: Stan Adermann, Scott David Daniels, Charles Elliott,
-Joe Gayda, Chris Meier, James Nordby, Terrence O'Kane, Karsten Pahnke,
-Francois Pinard, Pat Rankin, Andreas Scherer, Marc Wiese, Nathan Zelle.
-
-Please send bug reports and feedback to: Vern Paxson (vern@ee.lbl.gov).
-
-
-The flex distribution consists of the following files:
-
-	README		This message
-
-	NEWS		Differences between the various releases
-
-	INSTALL		General installation information
-
-	COPYING		flex's copyright
-
-	conf.in, configure.in, configure, Makefile.in, install.sh,
-		mkinstalldirs
-			elements of the "autoconf" auto-configuration process
-
-	flexdef.h, parse.y, scan.l, ccl.c, dfa.c, ecs.c, gen.c, main.c,
-	misc.c, nfa.c, sym.c, tblcmp.c, yylex.c	 
-			source files
-
-	version.h	version of this flex release
-
-	flex.skl	flex scanner skeleton
-	mkskel.sh	script for converting flex.skl to C source file skel.c
-	skel.c		pre-converted C version of flex.skl
-
-	libmain.c	flex library (-lfl) sources
-	libyywrap.c
-
-	initscan.c	pre-flex'd version of scan.l
-
-	FlexLexer.h	header file for C++ lexer class
-
-	flex.1		user documentation
-
-	MISC/		a directory containing miscellaneous contributions.
-			See MISC/README for details.
diff --git a/usr.bin/lex/ccl.c b/usr.bin/lex/ccl.c
deleted file mode 100644
index f2607bf..0000000
--- a/usr.bin/lex/ccl.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* ccl - routines for character classes */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Vern Paxson.
- * 
- * The United States Government has rights in this work pursuant
- * to contract no. DE-AC03-76SF00098 between the United States
- * Department of Energy and the University of California.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* $Header: /home/daffy/u0/vern/flex/RCS/ccl.c,v 2.9 93/09/16 20:32:14 vern Exp $ */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "flexdef.h"
-
-/* ccladd - add a single character to a ccl */
-
-void ccladd( cclp, ch )
-int cclp;
-int ch;
-	{
-	int ind, len, newpos, i;
-
-	check_char( ch );
-
-	len = ccllen[cclp];
-	ind = cclmap[cclp];
-
-	/* check to see if the character is already in the ccl */
-
-	for ( i = 0; i < len; ++i )
-		if ( ccltbl[ind + i] == ch )
-			return;
-
-	newpos = ind + len;
-
-	if ( newpos >= current_max_ccl_tbl_size )
-		{
-		current_max_ccl_tbl_size += MAX_CCL_TBL_SIZE_INCREMENT;
-
-		++num_reallocs;
-
-		ccltbl = reallocate_Character_array( ccltbl,
-						current_max_ccl_tbl_size );
-		}
-
-	ccllen[cclp] = len + 1;
-	ccltbl[newpos] = ch;
-	}
-
-
-/* cclinit - return an empty ccl */
-
-int cclinit()
-	{
-	if ( ++lastccl >= current_maxccls )
-		{
-		current_maxccls += MAX_CCLS_INCREMENT;
-
-		++num_reallocs;
-
-		cclmap = reallocate_integer_array( cclmap, current_maxccls );
-		ccllen = reallocate_integer_array( ccllen, current_maxccls );
-		cclng = reallocate_integer_array( cclng, current_maxccls );
-		}
-
-	if ( lastccl == 1 )
-		/* we're making the first ccl */
-		cclmap[lastccl] = 0;
-
-	else
-		/* The new pointer is just past the end of the last ccl.
-		 * Since the cclmap points to the \first/ character of a
-		 * ccl, adding the length of the ccl to the cclmap pointer
-		 * will produce a cursor to the first free space.
-		 */
-		cclmap[lastccl] = cclmap[lastccl - 1] + ccllen[lastccl - 1];
-
-	ccllen[lastccl] = 0;
-	cclng[lastccl] = 0;	/* ccl's start out life un-negated */
-
-	return lastccl;
-	}
-
-
-/* cclnegate - negate the given ccl */
-
-void cclnegate( cclp )
-int cclp;
-	{
-	cclng[cclp] = 1;
-	}
-
-
-/* list_character_set - list the members of a set of characters in CCL form
- *
- * Writes to the given file a character-class representation of those
- * characters present in the given CCL.  A character is present if it
- * has a non-zero value in the cset array.
- */
-
-void list_character_set( file, cset )
-FILE *file;
-int cset[];
-	{
-	int i;
-
-	putc( '[', file );
-
-	for ( i = 0; i < csize; ++i )
-		{
-		if ( cset[i] )
-			{
-			int start_char = i;
-
-			putc( ' ', file );
-
-			fputs( readable_form( i ), file );
-
-			while ( ++i < csize && cset[i] )
-				;
-
-			if ( i - 1 > start_char )
-				/* this was a run */
-				fprintf( file, "-%s", readable_form( i - 1 ) );
-
-			putc( ' ', file );
-			}
-		}
-
-	putc( ']', file );
-	}
diff --git a/usr.bin/lex/config.h b/usr.bin/lex/config.h
index 2e0b5b4..88361dfb 100644
--- a/usr.bin/lex/config.h
+++ b/usr.bin/lex/config.h
@@ -1,26 +1,208 @@
-/* config.h.  Generated automatically by configure.  */
+/* config.h.  Generated from conf.in by configure.  */
+/* conf.in.  Generated from configure.in by autoheader.  */
 /* $FreeBSD$ */
 
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+/* #undef CRAY_STACKSEG_END */
 
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
+/* Define to 1 if using `alloca.c'. */
+/* #undef C_ALLOCA */
 
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+/* #undef ENABLE_NLS */
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+#define HAVE_ALLOCA 1
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+   */
+/* #undef HAVE_DCGETTEXT */
+
+/* Define to 1 if you have the `dup2' function. */
+#define HAVE_DUP2 1
+
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+/* #undef HAVE_GETTEXT */
+
+/* Define if you have the iconv() function. */
+/* #undef HAVE_ICONV */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `isascii' function. */
+#define HAVE_ISASCII 1
+
+/* Define to 1 if you have the <libintl.h> header file. */
+/* #undef HAVE_LIBINTL_H */
+
+/* Define to 1 if you have the `m' library (-lm). */
+#define HAVE_LIBM 1
+
+/* pthread library */
+#define HAVE_LIBPTHREAD 1
 
-/* Define if you have the <malloc.h> header file.  */
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#define HAVE_MALLOC 1
+
+/* Define to 1 if you have the <malloc.h> header file. */
 /* #undef HAVE_MALLOC_H */
 
-/* Define if you have the <string.h> header file.  */
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the `pow' function. */
+#define HAVE_POW 1
+
+/* Define to 1 if you have the <pthread.h> header file. */
+#define HAVE_PTHREAD_H 1
+
+/* Define to 1 if your system has a GNU libc compatible `realloc' function,
+   and to 0 otherwise. */
+#define HAVE_REALLOC 1
+
+/* Define to 1 if you have the `regcomp' function. */
+#define HAVE_REGCOMP 1
+
+/* Define to 1 if you have the <regex.h> header file. */
+#define HAVE_REGEX_H 1
+
+/* Define to 1 if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
+/* Define to 1 if stdbool.h conforms to C99. */
+#define HAVE_STDBOOL_H 1
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
-/* Define if you have the <sys/types.h> header file.  */
+/* Define to 1 if you have the `strtol' function. */
+#define HAVE_STRTOL 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-/* #undef HAVE_ALLOCA_H */
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `vfork' function. */
+#define HAVE_VFORK 1
+
+/* Define to 1 if you have the <vfork.h> header file. */
+/* #undef HAVE_VFORK_H */
+
+/* Define to 1 if `fork' works. */
+#define HAVE_WORKING_FORK 1
+
+/* Define to 1 if `vfork' works. */
+#define HAVE_WORKING_VFORK 1
+
+/* Define to 1 if the system has the type `_Bool'. */
+#define HAVE__BOOL 1
+
+/* Define to the m4 executable name. */
+#define M4 "m4"
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
+
+/* Name of package */
+#define PACKAGE "flex"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "flex-help@lists.sourceforge.net"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "the fast lexical analyser generator"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "the fast lexical analyser generator 2.5.37"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "flex"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "2.5.37"
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at runtime.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
+/* #undef STACK_DIRECTION */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "2.5.37"
+
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+   `char[]'. */
+#define YYTEXT_POINTER 1
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to rpl_malloc if the replacement function should be used. */
+/* #undef malloc */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
+/* Define to rpl_realloc if the replacement function should be used. */
+/* #undef realloc */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
 
-/* Define if platform-specific command line handling is necessary.  */
-/* #undef NEED_ARGV_FIXUP */
+/* Define as `fork' if `vfork' does not work. */
+/* #undef vfork */
diff --git a/usr.bin/lex/dfa.c b/usr.bin/lex/dfa.c
deleted file mode 100644
index 5a86af1..0000000
--- a/usr.bin/lex/dfa.c
+++ /dev/null
@@ -1,1097 +0,0 @@
-/* dfa - DFA construction routines */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Vern Paxson.
- * 
- * The United States Government has rights in this work pursuant
- * to contract no. DE-AC03-76SF00098 between the United States
- * Department of Energy and the University of California.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* $Header: /home/daffy/u0/vern/flex/RCS/dfa.c,v 2.26 95/04/20 13:53:14 vern Exp $ */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "flexdef.h"
-
-
-/* declare functions that have forward references */
-
-void dump_associated_rules PROTO((FILE*, int));
-void dump_transitions PROTO((FILE*, int[]));
-void sympartition PROTO((int[], int, int[], int[]));
-int symfollowset PROTO((int[], int, int, int[]));
-
-
-/* check_for_backing_up - check a DFA state for backing up
- *
- * synopsis
- *     void check_for_backing_up( int ds, int state[numecs] );
- *
- * ds is the number of the state to check and state[] is its out-transitions,
- * indexed by equivalence class.
- */
-
-void check_for_backing_up( ds, state )
-int ds;
-int state[];
-	{
-	if ( (reject && ! dfaacc[ds].dfaacc_set) ||
-	     (! reject && ! dfaacc[ds].dfaacc_state) )
-		{ /* state is non-accepting */
-		++num_backing_up;
-
-		if ( backing_up_report )
-			{
-			fprintf( backing_up_file,
-				_( "State #%d is non-accepting -\n" ), ds );
-
-			/* identify the state */
-			dump_associated_rules( backing_up_file, ds );
-
-			/* Now identify it further using the out- and
-			 * jam-transitions.
-			 */
-			dump_transitions( backing_up_file, state );
-
-			putc( '\n', backing_up_file );
-			}
-		}
-	}
-
-
-/* check_trailing_context - check to see if NFA state set constitutes
- *                          "dangerous" trailing context
- *
- * synopsis
- *    void check_trailing_context( int nfa_states[num_states+1], int num_states,
- *				int accset[nacc+1], int nacc );
- *
- * NOTES
- *  Trailing context is "dangerous" if both the head and the trailing
- *  part are of variable size \and/ there's a DFA state which contains
- *  both an accepting state for the head part of the rule and NFA states
- *  which occur after the beginning of the trailing context.
- *
- *  When such a rule is matched, it's impossible to tell if having been
- *  in the DFA state indicates the beginning of the trailing context or
- *  further-along scanning of the pattern.  In these cases, a warning
- *  message is issued.
- *
- *    nfa_states[1 .. num_states] is the list of NFA states in the DFA.
- *    accset[1 .. nacc] is the list of accepting numbers for the DFA state.
- */
-
-void check_trailing_context( nfa_states, num_states, accset, nacc )
-int *nfa_states, num_states;
-int *accset;
-int nacc;
-	{
-	int i, j;
-
-	for ( i = 1; i <= num_states; ++i )
-		{
-		int ns = nfa_states[i];
-		int type = state_type[ns];
-		int ar = assoc_rule[ns];
-
-		if ( type == STATE_NORMAL || rule_type[ar] != RULE_VARIABLE )
-			{ /* do nothing */
-			}
-
-		else if ( type == STATE_TRAILING_CONTEXT )
-			{
-			/* Potential trouble.  Scan set of accepting numbers
-			 * for the one marking the end of the "head".  We
-			 * assume that this looping will be fairly cheap
-			 * since it's rare that an accepting number set
-			 * is large.
-			 */
-			for ( j = 1; j <= nacc; ++j )
-				if ( accset[j] & YY_TRAILING_HEAD_MASK )
-					{
-					line_warning(
-					_( "dangerous trailing context" ),
-						rule_linenum[ar] );
-					return;
-					}
-			}
-		}
-	}
-
-
-/* dump_associated_rules - list the rules associated with a DFA state
- *
- * Goes through the set of NFA states associated with the DFA and
- * extracts the first MAX_ASSOC_RULES unique rules, sorts them,
- * and writes a report to the given file.
- */
-
-void dump_associated_rules( file, ds )
-FILE *file;
-int ds;
-	{
-	int i, j;
-	int num_associated_rules = 0;
-	int rule_set[MAX_ASSOC_RULES + 1];
-	int *dset = dss[ds];
-	int size = dfasiz[ds];
-
-	for ( i = 1; i <= size; ++i )
-		{
-		int rule_num = rule_linenum[assoc_rule[dset[i]]];
-
-		for ( j = 1; j <= num_associated_rules; ++j )
-			if ( rule_num == rule_set[j] )
-				break;
-
-		if ( j > num_associated_rules )
-			{ /* new rule */
-			if ( num_associated_rules < MAX_ASSOC_RULES )
-				rule_set[++num_associated_rules] = rule_num;
-			}
-		}
-
-	bubble( rule_set, num_associated_rules );
-
-	fprintf( file, _( " associated rule line numbers:" ) );
-
-	for ( i = 1; i <= num_associated_rules; ++i )
-		{
-		if ( i % 8 == 1 )
-			putc( '\n', file );
-
-		fprintf( file, "\t%d", rule_set[i] );
-		}
-
-	putc( '\n', file );
-	}
-
-
-/* dump_transitions - list the transitions associated with a DFA state
- *
- * synopsis
- *     dump_transitions( FILE *file, int state[numecs] );
- *
- * Goes through the set of out-transitions and lists them in human-readable
- * form (i.e., not as equivalence classes); also lists jam transitions
- * (i.e., all those which are not out-transitions, plus EOF).  The dump
- * is done to the given file.
- */
-
-void dump_transitions( file, state )
-FILE *file;
-int state[];
-	{
-	int i, ec;
-	int out_char_set[CSIZE];
-
-	for ( i = 0; i < csize; ++i )
-		{
-		ec = ABS( ecgroup[i] );
-		out_char_set[i] = state[ec];
-		}
-
-	fprintf( file, _( " out-transitions: " ) );
-
-	list_character_set( file, out_char_set );
-
-	/* now invert the members of the set to get the jam transitions */
-	for ( i = 0; i < csize; ++i )
-		out_char_set[i] = ! out_char_set[i];
-
-	fprintf( file, _( "\n jam-transitions: EOF " ) );
-
-	list_character_set( file, out_char_set );
-
-	putc( '\n', file );
-	}
-
-
-/* epsclosure - construct the epsilon closure of a set of ndfa states
- *
- * synopsis
- *    int *epsclosure( int t[num_states], int *numstates_addr,
- *			int accset[num_rules+1], int *nacc_addr,
- *			int *hashval_addr );
- *
- * NOTES
- *  The epsilon closure is the set of all states reachable by an arbitrary
- *  number of epsilon transitions, which themselves do not have epsilon
- *  transitions going out, unioned with the set of states which have non-null
- *  accepting numbers.  t is an array of size numstates of nfa state numbers.
- *  Upon return, t holds the epsilon closure and *numstates_addr is updated.
- *  accset holds a list of the accepting numbers, and the size of accset is
- *  given by *nacc_addr.  t may be subjected to reallocation if it is not
- *  large enough to hold the epsilon closure.
- *
- *  hashval is the hash value for the dfa corresponding to the state set.
- */
-
-int *epsclosure( t, ns_addr, accset, nacc_addr, hv_addr )
-int *t, *ns_addr, accset[], *nacc_addr, *hv_addr;
-	{
-	int stkpos, ns, tsp;
-	int numstates = *ns_addr, nacc, hashval, transsym, nfaccnum;
-	int stkend, nstate;
-	static int did_stk_init = false, *stk; 
-
-#define MARK_STATE(state) \
-trans1[state] = trans1[state] - MARKER_DIFFERENCE;
-
-#define IS_MARKED(state) (trans1[state] < 0)
-
-#define UNMARK_STATE(state) \
-trans1[state] = trans1[state] + MARKER_DIFFERENCE;
-
-#define CHECK_ACCEPT(state) \
-{ \
-nfaccnum = accptnum[state]; \
-if ( nfaccnum != NIL ) \
-accset[++nacc] = nfaccnum; \
-}
-
-#define DO_REALLOCATION \
-{ \
-current_max_dfa_size += MAX_DFA_SIZE_INCREMENT; \
-++num_reallocs; \
-t = reallocate_integer_array( t, current_max_dfa_size ); \
-stk = reallocate_integer_array( stk, current_max_dfa_size ); \
-} \
-
-#define PUT_ON_STACK(state) \
-{ \
-if ( ++stkend >= current_max_dfa_size ) \
-DO_REALLOCATION \
-stk[stkend] = state; \
-MARK_STATE(state) \
-}
-
-#define ADD_STATE(state) \
-{ \
-if ( ++numstates >= current_max_dfa_size ) \
-DO_REALLOCATION \
-t[numstates] = state; \
-hashval += state; \
-}
-
-#define STACK_STATE(state) \
-{ \
-PUT_ON_STACK(state) \
-CHECK_ACCEPT(state) \
-if ( nfaccnum != NIL || transchar[state] != SYM_EPSILON ) \
-ADD_STATE(state) \
-}
-
-
-	if ( ! did_stk_init )
-		{
-		stk = allocate_integer_array( current_max_dfa_size );
-		did_stk_init = true;
-		}
-
-	nacc = stkend = hashval = 0;
-
-	for ( nstate = 1; nstate <= numstates; ++nstate )
-		{
-		ns = t[nstate];
-
-		/* The state could be marked if we've already pushed it onto
-		 * the stack.
-		 */
-		if ( ! IS_MARKED(ns) )
-			{
-			PUT_ON_STACK(ns)
-			CHECK_ACCEPT(ns)
-			hashval += ns;
-			}
-		}
-
-	for ( stkpos = 1; stkpos <= stkend; ++stkpos )
-		{
-		ns = stk[stkpos];
-		transsym = transchar[ns];
-
-		if ( transsym == SYM_EPSILON )
-			{
-			tsp = trans1[ns] + MARKER_DIFFERENCE;
-
-			if ( tsp != NO_TRANSITION )
-				{
-				if ( ! IS_MARKED(tsp) )
-					STACK_STATE(tsp)
-
-				tsp = trans2[ns];
-
-				if ( tsp != NO_TRANSITION && ! IS_MARKED(tsp) )
-					STACK_STATE(tsp)
-				}
-			}
-		}
-
-	/* Clear out "visit" markers. */
-
-	for ( stkpos = 1; stkpos <= stkend; ++stkpos )
-		{
-		if ( IS_MARKED(stk[stkpos]) )
-			UNMARK_STATE(stk[stkpos])
-		else
-			flexfatal(
-			_( "consistency check failed in epsclosure()" ) );
-		}
-
-	*ns_addr = numstates;
-	*hv_addr = hashval;
-	*nacc_addr = nacc;
-
-	return t;
-	}
-
-
-/* increase_max_dfas - increase the maximum number of DFAs */
-
-void increase_max_dfas()
-	{
-	current_max_dfas += MAX_DFAS_INCREMENT;
-
-	++num_reallocs;
-
-	base = reallocate_integer_array( base, current_max_dfas );
-	def = reallocate_integer_array( def, current_max_dfas );
-	dfasiz = reallocate_integer_array( dfasiz, current_max_dfas );
-	accsiz = reallocate_integer_array( accsiz, current_max_dfas );
-	dhash = reallocate_integer_array( dhash, current_max_dfas );
-	dss = reallocate_int_ptr_array( dss, current_max_dfas );
-	dfaacc = reallocate_dfaacc_union( dfaacc, current_max_dfas );
-
-	if ( nultrans )
-		nultrans =
-			reallocate_integer_array( nultrans, current_max_dfas );
-	}
-
-
-/* ntod - convert an ndfa to a dfa
- *
- * Creates the dfa corresponding to the ndfa we've constructed.  The
- * dfa starts out in state #1.
- */
-
-void ntod()
-	{
-	int *accset, ds, nacc, newds;
-	int sym, hashval, numstates, dsize;
-	int num_full_table_rows;	/* used only for -f */
-	int *nset, *dset;
-	int targptr, totaltrans, i, comstate, comfreq, targ;
-	int symlist[CSIZE + 1];
-	int num_start_states;
-	int todo_head, todo_next;
-
-	/* Note that the following are indexed by *equivalence classes*
-	 * and not by characters.  Since equivalence classes are indexed
-	 * beginning with 1, even if the scanner accepts NUL's, this
-	 * means that (since every character is potentially in its own
-	 * equivalence class) these arrays must have room for indices
-	 * from 1 to CSIZE, so their size must be CSIZE + 1.
-	 */
-	int duplist[CSIZE + 1], state[CSIZE + 1];
-	int targfreq[CSIZE + 1], targstate[CSIZE + 1];
-
-	accset = allocate_integer_array( num_rules + 1 );
-	nset = allocate_integer_array( current_max_dfa_size );
-
-	/* The "todo" queue is represented by the head, which is the DFA
-	 * state currently being processed, and the "next", which is the
-	 * next DFA state number available (not in use).  We depend on the
-	 * fact that snstods() returns DFA's \in increasing order/, and thus
-	 * need only know the bounds of the dfas to be processed.
-	 */
-	todo_head = todo_next = 0;
-
-	for ( i = 0; i <= csize; ++i )
-		{
-		duplist[i] = NIL;
-		symlist[i] = false;
-		}
-
-	for ( i = 0; i <= num_rules; ++i )
-		accset[i] = NIL;
-
-	if ( trace )
-		{
-		dumpnfa( scset[1] );
-		fputs( _( "\n\nDFA Dump:\n\n" ), stderr );
-		}
-
-	inittbl();
-
-	/* Check to see whether we should build a separate table for
-	 * transitions on NUL characters.  We don't do this for full-speed
-	 * (-F) scanners, since for them we don't have a simple state
-	 * number lying around with which to index the table.  We also
-	 * don't bother doing it for scanners unless (1) NUL is in its own
-	 * equivalence class (indicated by a positive value of
-	 * ecgroup[NUL]), (2) NUL's equivalence class is the last
-	 * equivalence class, and (3) the number of equivalence classes is
-	 * the same as the number of characters.  This latter case comes
-	 * about when useecs is false or when it's true but every character
-	 * still manages to land in its own class (unlikely, but it's
-	 * cheap to check for).  If all these things are true then the
-	 * character code needed to represent NUL's equivalence class for
-	 * indexing the tables is going to take one more bit than the
-	 * number of characters, and therefore we won't be assured of
-	 * being able to fit it into a YY_CHAR variable.  This rules out
-	 * storing the transitions in a compressed table, since the code
-	 * for interpreting them uses a YY_CHAR variable (perhaps it
-	 * should just use an integer, though; this is worth pondering ...
-	 * ###).
-	 *
-	 * Finally, for full tables, we want the number of entries in the
-	 * table to be a power of two so the array references go fast (it
-	 * will just take a shift to compute the major index).  If
-	 * encoding NUL's transitions in the table will spoil this, we
-	 * give it its own table (note that this will be the case if we're
-	 * not using equivalence classes).
-	 */
-
-	/* Note that the test for ecgroup[0] == numecs below accomplishes
-	 * both (1) and (2) above
-	 */
-	if ( ! fullspd && ecgroup[0] == numecs )
-		{
-		/* NUL is alone in its equivalence class, which is the
-		 * last one.
-		 */
-		int use_NUL_table = (numecs == csize);
-
-		if ( fulltbl && ! use_NUL_table )
-			{
-			/* We still may want to use the table if numecs
-			 * is a power of 2.
-			 */
-			int power_of_two;
-
-			for ( power_of_two = 1; power_of_two <= csize;
-			      power_of_two *= 2 )
-				if ( numecs == power_of_two )
-					{
-					use_NUL_table = true;
-					break;
-					}
-			}
-
-		if ( use_NUL_table )
-			nultrans = allocate_integer_array( current_max_dfas );
-
-		/* From now on, nultrans != nil indicates that we're
-		 * saving null transitions for later, separate encoding.
-		 */
-		}
-
-
-	if ( fullspd )
-		{
-		for ( i = 0; i <= numecs; ++i )
-			state[i] = 0;
-
-		place_state( state, 0, 0 );
-		dfaacc[0].dfaacc_state = 0;
-		}
-
-	else if ( fulltbl )
-		{
-		if ( nultrans )
-			/* We won't be including NUL's transitions in the
-			 * table, so build it for entries from 0 .. numecs - 1.
-			 */
-			num_full_table_rows = numecs;
-
-		else
-			/* Take into account the fact that we'll be including
-			 * the NUL entries in the transition table.  Build it
-			 * from 0 .. numecs.
-			 */
-			num_full_table_rows = numecs + 1;
-
-		/* Unless -Ca, declare it "short" because it's a real
-		 * long-shot that that won't be large enough.
-		 */
-		out_str_dec( "static yyconst %s yy_nxt[][%d] =\n    {\n",
-			/* '}' so vi doesn't get too confused */
-			long_align ? "long" : "short", num_full_table_rows );
-
-		outn( "    {" );
-
-		/* Generate 0 entries for state #0. */
-		for ( i = 0; i < num_full_table_rows; ++i )
-			mk2data( 0 );
-
-		dataflush();
-		outn( "    },\n" );
-		}
-
-	/* Create the first states. */
-
-	num_start_states = lastsc * 2;
-
-	for ( i = 1; i <= num_start_states; ++i )
-		{
-		numstates = 1;
-
-		/* For each start condition, make one state for the case when
-		 * we're at the beginning of the line (the '^' operator) and
-		 * one for the case when we're not.
-		 */
-		if ( i % 2 == 1 )
-			nset[numstates] = scset[(i / 2) + 1];
-		else
-			nset[numstates] =
-				mkbranch( scbol[i / 2], scset[i / 2] );
-
-		nset = epsclosure( nset, &numstates, accset, &nacc, &hashval );
-
-		if ( snstods( nset, numstates, accset, nacc, hashval, &ds ) )
-			{
-			numas += nacc;
-			totnst += numstates;
-			++todo_next;
-
-			if ( variable_trailing_context_rules && nacc > 0 )
-				check_trailing_context( nset, numstates,
-							accset, nacc );
-			}
-		}
-
-	if ( ! fullspd )
-		{
-		if ( ! snstods( nset, 0, accset, 0, 0, &end_of_buffer_state ) )
-			flexfatal(
-			_( "could not create unique end-of-buffer state" ) );
-
-		++numas;
-		++num_start_states;
-		++todo_next;
-		}
-
-	while ( todo_head < todo_next )
-		{
-		targptr = 0;
-		totaltrans = 0;
-
-		for ( i = 1; i <= numecs; ++i )
-			state[i] = 0;
-
-		ds = ++todo_head;
-
-		dset = dss[ds];
-		dsize = dfasiz[ds];
-
-		if ( trace )
-			fprintf( stderr, _( "state # %d:\n" ), ds );
-
-		sympartition( dset, dsize, symlist, duplist );
-
-		for ( sym = 1; sym <= numecs; ++sym )
-			{
-			if ( symlist[sym] )
-				{
-				symlist[sym] = 0;
-
-				if ( duplist[sym] == NIL )
-					{
-					/* Symbol has unique out-transitions. */
-					numstates = symfollowset( dset, dsize,
-								sym, nset );
-					nset = epsclosure( nset, &numstates,
-						accset, &nacc, &hashval );
-
-					if ( snstods( nset, numstates, accset,
-						nacc, hashval, &newds ) )
-						{
-						totnst = totnst + numstates;
-						++todo_next;
-						numas += nacc;
-
-						if (
-					variable_trailing_context_rules &&
-							nacc > 0 )
-							check_trailing_context(
-								nset, numstates,
-								accset, nacc );
-						}
-
-					state[sym] = newds;
-
-					if ( trace )
-						fprintf( stderr, "\t%d\t%d\n",
-							sym, newds );
-
-					targfreq[++targptr] = 1;
-					targstate[targptr] = newds;
-					++numuniq;
-					}
-
-				else
-					{
-					/* sym's equivalence class has the same
-					 * transitions as duplist(sym)'s
-					 * equivalence class.
-					 */
-					targ = state[duplist[sym]];
-					state[sym] = targ;
-
-					if ( trace )
-						fprintf( stderr, "\t%d\t%d\n",
-							sym, targ );
-
-					/* Update frequency count for
-					 * destination state.
-					 */
-
-					i = 0;
-					while ( targstate[++i] != targ )
-						;
-
-					++targfreq[i];
-					++numdup;
-					}
-
-				++totaltrans;
-				duplist[sym] = NIL;
-				}
-			}
-
-		if ( caseins && ! useecs )
-			{
-			int j;
-
-			for ( i = 'A', j = 'a'; i <= 'Z'; ++i, ++j )
-				{
-				if ( state[i] == 0 && state[j] != 0 )
-					/* We're adding a transition. */
-					++totaltrans;
-
-				else if ( state[i] != 0 && state[j] == 0 )
-					/* We're taking away a transition. */
-					--totaltrans;
-
-				state[i] = state[j];
-				}
-			}
-
-		numsnpairs += totaltrans;
-
-		if ( ds > num_start_states )
-			check_for_backing_up( ds, state );
-
-		if ( nultrans )
-			{
-			nultrans[ds] = state[NUL_ec];
-			state[NUL_ec] = 0;	/* remove transition */
-			}
-
-		if ( fulltbl )
-			{
-			outn( "    {" );
-
-			/* Supply array's 0-element. */
-			if ( ds == end_of_buffer_state )
-				mk2data( -end_of_buffer_state );
-			else
-				mk2data( end_of_buffer_state );
-
-			for ( i = 1; i < num_full_table_rows; ++i )
-				/* Jams are marked by negative of state
-				 * number.
-				 */
-				mk2data( state[i] ? state[i] : -ds );
-
-			dataflush();
-			outn( "    },\n" );
-			}
-
-		else if ( fullspd )
-			place_state( state, ds, totaltrans );
-
-		else if ( ds == end_of_buffer_state )
-			/* Special case this state to make sure it does what
-			 * it's supposed to, i.e., jam on end-of-buffer.
-			 */
-			stack1( ds, 0, 0, JAMSTATE );
-
-		else /* normal, compressed state */
-			{
-			/* Determine which destination state is the most
-			 * common, and how many transitions to it there are.
-			 */
-
-			comfreq = 0;
-			comstate = 0;
-
-			for ( i = 1; i <= targptr; ++i )
-				if ( targfreq[i] > comfreq )
-					{
-					comfreq = targfreq[i];
-					comstate = targstate[i];
-					}
-
-			bldtbl( state, ds, totaltrans, comstate, comfreq );
-			}
-		}
-
-	if ( fulltbl )
-		dataend();
-
-	else if ( ! fullspd )
-		{
-		cmptmps();  /* create compressed template entries */
-
-		/* Create tables for all the states with only one
-		 * out-transition.
-		 */
-		while ( onesp > 0 )
-			{
-			mk1tbl( onestate[onesp], onesym[onesp], onenext[onesp],
-			onedef[onesp] );
-			--onesp;
-			}
-
-		mkdeftbl();
-		}
-
-	flex_free( (void *) accset );
-	flex_free( (void *) nset );
-	}
-
-
-/* snstods - converts a set of ndfa states into a dfa state
- *
- * synopsis
- *    is_new_state = snstods( int sns[numstates], int numstates,
- *				int accset[num_rules+1], int nacc,
- *				int hashval, int *newds_addr );
- *
- * On return, the dfa state number is in newds.
- */
-
-int snstods( sns, numstates, accset, nacc, hashval, newds_addr )
-int sns[], numstates, accset[], nacc, hashval, *newds_addr;
-	{
-	int didsort = 0;
-	int i, j;
-	int newds, *oldsns;
-
-	for ( i = 1; i <= lastdfa; ++i )
-		if ( hashval == dhash[i] )
-			{
-			if ( numstates == dfasiz[i] )
-				{
-				oldsns = dss[i];
-
-				if ( ! didsort )
-					{
-					/* We sort the states in sns so we
-					 * can compare it to oldsns quickly.
-					 * We use bubble because there probably
-					 * aren't very many states.
-					 */
-					bubble( sns, numstates );
-					didsort = 1;
-					}
-
-				for ( j = 1; j <= numstates; ++j )
-					if ( sns[j] != oldsns[j] )
-						break;
-
-				if ( j > numstates )
-					{
-					++dfaeql;
-					*newds_addr = i;
-					return 0;
-					}
-
-				++hshcol;
-				}
-
-			else
-				++hshsave;
-			}
-
-	/* Make a new dfa. */
-
-	if ( ++lastdfa >= current_max_dfas )
-		increase_max_dfas();
-
-	newds = lastdfa;
-
-	dss[newds] = allocate_integer_array( numstates + 1 );
-
-	/* If we haven't already sorted the states in sns, we do so now,
-	 * so that future comparisons with it can be made quickly.
-	 */
-
-	if ( ! didsort )
-		bubble( sns, numstates );
-
-	for ( i = 1; i <= numstates; ++i )
-		dss[newds][i] = sns[i];
-
-	dfasiz[newds] = numstates;
-	dhash[newds] = hashval;
-
-	if ( nacc == 0 )
-		{
-		if ( reject )
-			dfaacc[newds].dfaacc_set = (int *) 0;
-		else
-			dfaacc[newds].dfaacc_state = 0;
-
-		accsiz[newds] = 0;
-		}
-
-	else if ( reject )
-		{
-		/* We sort the accepting set in increasing order so the
-		 * disambiguating rule that the first rule listed is considered
-		 * match in the event of ties will work.  We use a bubble
-		 * sort since the list is probably quite small.
-		 */
-
-		bubble( accset, nacc );
-
-		dfaacc[newds].dfaacc_set = allocate_integer_array( nacc + 1 );
-
-		/* Save the accepting set for later */
-		for ( i = 1; i <= nacc; ++i )
-			{
-			dfaacc[newds].dfaacc_set[i] = accset[i];
-
-			if ( accset[i] <= num_rules )
-				/* Who knows, perhaps a REJECT can yield
-				 * this rule.
-				 */
-				rule_useful[accset[i]] = true;
-			}
-
-		accsiz[newds] = nacc;
-		}
-
-	else
-		{
-		/* Find lowest numbered rule so the disambiguating rule
-		 * will work.
-		 */
-		j = num_rules + 1;
-
-		for ( i = 1; i <= nacc; ++i )
-			if ( accset[i] < j )
-				j = accset[i];
-
-		dfaacc[newds].dfaacc_state = j;
-
-		if ( j <= num_rules )
-			rule_useful[j] = true;
-		}
-
-	*newds_addr = newds;
-
-	return 1;
-	}
-
-
-/* symfollowset - follow the symbol transitions one step
- *
- * synopsis
- *    numstates = symfollowset( int ds[current_max_dfa_size], int dsize,
- *				int transsym, int nset[current_max_dfa_size] );
- */
-
-int symfollowset( ds, dsize, transsym, nset )
-int ds[], dsize, transsym, nset[];
-	{
-	int ns, tsp, sym, i, j, lenccl, ch, numstates, ccllist;
-
-	numstates = 0;
-
-	for ( i = 1; i <= dsize; ++i )
-		{ /* for each nfa state ns in the state set of ds */
-		ns = ds[i];
-		sym = transchar[ns];
-		tsp = trans1[ns];
-
-		if ( sym < 0 )
-			{ /* it's a character class */
-			sym = -sym;
-			ccllist = cclmap[sym];
-			lenccl = ccllen[sym];
-
-			if ( cclng[sym] )
-				{
-				for ( j = 0; j < lenccl; ++j )
-					{
-					/* Loop through negated character
-					 * class.
-					 */
-					ch = ccltbl[ccllist + j];
-
-					if ( ch == 0 )
-						ch = NUL_ec;
-
-					if ( ch > transsym )
-						/* Transsym isn't in negated
-						 * ccl.
-						 */
-						break;
-
-					else if ( ch == transsym )
-						/* next 2 */ goto bottom;
-					}
-
-				/* Didn't find transsym in ccl. */
-				nset[++numstates] = tsp;
-				}
-
-			else
-				for ( j = 0; j < lenccl; ++j )
-					{
-					ch = ccltbl[ccllist + j];
-
-					if ( ch == 0 )
-						ch = NUL_ec;
-
-					if ( ch > transsym )
-						break;
-					else if ( ch == transsym )
-						{
-						nset[++numstates] = tsp;
-						break;
-						}
-					}
-			}
-
-		else if ( sym >= 'A' && sym <= 'Z' && caseins )
-			flexfatal(
-			_( "consistency check failed in symfollowset" ) );
-
-		else if ( sym == SYM_EPSILON )
-			{ /* do nothing */
-			}
-
-		else if ( ABS( ecgroup[sym] ) == transsym )
-			nset[++numstates] = tsp;
-
-		bottom: ;
-		}
-
-	return numstates;
-	}
-
-
-/* sympartition - partition characters with same out-transitions
- *
- * synopsis
- *    sympartition( int ds[current_max_dfa_size], int numstates,
- *			int symlist[numecs], int duplist[numecs] );
- */
-
-void sympartition( ds, numstates, symlist, duplist )
-int ds[], numstates;
-int symlist[], duplist[];
-	{
-	int tch, i, j, k, ns, dupfwd[CSIZE + 1], lenccl, cclp, ich;
-
-	/* Partitioning is done by creating equivalence classes for those
-	 * characters which have out-transitions from the given state.  Thus
-	 * we are really creating equivalence classes of equivalence classes.
-	 */
-
-	for ( i = 1; i <= numecs; ++i )
-		{ /* initialize equivalence class list */
-		duplist[i] = i - 1;
-		dupfwd[i] = i + 1;
-		}
-
-	duplist[1] = NIL;
-	dupfwd[numecs] = NIL;
-
-	for ( i = 1; i <= numstates; ++i )
-		{
-		ns = ds[i];
-		tch = transchar[ns];
-
-		if ( tch != SYM_EPSILON )
-			{
-			if ( tch < -lastccl || tch >= csize )
-				{
-				flexfatal(
-		_( "bad transition character detected in sympartition()" ) );
-				}
-
-			if ( tch >= 0 )
-				{ /* character transition */
-				int ec = ecgroup[tch];
-
-				mkechar( ec, dupfwd, duplist );
-				symlist[ec] = 1;
-				}
-
-			else
-				{ /* character class */
-				tch = -tch;
-
-				lenccl = ccllen[tch];
-				cclp = cclmap[tch];
-				mkeccl( ccltbl + cclp, lenccl, dupfwd,
-					duplist, numecs, NUL_ec );
-
-				if ( cclng[tch] )
-					{
-					j = 0;
-
-					for ( k = 0; k < lenccl; ++k )
-						{
-						ich = ccltbl[cclp + k];
-
-						if ( ich == 0 )
-							ich = NUL_ec;
-
-						for ( ++j; j < ich; ++j )
-							symlist[j] = 1;
-						}
-
-					for ( ++j; j <= numecs; ++j )
-						symlist[j] = 1;
-					}
-
-				else
-					for ( k = 0; k < lenccl; ++k )
-						{
-						ich = ccltbl[cclp + k];
-
-						if ( ich == 0 )
-							ich = NUL_ec;
-
-						symlist[ich] = 1;
-						}
-				}
-			}
-		}
-	}
diff --git a/usr.bin/lex/ecs.c b/usr.bin/lex/ecs.c
deleted file mode 100644
index 4f7748d..0000000
--- a/usr.bin/lex/ecs.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* ecs - equivalence class routines */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Vern Paxson.
- * 
- * The United States Government has rights in this work pursuant
- * to contract no. DE-AC03-76SF00098 between the United States
- * Department of Energy and the University of California.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* $Header: /home/daffy/u0/vern/flex/RCS/ecs.c,v 2.9 93/12/07 10:18:20 vern Exp $ */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "flexdef.h"
-
-/* ccl2ecl - convert character classes to set of equivalence classes */
-
-void ccl2ecl()
-	{
-	int i, ich, newlen, cclp, ccls, cclmec;
-
-	for ( i = 1; i <= lastccl; ++i )
-		{
-		/* We loop through each character class, and for each character
-		 * in the class, add the character's equivalence class to the
-		 * new "character" class we are creating.  Thus when we are all
-		 * done, character classes will really consist of collections
-		 * of equivalence classes
-		 */
-
-		newlen = 0;
-		cclp = cclmap[i];
-
-		for ( ccls = 0; ccls < ccllen[i]; ++ccls )
-			{
-			ich = ccltbl[cclp + ccls];
-			cclmec = ecgroup[ich];
-
-			if ( cclmec > 0 )
-				{
-				ccltbl[cclp + newlen] = cclmec;
-				++newlen;
-				}
-			}
-
-		ccllen[i] = newlen;
-		}
-	}
-
-
-/* cre8ecs - associate equivalence class numbers with class members
- *
- * fwd is the forward linked-list of equivalence class members.  bck
- * is the backward linked-list, and num is the number of class members.
- *
- * Returned is the number of classes.
- */
-
-int cre8ecs( fwd, bck, num )
-int fwd[], bck[], num;
-	{
-	int i, j, numcl;
-
-	numcl = 0;
-
-	/* Create equivalence class numbers.  From now on, ABS( bck(x) )
-	 * is the equivalence class number for object x.  If bck(x)
-	 * is positive, then x is the representative of its equivalence
-	 * class.
-	 */
-	for ( i = 1; i <= num; ++i )
-		if ( bck[i] == NIL )
-			{
-			bck[i] = ++numcl;
-			for ( j = fwd[i]; j != NIL; j = fwd[j] )
-				bck[j] = -numcl;
-			}
-
-	return numcl;
-	}
-
-
-/* mkeccl - update equivalence classes based on character class xtions
- *
- * synopsis
- *    Char ccls[];
- *    int lenccl, fwd[llsiz], bck[llsiz], llsiz, NUL_mapping;
- *    void mkeccl( Char ccls[], int lenccl, int fwd[llsiz], int bck[llsiz],
- *			int llsiz, int NUL_mapping );
- *
- * ccls contains the elements of the character class, lenccl is the
- * number of elements in the ccl, fwd is the forward link-list of equivalent
- * characters, bck is the backward link-list, and llsiz size of the link-list.
- *
- * NUL_mapping is the value which NUL (0) should be mapped to.
- */
-
-void mkeccl( ccls, lenccl, fwd, bck, llsiz, NUL_mapping )
-Char ccls[];
-int lenccl, fwd[], bck[], llsiz, NUL_mapping;
-	{
-	int cclp, oldec, newec;
-	int cclm, i, j;
-	static unsigned char cclflags[CSIZE];	/* initialized to all '\0' */
-
-	/* Note that it doesn't matter whether or not the character class is
-	 * negated.  The same results will be obtained in either case.
-	 */
-
-	cclp = 0;
-
-	while ( cclp < lenccl )
-		{
-		cclm = ccls[cclp];
-
-		if ( NUL_mapping && cclm == 0 )
-			cclm = NUL_mapping;
-
-		oldec = bck[cclm];
-		newec = cclm;
-
-		j = cclp + 1;
-
-		for ( i = fwd[cclm]; i != NIL && i <= llsiz; i = fwd[i] )
-			{ /* look for the symbol in the character class */
-			for ( ; j < lenccl; ++j )
-				{
-				int ccl_char;
-
-				if ( NUL_mapping && ccls[j] == 0 )
-					ccl_char = NUL_mapping;
-				else
-					ccl_char = ccls[j];
-
-				if ( ccl_char > i )
-					break;
-
-				if ( ccl_char == i && ! cclflags[j] )
-					{
-					/* We found an old companion of cclm
-					 * in the ccl.  Link it into the new
-					 * equivalence class and flag it as
-					 * having been processed.
-					 */
-
-					bck[i] = newec;
-					fwd[newec] = i;
-					newec = i;
-					/* Set flag so we don't reprocess. */
-					cclflags[j] = 1;
-
-					/* Get next equivalence class member. */
-					/* continue 2 */
-					goto next_pt;
-					}
-				}
-
-			/* Symbol isn't in character class.  Put it in the old
-			 * equivalence class.
-			 */
-
-			bck[i] = oldec;
-
-			if ( oldec != NIL )
-				fwd[oldec] = i;
-
-			oldec = i;
-
-			next_pt: ;
-			}
-
-		if ( bck[cclm] != NIL || oldec != bck[cclm] )
-			{
-			bck[cclm] = NIL;
-			fwd[oldec] = NIL;
-			}
-
-		fwd[newec] = NIL;
-
-		/* Find next ccl member to process. */
-
-		for ( ++cclp; cclflags[cclp] && cclp < lenccl; ++cclp )
-			{
-			/* Reset "doesn't need processing" flag. */
-			cclflags[cclp] = 0;
-			}
-		}
-	}
-
-
-/* mkechar - create equivalence class for single character */
-
-void mkechar( tch, fwd, bck )
-int tch, fwd[], bck[];
-	{
-	/* If until now the character has been a proper subset of
-	 * an equivalence class, break it away to create a new ec
-	 */
-
-	if ( fwd[tch] != NIL )
-		bck[fwd[tch]] = bck[tch];
-
-	if ( bck[tch] != NIL )
-		fwd[bck[tch]] = fwd[tch];
-
-	fwd[tch] = NIL;
-	bck[tch] = NIL;
-	}
diff --git a/usr.bin/lex/flex.skl b/usr.bin/lex/flex.skl
deleted file mode 100644
index ef5ee14..0000000
--- a/usr.bin/lex/flex.skl
+++ /dev/null
@@ -1,1574 +0,0 @@
-/* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
- * $FreeBSD$
- */
-
-#if defined(__FreeBSD__)
-#include <sys/cdefs.h>
-#else
-#define __unused
-#define __dead2
-#endif
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-
-%-
-#include <stdio.h>
-%*
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-#include <stdlib.h>
-%+
-#include <iosfwd>
-using namespace std;
-%*
-#include <unistd.h>
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-#if __STDC__
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif	/* __STDC__ */
-#endif	/* ! __cplusplus */
-
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((yy_start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define YY_BUF_SIZE 16384
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-extern int yyleng;
-%-
-extern FILE *yyin, *yyout;
-%*
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * into a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
-		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + (n) - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( (c), yytext_ptr )
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-typedef unsigned int yy_size_t;
-
-
-struct yy_buffer_state
-	{
-%-
-	FILE *yy_input_file;
-%+
-	istream* yy_input_file;
-%*
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-	};
-
-%- Standard (non-C++) definition
-static YY_BUFFER_STATE yy_current_buffer = 0;
-%*
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-%- Standard (non-C++) definition
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void yyrestart YY_PROTO(( FILE *input_file ));
-
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
-
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
-%*
-
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) __unused;
-static void yy_flex_free YY_PROTO(( void * ));
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
-%% yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here
-
-%- Standard (non-C++) definition
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] )) __dead2;
-%*
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-%% code to fiddle yytext and yyleng for yymore() goes here
-	yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
-%% code to copy yytext_ptr to yytext[] goes here, if %array
-	yy_c_buf_p = yy_cp;
-
-%% data tables for the DFA and the user's section 1 definitions go here
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
-#else
-extern int yywrap YY_PROTO(( void ));
-#endif
-#endif
-
-%-
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-%*
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
-#endif
-
-#ifndef YY_NO_INPUT
-%- Standard (non-C++) definition
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-%*
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
-
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-#ifndef ECHO
-%- Standard (non-C++) definition
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
-%+ C++ definition
-#define ECHO LexerOutput( yytext, yyleng )
-%*
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-%% fread()/read() definition of YY_INPUT goes here unless we're doing C++
-%+ C++ definition
-	if ( (result = LexerInput( (char *) buf, max_size )) < 0 ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
-%*
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-%-
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-%+
-#define YY_FATAL_ERROR(msg) LexerError( msg )
-%*
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-%- Standard (non-C++) definition
-#define YY_DECL int yylex YY_PROTO(( void ))
-%+ C++ definition
-#define YY_DECL int yyFlexLexer::yylex()
-%*
-#endif
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-%% YY_RULE_SETUP definition goes here
-
-YY_DECL
-	{
-	yy_state_type yy_current_state;
-	char *yy_cp, *yy_bp;
-	int yy_act;
-
-%% user's declarations go here
-
-	if ( yy_init )
-		{
-		yy_init = 0;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
-
-		if ( ! yyin )
-%-
-			yyin = stdin;
-%+
-			yyin = &cin;
-%*
-
-		if ( ! yyout )
-%-
-			yyout = stdout;
-%+
-			yyout = &cout;
-%*
-
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
-
-		yy_load_buffer_state();
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-%% yymore()-related code goes here
-		yy_cp = yy_c_buf_p;
-
-		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-%% code to set up and find next match goes here
-
-yy_find_action:
-%% code to find the action number goes here
-
-		YY_DO_BEFORE_ACTION;
-
-%% code for yylineno update goes here
-
-do_action:	/* This label is used only to access EOF actions. */
-
-%% debug code goes here
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-%% actions go here
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state();
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-%% code to do back-up for compressed tables and set up yy_cp goes here
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer() )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				yy_did_buffer_switch_on_eof = 0;
-
-				if ( yywrap() )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-	} /* end of yylex */
-
-%+
-yyFlexLexer::yyFlexLexer( istream* arg_yyin, ostream* arg_yyout )
-	{
-	yyin = arg_yyin;
-	yyout = arg_yyout;
-	yy_c_buf_p = 0;
-	yy_init = 1;
-	yy_start = 0;
-	yy_flex_debug = 0;
-	yylineno = 1;	// this will only get updated if %option yylineno
-
-	yy_did_buffer_switch_on_eof = 0;
-
-	yy_looking_for_trail_begin = 0;
-	yy_more_flag = 0;
-	yy_more_len = 0;
-	yy_more_offset = yy_prev_more_offset = 0;
-
-	yy_start_stack_ptr = yy_start_stack_depth = 0;
-	yy_start_stack = 0;
-
-	yy_current_buffer = 0;
-
-#ifdef YY_USES_REJECT
-	yy_state_buf = new yy_state_type[YY_BUF_SIZE + 2];
-#else
-	yy_state_buf = 0;
-#endif
-	}
-
-yyFlexLexer::~yyFlexLexer()
-	{
-	delete yy_state_buf;
-	yy_delete_buffer( yy_current_buffer );
-	}
-
-void yyFlexLexer::switch_streams( istream* new_in, ostream* new_out )
-	{
-	if ( new_in )
-		{
-		yy_delete_buffer( yy_current_buffer );
-		yy_switch_to_buffer( yy_create_buffer( new_in, YY_BUF_SIZE ) );
-		}
-
-	if ( new_out )
-		yyout = new_out;
-	}
-
-#ifdef YY_INTERACTIVE
-int yyFlexLexer::LexerInput( char* buf, int /* max_size */ )
-#else
-int yyFlexLexer::LexerInput( char* buf, int max_size )
-#endif
-	{
-	if ( yyin->eof() || yyin->fail() )
-		return 0;
-
-#ifdef YY_INTERACTIVE
-	yyin->get( buf[0] );
-
-	if ( yyin->eof() )
-		return 0;
-
-	if ( yyin->bad() )
-		return -1;
-
-	return 1;
-
-#else
-	(void) yyin->read( buf, max_size );
-
-	if ( yyin->bad() )
-		return -1;
-	else
-		return yyin->gcount();
-#endif
-	}
-
-void yyFlexLexer::LexerOutput( const char* buf, int size )
-	{
-	(void) yyout->write( buf, size );
-	}
-%*
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-
-%-
-#ifdef YY_USE_PROTOS
-static int yy_get_next_buffer(void)
-#else
-static int yy_get_next_buffer()
-#endif
-%+
-int yyFlexLexer::yy_get_next_buffer()
-%*
-	{
-	char *dest = yy_current_buffer->yy_ch_buf;
-	char *source = yytext_ptr;
-	int number_to_move, i;
-	int ret_val;
-
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
-
-	else
-		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
-
-			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = yy_current_buffer->yy_buf_size -
-						number_to_move - 1;
-#endif
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
-
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	if ( yy_n_chars == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
-
-	return ret_val;
-	}
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-%-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_get_previous_state(void)
-#else
-static yy_state_type yy_get_previous_state()
-#endif
-%+
-yy_state_type yyFlexLexer::yy_get_previous_state()
-%*
-	{
-	yy_state_type yy_current_state;
-	char *yy_cp;
-
-%% code to get the start state into yy_current_state goes here
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
-		{
-%% code to find the next state goes here
-		}
-
-	return yy_current_state;
-	}
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-
-%-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-%+
-yy_state_type yyFlexLexer::yy_try_NUL_trans( yy_state_type yy_current_state )
-%*
-	{
-	int yy_is_jam;
-%% code to find the next state, and perhaps do backing up, goes here
-
-	return yy_is_jam ? 0 : yy_current_state;
-	}
-
-
-%-
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-char *yy_bp;
-#endif
-%+
-void yyFlexLexer::yyunput( int c, char* yy_bp )
-%*
-	{
-	char *yy_cp = yy_c_buf_p;
-
-	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
-
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		int number_to_move = yy_n_chars + 2;
-		char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
-		char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
-
-		while ( source > yy_current_buffer->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
-
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	*--yy_cp = (char) c;
-
-%% update yylineno here
-
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
-%-
-#endif	/* ifndef YY_NO_UNPUT */
-%*
-
-
-%-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput()
-#else
-#ifdef YY_USE_PROTOS
-static int input(void)
-#else
-static int input()
-#endif
-#endif
-%+
-int yyFlexLexer::yyinput()
-%*
-	{
-	int c;
-
-	*yy_c_buf_p = yy_hold_char;
-
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
-
-			switch ( yy_get_next_buffer() )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart( yyin );
-
-					/* fall through */
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap() )
-						return EOF;
-
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
-
-%% update BOL and yylineno
-
-	return c;
-	}
-%-
-#endif	/* ifndef YY_NO_INPUT */
-%*
-
-
-%-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-%+
-void yyFlexLexer::yyrestart( istream* input_file )
-%*
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
-	}
-
-
-%-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-%+
-void yyFlexLexer::yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-%*
-	{
-	if ( yy_current_buffer == new_buffer )
-		return;
-
-	if ( yy_current_buffer )
-		{
-		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-%-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-%+
-void yyFlexLexer::yy_load_buffer_state()
-%*
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
-
-
-%-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-%+
-YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( istream* file, int size )
-%*
-	{
-	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	yy_init_buffer( b, file );
-
-	return b;
-	}
-
-
-%-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-%+
-void yyFlexLexer::yy_delete_buffer( YY_BUFFER_STATE b )
-%*
-	{
-	if ( ! b )
-		return;
-
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
-
-
-%-
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-%+
-extern "C" int isatty YY_PROTO(( int ));
-void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file )
-%*
-
-	{
-	yy_flush_buffer( b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-%-
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-%+
-	b->yy_is_interactive = 0;
-%*
-	}
-
-
-%-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-
-%+
-void yyFlexLexer::yy_flush_buffer( YY_BUFFER_STATE b )
-%*
-	{
-	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
-	}
-%*
-
-
-#ifndef YY_NO_SCAN_BUFFER
-%-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	yy_switch_to_buffer( b );
-
-	return b;
-	}
-%*
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-%-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len );
-	}
-%*
-#endif
-
-
-#ifndef YY_NO_SCAN_BYTES
-%-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-	{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
-
-	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer( buf, n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-	}
-%*
-#endif
-
-
-#ifndef YY_NO_PUSH_STATE
-%-
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-%+
-void yyFlexLexer::yy_push_state( int new_state )
-%*
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
-
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
-
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
-
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
-
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
-
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
-
-	BEGIN(new_state);
-	}
-#endif
-
-
-#ifndef YY_NO_POP_STATE
-%-
-#ifdef YY_USE_PROTOS
-static void yy_pop_state(void)
-#else
-static void yy_pop_state()
-#endif
-%+
-void yyFlexLexer::yy_pop_state()
-%*
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
-
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-%-
-#ifdef YY_USE_PROTOS
-static int yy_top_state(void)
-#else
-static int yy_top_state()
-#endif
-%+
-int yyFlexLexer::yy_top_state()
-%*
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-%-
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-	}
-
-%+
-
-void yyFlexLexer::LexerError( yyconst char msg[] )
-	{
-	cerr << msg << '\n';
-	exit( YY_EXIT_FAILURE );
-	}
-%*
-
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
-
-
-/* Internal utility routines. */
-
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-	{
-	int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-	}
-#endif
-
-#ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
-	int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-	}
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
-	return (void *) malloc( size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
-
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
-#endif
diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h
deleted file mode 100644
index 1c51ec9..0000000
--- a/usr.bin/lex/flexdef.h
+++ /dev/null
@@ -1,1049 +0,0 @@
-/* flexdef - definitions file for flex */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Vern Paxson.
- * 
- * The United States Government has rights in this work pursuant
- * to contract no. DE-AC03-76SF00098 between the United States
- * Department of Energy and the University of California.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* @(#) $Header: /home/daffy/u0/vern/flex/RCS/flexdef.h,v 2.53 95/04/20 11:17:36 vern Exp $ (LBL) */
-/* $FreeBSD$ */
-
-#include <stdio.h>
-#include <ctype.h>
-
-#include "config.h"
-
-#ifdef __TURBOC__
-#define HAVE_STRING_H 1
-#define MS_DOS 1
-#ifndef __STDC__
-#define __STDC__ 1
-#endif
- #pragma warn -pro
- #pragma warn -rch
- #pragma warn -use
- #pragma warn -aus
- #pragma warn -par
- #pragma warn -pia
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#endif
-
-/* As an aid for the internationalization patch to flex, which
- * is maintained outside this distribution for copyright reasons.
- */
-#define _(String) (String)
-
-/* Always be prepared to generate an 8-bit scanner. */
-#define CSIZE 256
-#define Char unsigned char
-
-/* Size of input alphabet - should be size of ASCII set. */
-#ifndef DEFAULT_CSIZE
-#define DEFAULT_CSIZE 128
-#endif
-
-#ifndef PROTO
-#if __STDC__
-#define PROTO(proto) proto
-#else
-#define PROTO(proto) ()
-#endif
-#endif
-
-#ifdef VMS
-#ifndef __VMS_POSIX
-#define unlink remove
-#define SHORT_FILE_NAMES
-#endif
-#endif
-
-#ifdef MS_DOS
-#define SHORT_FILE_NAMES
-#endif
-
-
-/* Maximum line length we'll have to deal with. */
-#define MAXLINE 2048
-
-#ifndef MIN
-#define MIN(x,y) ((x) < (y) ? (x) : (y))
-#endif
-#ifndef MAX
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
-#endif
-#ifndef ABS
-#define ABS(x) ((x) < 0 ? -(x) : (x))
-#endif
-
-
-/* ANSI C does not guarantee that isascii() is defined */
-#ifndef isascii
-#define isascii(c) ((c) <= 0177)
-#endif
-
-
-#define true 1
-#define false 0
-#define unspecified -1
-
-
-/* Special chk[] values marking the slots taking by end-of-buffer and action
- * numbers.
- */
-#define EOB_POSITION -1
-#define ACTION_POSITION -2
-
-/* Number of data items per line for -f output. */
-#define NUMDATAITEMS 10
-
-/* Number of lines of data in -f output before inserting a blank line for
- * readability.
- */
-#define NUMDATALINES 10
-
-/* transition_struct_out() definitions. */
-#define TRANS_STRUCT_PRINT_LENGTH 14
-
-/* Returns true if an nfa state has an epsilon out-transition slot
- * that can be used.  This definition is currently not used.
- */
-#define FREE_EPSILON(state) \
-	(transchar[state] == SYM_EPSILON && \
-	 trans2[state] == NO_TRANSITION && \
-	 finalst[state] != state)
-
-/* Returns true if an nfa state has an epsilon out-transition character
- * and both slots are free
- */
-#define SUPER_FREE_EPSILON(state) \
-	(transchar[state] == SYM_EPSILON && \
-	 trans1[state] == NO_TRANSITION) \
-
-/* Maximum number of NFA states that can comprise a DFA state.  It's real
- * big because if there's a lot of rules, the initial state will have a
- * huge epsilon closure.
- */
-#define INITIAL_MAX_DFA_SIZE 750
-#define MAX_DFA_SIZE_INCREMENT 750
-
-
-/* A note on the following masks.  They are used to mark accepting numbers
- * as being special.  As such, they implicitly limit the number of accepting
- * numbers (i.e., rules) because if there are too many rules the rule numbers
- * will overload the mask bits.  Fortunately, this limit is \large/ (0x2000 ==
- * 8192) so unlikely to actually cause any problems.  A check is made in
- * new_rule() to ensure that this limit is not reached.
- */
-
-/* Mask to mark a trailing context accepting number. */
-#define YY_TRAILING_MASK 0x2000
-
-/* Mask to mark the accepting number of the "head" of a trailing context
- * rule.
- */
-#define YY_TRAILING_HEAD_MASK 0x4000
-
-/* Maximum number of rules, as outlined in the above note. */
-#define MAX_RULE (YY_TRAILING_MASK - 1)
-
-
-/* NIL must be 0.  If not, its special meaning when making equivalence classes
- * (it marks the representative of a given e.c.) will be unidentifiable.
- */
-#define NIL 0
-
-#define JAM -1	/* to mark a missing DFA transition */
-#define NO_TRANSITION NIL
-#define UNIQUE -1	/* marks a symbol as an e.c. representative */
-#define INFINITY -1	/* for x{5,} constructions */
-
-#define INITIAL_MAX_CCLS 100	/* max number of unique character classes */
-#define MAX_CCLS_INCREMENT 100
-
-/* Size of table holding members of character classes. */
-#define INITIAL_MAX_CCL_TBL_SIZE 500
-#define MAX_CCL_TBL_SIZE_INCREMENT 250
-
-#define INITIAL_MAX_RULES 100	/* default maximum number of rules */
-#define MAX_RULES_INCREMENT 100
-
-#define INITIAL_MNS 2000	/* default maximum number of nfa states */
-#define MNS_INCREMENT 1000	/* amount to bump above by if it's not enough */
-
-#define INITIAL_MAX_DFAS 1000	/* default maximum number of dfa states */
-#define MAX_DFAS_INCREMENT 1000
-
-#define JAMSTATE -32766	/* marks a reference to the state that always jams */
-
-/* Maximum number of NFA states. */
-#define MAXIMUM_MNS 31999
-
-/* Enough so that if it's subtracted from an NFA state number, the result
- * is guaranteed to be negative.
- */
-#define MARKER_DIFFERENCE (MAXIMUM_MNS+2)
-
-/* Maximum number of nxt/chk pairs for non-templates. */
-#define INITIAL_MAX_XPAIRS 2000
-#define MAX_XPAIRS_INCREMENT 2000
-
-/* Maximum number of nxt/chk pairs needed for templates. */
-#define INITIAL_MAX_TEMPLATE_XPAIRS 2500
-#define MAX_TEMPLATE_XPAIRS_INCREMENT 2500
-
-#define SYM_EPSILON (CSIZE + 1)	/* to mark transitions on the symbol epsilon */
-
-#define INITIAL_MAX_SCS 40	/* maximum number of start conditions */
-#define MAX_SCS_INCREMENT 40	/* amount to bump by if it's not enough */
-
-#define ONE_STACK_SIZE 500	/* stack of states with only one out-transition */
-#define SAME_TRANS -1	/* transition is the same as "default" entry for state */
-
-/* The following percentages are used to tune table compression:
-
- * The percentage the number of out-transitions a state must be of the
- * number of equivalence classes in order to be considered for table
- * compaction by using protos.
- */
-#define PROTO_SIZE_PERCENTAGE 15
-
-/* The percentage the number of homogeneous out-transitions of a state
- * must be of the number of total out-transitions of the state in order
- * that the state's transition table is first compared with a potential 
- * template of the most common out-transition instead of with the first
- * proto in the proto queue.
- */
-#define CHECK_COM_PERCENTAGE 50
-
-/* The percentage the number of differences between a state's transition
- * table and the proto it was first compared with must be of the total
- * number of out-transitions of the state in order to keep the first
- * proto as a good match and not search any further.
- */
-#define FIRST_MATCH_DIFF_PERCENTAGE 10
-
-/* The percentage the number of differences between a state's transition
- * table and the most similar proto must be of the state's total number
- * of out-transitions to use the proto as an acceptable close match.
- */
-#define ACCEPTABLE_DIFF_PERCENTAGE 50
-
-/* The percentage the number of homogeneous out-transitions of a state
- * must be of the number of total out-transitions of the state in order
- * to consider making a template from the state.
- */
-#define TEMPLATE_SAME_PERCENTAGE 60
-
-/* The percentage the number of differences between a state's transition
- * table and the most similar proto must be of the state's total number
- * of out-transitions to create a new proto from the state.
- */
-#define NEW_PROTO_DIFF_PERCENTAGE 20
-
-/* The percentage the total number of out-transitions of a state must be
- * of the number of equivalence classes in order to consider trying to
- * fit the transition table into "holes" inside the nxt/chk table.
- */
-#define INTERIOR_FIT_PERCENTAGE 15
-
-/* Size of region set aside to cache the complete transition table of
- * protos on the proto queue to enable quick comparisons.
- */
-#define PROT_SAVE_SIZE 2000
-
-#define MSP 50	/* maximum number of saved protos (protos on the proto queue) */
-
-/* Maximum number of out-transitions a state can have that we'll rummage
- * around through the interior of the internal fast table looking for a
- * spot for it.
- */
-#define MAX_XTIONS_FULL_INTERIOR_FIT 4
-
-/* Maximum number of rules which will be reported as being associated
- * with a DFA state.
- */
-#define MAX_ASSOC_RULES 100
-
-/* Number that, if used to subscript an array, has a good chance of producing
- * an error; should be small enough to fit into a short.
- */
-#define BAD_SUBSCRIPT -32767
-
-/* Absolute value of largest number that can be stored in a short, with a
- * bit of slop thrown in for general paranoia.
- */
-#define MAX_SHORT 32700
-
-
-/* Declarations for global variables. */
-
-/* Variables for symbol tables:
- * sctbl - start-condition symbol table
- * ndtbl - name-definition symbol table
- * ccltab - character class text symbol table
- */
-
-struct hash_entry
-	{
-	struct hash_entry *prev, *next;
-	char *name;
-	char *str_val;
-	int int_val;
-	} ;
-
-typedef struct hash_entry **hash_table;
-
-#define NAME_TABLE_HASH_SIZE 101
-#define START_COND_HASH_SIZE 101
-#define CCL_HASH_SIZE 101
-
-extern struct hash_entry *ndtbl[NAME_TABLE_HASH_SIZE]; 
-extern struct hash_entry *sctbl[START_COND_HASH_SIZE];
-extern struct hash_entry *ccltab[CCL_HASH_SIZE];
-
-
-/* Variables for flags:
- * printstats - if true (-v), dump statistics
- * syntaxerror - true if a syntax error has been found
- * eofseen - true if we've seen an eof in the input file
- * ddebug - if true (-d), make a "debug" scanner
- * trace - if true (-T), trace processing
- * nowarn - if true (-w), do not generate warnings
- * spprdflt - if true (-s), suppress the default rule
- * interactive - if true (-I), generate an interactive scanner
- * caseins - if true (-i), generate a case-insensitive scanner
- * lex_compat - if true (-l), maximize compatibility with AT&T lex
- * do_yylineno - if true, generate code to maintain yylineno
- * useecs - if true (-Ce flag), use equivalence classes
- * fulltbl - if true (-Cf flag), don't compress the DFA state table
- * usemecs - if true (-Cm flag), use meta-equivalence classes
- * fullspd - if true (-F flag), use Jacobson method of table representation
- * gen_line_dirs - if true (i.e., no -L flag), generate #line directives
- * performance_report - if > 0 (i.e., -p flag), generate a report relating
- *   to scanner performance; if > 1 (-p -p), report on minor performance
- *   problems, too
- * backing_up_report - if true (i.e., -b flag), generate "lex.backup" file
- *   listing backing-up states
- * C_plus_plus - if true (i.e., -+ flag), generate a C++ scanner class;
- *   otherwise, a standard C scanner
- * long_align - if true (-Ca flag), favor long-word alignment.
- * use_read - if true (-f, -F, or -Cr) then use read() for scanner input;
- *   otherwise, use fread().
- * yytext_is_array - if true (i.e., %array directive), then declare
- *   yytext as an array instead of a character pointer.  Nice and inefficient.
- * do_yywrap - do yywrap() processing on EOF.  If false, EOF treated as
- *   "no more files".
- * csize - size of character set for the scanner we're generating;
- *   128 for 7-bit chars and 256 for 8-bit
- * yymore_used - if true, yymore() is used in input rules
- * reject - if true, generate back-up tables for REJECT macro
- * real_reject - if true, scanner really uses REJECT (as opposed to just
- *   having "reject" set for variable trailing context)
- * continued_action - true if this rule's action is to "fall through" to
- *   the next rule's action (i.e., the '|' action)
- * in_rule - true if we're inside an individual rule, false if not.
- * yymore_really_used - whether to treat yymore() as really used, regardless
- *   of what we think based on references to it in the user's actions.
- * reject_really_used - same for REJECT
- */
-
-extern int printstats, syntaxerror, eofseen, ddebug, trace, nowarn, spprdflt;
-extern int interactive, caseins, lex_compat, do_yylineno;
-extern int useecs, fulltbl, usemecs, fullspd;
-extern int gen_line_dirs, performance_report, backing_up_report;
-extern int C_plus_plus, long_align, use_read, yytext_is_array, do_yywrap;
-extern int csize;
-extern int yymore_used, reject, real_reject, continued_action, in_rule;
-
-extern int yymore_really_used, reject_really_used;
-
-
-/* Variables used in the flex input routines:
- * datapos - characters on current output line
- * dataline - number of contiguous lines of data in current data
- * 	statement.  Used to generate readable -f output
- * linenum - current input line number
- * out_linenum - current output line number
- * skelfile - the skeleton file
- * skel - compiled-in skeleton array
- * skel_ind - index into "skel" array, if skelfile is nil
- * yyin - input file
- * backing_up_file - file to summarize backing-up states to
- * infilename - name of input file
- * outfilename - name of output file
- * did_outfilename - whether outfilename was explicitly set
- * prefix - the prefix used for externally visible names ("yy" by default)
- * yyclass - yyFlexLexer subclass to use for YY_DECL
- * do_stdinit - whether to initialize yyin/yyout to stdin/stdout
- * use_stdout - the -t flag
- * input_files - array holding names of input files
- * num_input_files - size of input_files array
- * program_name - name with which program was invoked 
- *
- * action_array - array to hold the rule actions
- * action_size - size of action_array
- * defs1_offset - index where the user's section 1 definitions start
- *	in action_array
- * prolog_offset - index where the prolog starts in action_array
- * action_offset - index where the non-prolog starts in action_array
- * action_index - index where the next action should go, with respect
- * 	to "action_array"
- */
-
-extern int datapos, dataline, linenum, out_linenum;
-extern FILE *skelfile, *yyin, *backing_up_file;
-extern const char *skel[];
-extern int skel_ind;
-extern char *infilename, *outfilename;
-extern int did_outfilename;
-extern char *prefix, *yyclass;
-extern int do_stdinit, use_stdout;
-extern char **input_files;
-extern int num_input_files;
-extern char *program_name;
-
-extern char *action_array;
-extern int action_size;
-extern int defs1_offset, prolog_offset, action_offset, action_index;
-
-
-/* Variables for stack of states having only one out-transition:
- * onestate - state number
- * onesym - transition symbol
- * onenext - target state
- * onedef - default base entry
- * onesp - stack pointer
- */
-
-extern int onestate[ONE_STACK_SIZE], onesym[ONE_STACK_SIZE];
-extern int onenext[ONE_STACK_SIZE], onedef[ONE_STACK_SIZE], onesp;
-
-
-/* Variables for nfa machine data:
- * current_mns - current maximum on number of NFA states
- * num_rules - number of the last accepting state; also is number of
- * 	rules created so far
- * num_eof_rules - number of <<EOF>> rules
- * default_rule - number of the default rule
- * current_max_rules - current maximum number of rules
- * lastnfa - last nfa state number created
- * firstst - physically the first state of a fragment
- * lastst - last physical state of fragment
- * finalst - last logical state of fragment
- * transchar - transition character
- * trans1 - transition state
- * trans2 - 2nd transition state for epsilons
- * accptnum - accepting number
- * assoc_rule - rule associated with this NFA state (or 0 if none)
- * state_type - a STATE_xxx type identifying whether the state is part
- * 	of a normal rule, the leading state in a trailing context
- * 	rule (i.e., the state which marks the transition from
- * 	recognizing the text-to-be-matched to the beginning of
- * 	the trailing context), or a subsequent state in a trailing
- * 	context rule
- * rule_type - a RULE_xxx type identifying whether this a ho-hum
- * 	normal rule or one which has variable head & trailing
- * 	context
- * rule_linenum - line number associated with rule
- * rule_useful - true if we've determined that the rule can be matched
- */
-
-extern int current_mns, current_max_rules;
-extern int num_rules, num_eof_rules, default_rule, lastnfa;
-extern int *firstst, *lastst, *finalst, *transchar, *trans1, *trans2;
-extern int *accptnum, *assoc_rule, *state_type;
-extern int *rule_type, *rule_linenum, *rule_useful;
-
-/* Different types of states; values are useful as masks, as well, for
- * routines like check_trailing_context().
- */
-#define STATE_NORMAL 0x1
-#define STATE_TRAILING_CONTEXT 0x2
-
-/* Global holding current type of state we're making. */
-
-extern int current_state_type;
-
-/* Different types of rules. */
-#define RULE_NORMAL 0
-#define RULE_VARIABLE 1
-
-/* True if the input rules include a rule with both variable-length head
- * and trailing context, false otherwise.
- */
-extern int variable_trailing_context_rules;
-
-
-/* Variables for protos:
- * numtemps - number of templates created
- * numprots - number of protos created
- * protprev - backlink to a more-recently used proto
- * protnext - forward link to a less-recently used proto
- * prottbl - base/def table entry for proto
- * protcomst - common state of proto
- * firstprot - number of the most recently used proto
- * lastprot - number of the least recently used proto
- * protsave contains the entire state array for protos
- */
-
-extern int numtemps, numprots, protprev[MSP], protnext[MSP], prottbl[MSP];
-extern int protcomst[MSP], firstprot, lastprot, protsave[PROT_SAVE_SIZE];
-
-
-/* Variables for managing equivalence classes:
- * numecs - number of equivalence classes
- * nextecm - forward link of Equivalence Class members
- * ecgroup - class number or backward link of EC members
- * nummecs - number of meta-equivalence classes (used to compress
- *   templates)
- * tecfwd - forward link of meta-equivalence classes members
- * tecbck - backward link of MEC's
- */
-
-/* Reserve enough room in the equivalence class arrays so that we
- * can use the CSIZE'th element to hold equivalence class information
- * for the NUL character.  Later we'll move this information into
- * the 0th element.
- */
-extern int numecs, nextecm[CSIZE + 1], ecgroup[CSIZE + 1], nummecs;
-
-/* Meta-equivalence classes are indexed starting at 1, so it's possible
- * that they will require positions from 1 .. CSIZE, i.e., CSIZE + 1
- * slots total (since the arrays are 0-based).  nextecm[] and ecgroup[]
- * don't require the extra position since they're indexed from 1 .. CSIZE - 1.
- */
-extern int tecfwd[CSIZE + 1], tecbck[CSIZE + 1];
-
-
-/* Variables for start conditions:
- * lastsc - last start condition created
- * current_max_scs - current limit on number of start conditions
- * scset - set of rules active in start condition
- * scbol - set of rules active only at the beginning of line in a s.c.
- * scxclu - true if start condition is exclusive
- * sceof - true if start condition has EOF rule
- * scname - start condition name
- */
-
-extern int lastsc, *scset, *scbol, *scxclu, *sceof;
-extern int current_max_scs;
-extern char **scname;
-
-
-/* Variables for dfa machine data:
- * current_max_dfa_size - current maximum number of NFA states in DFA
- * current_max_xpairs - current maximum number of non-template xtion pairs
- * current_max_template_xpairs - current maximum number of template pairs
- * current_max_dfas - current maximum number DFA states
- * lastdfa - last dfa state number created
- * nxt - state to enter upon reading character
- * chk - check value to see if "nxt" applies
- * tnxt - internal nxt table for templates
- * base - offset into "nxt" for given state
- * def - where to go if "chk" disallows "nxt" entry
- * nultrans - NUL transition for each state
- * NUL_ec - equivalence class of the NUL character
- * tblend - last "nxt/chk" table entry being used
- * firstfree - first empty entry in "nxt/chk" table
- * dss - nfa state set for each dfa
- * dfasiz - size of nfa state set for each dfa
- * dfaacc - accepting set for each dfa state (if using REJECT), or accepting
- *	number, if not
- * accsiz - size of accepting set for each dfa state
- * dhash - dfa state hash value
- * numas - number of DFA accepting states created; note that this
- *	is not necessarily the same value as num_rules, which is the analogous
- *	value for the NFA
- * numsnpairs - number of state/nextstate transition pairs
- * jambase - position in base/def where the default jam table starts
- * jamstate - state number corresponding to "jam" state
- * end_of_buffer_state - end-of-buffer dfa state number
- */
-
-extern int current_max_dfa_size, current_max_xpairs;
-extern int current_max_template_xpairs, current_max_dfas;
-extern int lastdfa, *nxt, *chk, *tnxt;
-extern int *base, *def, *nultrans, NUL_ec, tblend, firstfree, **dss, *dfasiz;
-extern union dfaacc_union
-	{
-	int *dfaacc_set;
-	int dfaacc_state;
-	} *dfaacc;
-extern int *accsiz, *dhash, numas;
-extern int numsnpairs, jambase, jamstate;
-extern int end_of_buffer_state;
-
-/* Variables for ccl information:
- * lastccl - ccl index of the last created ccl
- * current_maxccls - current limit on the maximum number of unique ccl's
- * cclmap - maps a ccl index to its set pointer
- * ccllen - gives the length of a ccl
- * cclng - true for a given ccl if the ccl is negated
- * cclreuse - counts how many times a ccl is re-used
- * current_max_ccl_tbl_size - current limit on number of characters needed
- *	to represent the unique ccl's
- * ccltbl - holds the characters in each ccl - indexed by cclmap
- */
-
-extern int lastccl, *cclmap, *ccllen, *cclng, cclreuse;
-extern int current_maxccls, current_max_ccl_tbl_size;
-extern Char *ccltbl;
-
-
-/* Variables for miscellaneous information:
- * nmstr - last NAME scanned by the scanner
- * sectnum - section number currently being parsed
- * nummt - number of empty nxt/chk table entries
- * hshcol - number of hash collisions detected by snstods
- * dfaeql - number of times a newly created dfa was equal to an old one
- * numeps - number of epsilon NFA states created
- * eps2 - number of epsilon states which have 2 out-transitions
- * num_reallocs - number of times it was necessary to realloc() a group
- *	  of arrays
- * tmpuses - number of DFA states that chain to templates
- * totnst - total number of NFA states used to make DFA states
- * peakpairs - peak number of transition pairs we had to store internally
- * numuniq - number of unique transitions
- * numdup - number of duplicate transitions
- * hshsave - number of hash collisions saved by checking number of states
- * num_backing_up - number of DFA states requiring backing up
- * bol_needed - whether scanner needs beginning-of-line recognition
- */
-
-extern char nmstr[MAXLINE];
-extern int sectnum, nummt, hshcol, dfaeql, numeps, eps2, num_reallocs;
-extern int tmpuses, totnst, peakpairs, numuniq, numdup, hshsave;
-extern int num_backing_up, bol_needed;
-
-void *allocate_array PROTO((int, size_t));
-void *reallocate_array PROTO((void*, int, size_t));
-
-void *flex_alloc PROTO((size_t));
-void *flex_realloc PROTO((void*, size_t));
-void flex_free PROTO((void*));
-
-#define allocate_integer_array(size) \
-	(int *) allocate_array( size, sizeof( int ) )
-
-#define reallocate_integer_array(array,size) \
-	(int *) reallocate_array( (void *) array, size, sizeof( int ) )
-
-#define allocate_int_ptr_array(size) \
-	(int **) allocate_array( size, sizeof( int * ) )
-
-#define allocate_char_ptr_array(size) \
-	(char **) allocate_array( size, sizeof( char * ) )
-
-#define allocate_dfaacc_union(size) \
-	(union dfaacc_union *) \
-		allocate_array( size, sizeof( union dfaacc_union ) )
-
-#define reallocate_int_ptr_array(array,size) \
-	(int **) reallocate_array( (void *) array, size, sizeof( int * ) )
-
-#define reallocate_char_ptr_array(array,size) \
-	(char **) reallocate_array( (void *) array, size, sizeof( char * ) )
-
-#define reallocate_dfaacc_union(array, size) \
-	(union dfaacc_union *) \
-	reallocate_array( (void *) array, size, sizeof( union dfaacc_union ) )
-
-#define allocate_character_array(size) \
-	(char *) allocate_array( size, sizeof( char ) )
-
-#define reallocate_character_array(array,size) \
-	(char *) reallocate_array( (void *) array, size, sizeof( char ) )
-
-#define allocate_Character_array(size) \
-	(Char *) allocate_array( size, sizeof( Char ) )
-
-#define reallocate_Character_array(array,size) \
-	(Char *) reallocate_array( (void *) array, size, sizeof( Char ) )
-
-
-/* Used to communicate between scanner and parser.  The type should really
- * be YYSTYPE, but we can't easily get our hands on it.
- */
-extern int yylval;
-
-
-/* External functions that are cross-referenced among the flex source files. */
-
-
-/* from file ccl.c */
-
-extern void ccladd PROTO((int, int));	/* add a single character to a ccl */
-extern int cclinit PROTO((void));	/* make an empty ccl */
-extern void cclnegate PROTO((int));	/* negate a ccl */
-
-/* List the members of a set of characters in CCL form. */
-extern void list_character_set PROTO((FILE*, int[]));
-
-
-/* from file dfa.c */
-
-/* Check a DFA state for backing up. */
-extern void check_for_backing_up PROTO((int, int[]));
-
-/* Check to see if NFA state set constitutes "dangerous" trailing context. */
-extern void check_trailing_context PROTO((int*, int, int*, int));
-
-/* Construct the epsilon closure of a set of ndfa states. */
-extern int *epsclosure PROTO((int*, int*, int[], int*, int*));
-
-/* Increase the maximum number of dfas. */
-extern void increase_max_dfas PROTO((void));
-
-extern void ntod PROTO((void));	/* convert a ndfa to a dfa */
-
-/* Converts a set of ndfa states into a dfa state. */
-extern int snstods PROTO((int[], int, int[], int, int, int*));
-
-
-/* from file ecs.c */
-
-/* Convert character classes to set of equivalence classes. */
-extern void ccl2ecl PROTO((void));
-
-/* Associate equivalence class numbers with class members. */
-extern int cre8ecs PROTO((int[], int[], int));
-
-/* Update equivalence classes based on character class transitions. */
-extern void mkeccl PROTO((Char[], int, int[], int[], int, int));
-
-/* Create equivalence class for single character. */
-extern void mkechar PROTO((int, int[], int[]));
-
-
-/* from file gen.c */
-
-extern void do_indent PROTO((void));	/* indent to the current level */
-
-/* Generate the code to keep backing-up information. */
-extern void gen_backing_up PROTO((void));
-
-/* Generate the code to perform the backing up. */
-extern void gen_bu_action PROTO((void));
-
-/* Generate full speed compressed transition table. */
-extern void genctbl PROTO((void));
-
-/* Generate the code to find the action number. */
-extern void gen_find_action PROTO((void));
-
-extern void genftbl PROTO((void));	/* generate full transition table */
-
-/* Generate the code to find the next compressed-table state. */
-extern void gen_next_compressed_state PROTO((char*));
-
-/* Generate the code to find the next match. */
-extern void gen_next_match PROTO((void));
-
-/* Generate the code to find the next state. */
-extern void gen_next_state PROTO((int));
-
-/* Generate the code to make a NUL transition. */
-extern void gen_NUL_trans PROTO((void));
-
-/* Generate the code to find the start state. */
-extern void gen_start_state PROTO((void));
-
-/* Generate data statements for the transition tables. */
-extern void gentabs PROTO((void));
-
-/* Write out a formatted string at the current indentation level. */
-extern void indent_put2s PROTO((char[], char[]));
-
-/* Write out a string + newline at the current indentation level. */
-extern void indent_puts PROTO((char[]));
-
-extern void make_tables PROTO((void));	/* generate transition tables */
-
-
-/* from file main.c */
-
-extern void check_options PROTO((void));
-extern void flexend PROTO((int));
-extern void usage PROTO((void));
-
-
-/* from file misc.c */
-
-/* Add a #define to the action file. */
-extern void action_define PROTO(( char *defname, int value ));
-
-/* Add the given text to the stored actions. */
-extern void add_action PROTO(( char *new_text ));
-
-/* True if a string is all lower case. */
-extern int all_lower PROTO((char *));
-
-/* True if a string is all upper case. */
-extern int all_upper PROTO((char *));
-
-/* Bubble sort an integer array. */
-extern void bubble PROTO((int [], int));
-
-/* Check a character to make sure it's in the expected range. */
-extern void check_char PROTO((int c));
-
-/* Replace upper-case letter to lower-case. */
-extern Char clower PROTO((int));
-
-/* Returns a dynamically allocated copy of a string. */
-extern char *copy_string PROTO((const char *));
-
-/* Returns a dynamically allocated copy of a (potentially) unsigned string. */
-extern Char *copy_unsigned_string PROTO((Char *));
-
-/* Shell sort a character array. */
-extern void cshell PROTO((Char [], int, int));
-
-/* Finish up a block of data declarations. */
-extern void dataend PROTO((void));
-
-/* Flush generated data statements. */
-extern void dataflush PROTO((void));
-
-/* Report an error message and terminate. */
-extern void flexerror PROTO((const char[]));
-
-/* Report a fatal error message and terminate. */
-extern void flexfatal PROTO((const char[]));
-
-/* Convert a hexadecimal digit string to an integer value. */
-extern int htoi PROTO((Char[]));
-
-/* Report an error message formatted with one integer argument. */
-extern void lerrif PROTO((const char[], int));
-
-/* Report an error message formatted with one string argument. */
-extern void lerrsf PROTO((const char[], const char[]));
-
-/* Spit out a "#line" statement. */
-extern void line_directive_out PROTO((FILE*, int));
-
-/* Mark the current position in the action array as the end of the section 1
- * user defs.
- */
-extern void mark_defs1 PROTO((void));
-
-/* Mark the current position in the action array as the end of the prolog. */
-extern void mark_prolog PROTO((void));
-
-/* Generate a data statement for a two-dimensional array. */
-extern void mk2data PROTO((int));
-
-extern void mkdata PROTO((int));	/* generate a data statement */
-
-/* Return the integer represented by a string of digits. */
-extern int myctoi PROTO((char []));
-
-/* Return character corresponding to escape sequence. */
-extern Char myesc PROTO((Char[]));
-
-/* Convert an octal digit string to an integer value. */
-extern int otoi PROTO((Char [] ));
-
-/* Output a (possibly-formatted) string to the generated scanner. */
-extern void out PROTO((const char []));
-extern void out_dec PROTO((const char [], int));
-extern void out_dec2 PROTO((const char [], int, int));
-extern void out_hex PROTO((const char [], unsigned int));
-extern void out_line_count PROTO((const char []));
-extern void out_str PROTO((const char [], const char []));
-extern void out_str3
-	PROTO((const char [], const char [], const char [], const char []));
-extern void out_str_dec PROTO((const char [], const char [], int));
-extern void outc PROTO((int));
-extern void outn PROTO((const char []));
-
-/* Return a printable version of the given character, which might be
- * 8-bit.
- */
-extern char *readable_form PROTO((int));
-
-/* Write out one section of the skeleton file. */
-extern void skelout PROTO((void));
-
-/* Output a yy_trans_info structure. */
-extern void transition_struct_out PROTO((int, int));
-
-/* Only needed when using certain broken versions of bison to build parse.c. */
-extern void *yy_flex_xmalloc PROTO(( int ));
-
-/* Set a region of memory to 0. */
-extern void zero_out PROTO((char *, size_t));
-
-
-/* from file nfa.c */
-
-/* Add an accepting state to a machine. */
-extern void add_accept PROTO((int, int));
-
-/* Make a given number of copies of a singleton machine. */
-extern int copysingl PROTO((int, int));
-
-/* Debugging routine to write out an nfa. */
-extern void dumpnfa PROTO((int));
-
-/* Finish up the processing for a rule. */
-extern void finish_rule PROTO((int, int, int, int));
-
-/* Connect two machines together. */
-extern int link_machines PROTO((int, int));
-
-/* Mark each "beginning" state in a machine as being a "normal" (i.e.,
- * not trailing context associated) state.
- */
-extern void mark_beginning_as_normal PROTO((int));
-
-/* Make a machine that branches to two machines. */
-extern int mkbranch PROTO((int, int));
-
-extern int mkclos PROTO((int));	/* convert a machine into a closure */
-extern int mkopt PROTO((int));	/* make a machine optional */
-
-/* Make a machine that matches either one of two machines. */
-extern int mkor PROTO((int, int));
-
-/* Convert a machine into a positive closure. */
-extern int mkposcl PROTO((int));
-
-extern int mkrep PROTO((int, int, int));	/* make a replicated machine */
-
-/* Create a state with a transition on a given symbol. */
-extern int mkstate PROTO((int));
-
-extern void new_rule PROTO((void));	/* initialize for a new rule */
-
-
-/* from file parse.y */
-
-/* Build the "<<EOF>>" action for the active start conditions. */
-extern void build_eof_action PROTO((void));
-
-/* Write out a message formatted with one string, pinpointing its location. */
-extern void format_pinpoint_message PROTO((char[], char[]));
-
-/* Write out a message, pinpointing its location. */
-extern void pinpoint_message PROTO((char[]));
-
-/* Write out a warning, pinpointing it at the given line. */
-extern void line_warning PROTO(( char[], int ));
-
-/* Write out a message, pinpointing it at the given line. */
-extern void line_pinpoint PROTO(( char[], int ));
-
-/* Report a formatted syntax error. */
-extern void format_synerr PROTO((char [], char[]));
-extern void synerr PROTO((char []));	/* report a syntax error */
-extern void format_warn PROTO((char [], char[]));
-extern void warn PROTO((char []));	/* report a warning */
-extern void yyerror PROTO((char []));	/* report a parse error */
-extern int yyparse PROTO((void));	/* the YACC parser */
-
-
-/* from file scan.l */
-
-/* The Flex-generated scanner for flex. */
-extern int flexscan PROTO((void));
-
-/* Open the given file (if NULL, stdin) for scanning. */
-extern void set_input_file PROTO((char*));
-
-/* Wrapup a file in the lexical analyzer. */
-extern int yywrap PROTO((void));
-
-
-/* from file sym.c */
-
-/* Add symbol and definitions to symbol table. */
-extern int addsym PROTO((char[], char*, int, hash_table, int));
-
-/* Save the text of a character class. */
-extern void cclinstal PROTO ((Char [], int));
-
-/* Lookup the number associated with character class. */
-extern int ccllookup PROTO((Char []));
-
-/* Find symbol in symbol table. */
-extern struct hash_entry *findsym PROTO((char[], hash_table, int ));
-
-extern void ndinstal PROTO((char[], Char[]));	/* install a name definition */
-extern Char *ndlookup PROTO((char[]));	/* lookup a name definition */
-
-/* Increase maximum number of SC's. */
-extern void scextend PROTO((void));
-extern void scinstal PROTO((char[], int));	/* make a start condition */
-
-/* Lookup the number associated with a start condition. */
-extern int sclookup PROTO((char[]));
-
-
-/* from file tblcmp.c */
-
-/* Build table entries for dfa state. */
-extern void bldtbl PROTO((int[], int, int, int, int));
-
-extern void cmptmps PROTO((void));	/* compress template table entries */
-extern void expand_nxt_chk PROTO((void));	/* increase nxt/chk arrays */
-/* Finds a space in the table for a state to be placed. */
-extern int find_table_space PROTO((int*, int));
-extern void inittbl PROTO((void));	/* initialize transition tables */
-/* Make the default, "jam" table entries. */
-extern void mkdeftbl PROTO((void));
-
-/* Create table entries for a state (or state fragment) which has
- * only one out-transition.
- */
-extern void mk1tbl PROTO((int, int, int, int));
-
-/* Place a state into full speed transition table. */
-extern void place_state PROTO((int*, int, int));
-
-/* Save states with only one out-transition to be processed later. */
-extern void stack1 PROTO((int, int, int, int));
-
-
-/* from file yylex.c */
-
-extern int yylex PROTO((void));
diff --git a/usr.bin/lex/gen.c b/usr.bin/lex/gen.c
deleted file mode 100644
index b72688b..0000000
--- a/usr.bin/lex/gen.c
+++ /dev/null
@@ -1,1629 +0,0 @@
-/* gen - actual generation (writing) of flex scanners */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Vern Paxson.
- * 
- * The United States Government has rights in this work pursuant
- * to contract no. DE-AC03-76SF00098 between the United States
- * Department of Energy and the University of California.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* $Header: /home/daffy/u0/vern/flex/RCS/gen.c,v 2.56 96/05/25 20:43:38 vern Exp $ */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "flexdef.h"
-
-
-/* declare functions that have forward references */
-
-void gen_next_state PROTO((int));
-void genecs PROTO((void));
-void indent_put2s PROTO((char [], char []));
-void indent_puts PROTO((char []));
-
-
-static int indent_level = 0; /* each level is 8 spaces */
-
-#define indent_up() (++indent_level)
-#define indent_down() (--indent_level)
-#define set_indent(indent_val) indent_level = indent_val
-
-/* Almost everything is done in terms of arrays starting at 1, so provide
- * a null entry for the zero element of all C arrays.  (The exception
- * to this is that the fast table representation generally uses the
- * 0 elements of its arrays, too.)
- */
-static char C_int_decl[] = "static yyconst int %s[%d] =\n    {   0,\n";
-static char C_short_decl[] = "static yyconst short int %s[%d] =\n    {   0,\n";
-static char C_long_decl[] = "static yyconst long int %s[%d] =\n    {   0,\n";
-static char C_state_decl[] =
-	"static yyconst yy_state_type %s[%d] =\n    {   0,\n";
-
-
-/* Indent to the current level. */
-
-void do_indent()
-	{
-	int i = indent_level * 8;
-
-	while ( i >= 8 )
-		{
-		outc( '\t' );
-		i -= 8;
-		}
-
-	while ( i > 0 )
-		{
-		outc( ' ' );
-		--i;
-		}
-	}
-
-
-/* Generate the code to keep backing-up information. */
-
-void gen_backing_up()
-	{
-	if ( reject || num_backing_up == 0 )
-		return;
-
-	if ( fullspd )
-		indent_puts( "if ( yy_current_state[-1].yy_nxt )" );
-	else
-		indent_puts( "if ( yy_accept[yy_current_state] )" );
-
-	indent_up();
-	indent_puts( "{" );
-	indent_puts( "yy_last_accepting_state = yy_current_state;" );
-	indent_puts( "yy_last_accepting_cpos = yy_cp;" );
-	indent_puts( "}" );
-	indent_down();
-	}
-
-
-/* Generate the code to perform the backing up. */
-
-void gen_bu_action()
-	{
-	if ( reject || num_backing_up == 0 )
-		return;
-
-	set_indent( 3 );
-
-	indent_puts( "case 0: /* must back up */" );
-	indent_puts( "/* undo the effects of YY_DO_BEFORE_ACTION */" );
-	indent_puts( "*yy_cp = yy_hold_char;" );
-
-	if ( fullspd || fulltbl )
-		indent_puts( "yy_cp = yy_last_accepting_cpos + 1;" );
-	else
-		/* Backing-up info for compressed tables is taken \after/
-		 * yy_cp has been incremented for the next state.
-		 */
-		indent_puts( "yy_cp = yy_last_accepting_cpos;" );
-
-	indent_puts( "yy_current_state = yy_last_accepting_state;" );
-	indent_puts( "goto yy_find_action;" );
-	outc( '\n' );
-
-	set_indent( 0 );
-	}
-
-
-/* genctbl - generates full speed compressed transition table */
-
-void genctbl()
-	{
-	int i;
-	int end_of_buffer_action = num_rules + 1;
-
-	/* Table of verify for transition and offset to next state. */
-	out_dec( "static yyconst struct yy_trans_info yy_transition[%d] =\n",
-		tblend + numecs + 1 );
-	outn( "    {" );
-
-	/* We want the transition to be represented as the offset to the
-	 * next state, not the actual state number, which is what it currently
-	 * is.  The offset is base[nxt[i]] - (base of current state)].  That's
-	 * just the difference between the starting points of the two involved
-	 * states (to - from).
-	 *
-	 * First, though, we need to find some way to put in our end-of-buffer
-	 * flags and states.  We do this by making a state with absolutely no
-	 * transitions.  We put it at the end of the table.
-	 */
-
-	/* We need to have room in nxt/chk for two more slots: One for the
-	 * action and one for the end-of-buffer transition.  We now *assume*
-	 * that we're guaranteed the only character we'll try to index this
-	 * nxt/chk pair with is EOB, i.e., 0, so we don't have to make sure
-	 * there's room for jam entries for other characters.
-	 */
-
-	while ( tblend + 2 >= current_max_xpairs )
-		expand_nxt_chk();
-
-	while ( lastdfa + 1 >= current_max_dfas )
-		increase_max_dfas();
-
-	base[lastdfa + 1] = tblend + 2;
-	nxt[tblend + 1] = end_of_buffer_action;
-	chk[tblend + 1] = numecs + 1;
-	chk[tblend + 2] = 1; /* anything but EOB */
-
-	/* So that "make test" won't show arb. differences. */
-	nxt[tblend + 2] = 0;
-
-	/* Make sure every state has an end-of-buffer transition and an
-	 * action #.
-	 */
-	for ( i = 0; i <= lastdfa; ++i )
-		{
-		int anum = dfaacc[i].dfaacc_state;
-		int offset = base[i];
-
-		chk[offset] = EOB_POSITION;
-		chk[offset - 1] = ACTION_POSITION;
-		nxt[offset - 1] = anum;	/* action number */
-		}
-
-	for ( i = 0; i <= tblend; ++i )
-		{
-		if ( chk[i] == EOB_POSITION )
-			transition_struct_out( 0, base[lastdfa + 1] - i );
-
-		else if ( chk[i] == ACTION_POSITION )
-			transition_struct_out( 0, nxt[i] );
-
-		else if ( chk[i] > numecs || chk[i] == 0 )
-			transition_struct_out( 0, 0 );	/* unused slot */
-
-		else	/* verify, transition */
-			transition_struct_out( chk[i],
-						base[nxt[i]] - (i - chk[i]) );
-		}
-
-
-	/* Here's the final, end-of-buffer state. */
-	transition_struct_out( chk[tblend + 1], nxt[tblend + 1] );
-	transition_struct_out( chk[tblend + 2], nxt[tblend + 2] );
-
-	outn( "    };\n" );
-
-	/* Table of pointers to start states. */
-	out_dec(
-	"static yyconst struct yy_trans_info *yy_start_state_list[%d] =\n",
-		lastsc * 2 + 1 );
-	outn( "    {" );	/* } so vi doesn't get confused */
-
-	for ( i = 0; i <= lastsc * 2; ++i )
-		out_dec( "    &yy_transition[%d],\n", base[i] );
-
-	dataend();
-
-	if ( useecs )
-		genecs();
-	}
-
-
-/* Generate equivalence-class tables. */
-
-void genecs()
-	{
-	int i, j;
-	int numrows;
-
-	out_str_dec( C_int_decl, "yy_ec", csize );
-
-	for ( i = 1; i < csize; ++i )
-		{
-		if ( caseins && (i >= 'A') && (i <= 'Z') )
-			ecgroup[i] = ecgroup[clower( i )];
-
-		ecgroup[i] = ABS( ecgroup[i] );
-		mkdata( ecgroup[i] );
-		}
-
-	dataend();
-
-	if ( trace )
-		{
-		fputs( _( "\n\nEquivalence Classes:\n\n" ), stderr );
-
-		numrows = csize / 8;
-
-		for ( j = 0; j < numrows; ++j )
-			{
-			for ( i = j; i < csize; i = i + numrows )
-				{
-				fprintf( stderr, "%4s = %-2d",
-					readable_form( i ), ecgroup[i] );
-
-				putc( ' ', stderr );
-				}
-
-			putc( '\n', stderr );
-			}
-		}
-	}
-
-
-/* Generate the code to find the action number. */
-
-void gen_find_action()
-	{
-	if ( fullspd )
-		indent_puts( "yy_act = yy_current_state[-1].yy_nxt;" );
-
-	else if ( fulltbl )
-		indent_puts( "yy_act = yy_accept[yy_current_state];" );
-
-	else if ( reject )
-		{
-		indent_puts( "yy_current_state = *--yy_state_ptr;" );
-		indent_puts( "yy_lp = yy_accept[yy_current_state];" );
-
-		outn(
-		"goto find_rule; /* avoid `defined but not used' warning */");
-		outn(
-		"find_rule: /* we branch to this label when backing up */" );
-
-		indent_puts(
-		"for ( ; ; ) /* until we find what rule we matched */" );
-
-		indent_up();
-
-		indent_puts( "{" );
-
-		indent_puts(
-		"if ( yy_lp && yy_lp < yy_accept[yy_current_state + 1] )" );
-		indent_up();
-		indent_puts( "{" );
-		indent_puts( "yy_act = yy_acclist[yy_lp];" );
-
-		if ( variable_trailing_context_rules )
-			{
-			indent_puts( "if ( yy_act & YY_TRAILING_HEAD_MASK ||" );
-			indent_puts( "     yy_looking_for_trail_begin )" );
-			indent_up();
-			indent_puts( "{" );
-
-			indent_puts(
-				"if ( yy_act == yy_looking_for_trail_begin )" );
-			indent_up();
-			indent_puts( "{" );
-			indent_puts( "yy_looking_for_trail_begin = 0;" );
-			indent_puts( "yy_act &= ~YY_TRAILING_HEAD_MASK;" );
-			indent_puts( "break;" );
-			indent_puts( "}" );
-			indent_down();
-
-			indent_puts( "}" );
-			indent_down();
-
-			indent_puts( "else if ( yy_act & YY_TRAILING_MASK )" );
-			indent_up();
-			indent_puts( "{" );
-			indent_puts(
-		"yy_looking_for_trail_begin = yy_act & ~YY_TRAILING_MASK;" );
-			indent_puts(
-		"yy_looking_for_trail_begin |= YY_TRAILING_HEAD_MASK;" );
-
-			if ( real_reject )
-				{
-				/* Remember matched text in case we back up
-				 * due to REJECT.
-				 */
-				indent_puts( "yy_full_match = yy_cp;" );
-				indent_puts( "yy_full_state = yy_state_ptr;" );
-				indent_puts( "yy_full_lp = yy_lp;" );
-				}
-
-			indent_puts( "}" );
-			indent_down();
-
-			indent_puts( "else" );
-			indent_up();
-			indent_puts( "{" );
-			indent_puts( "yy_full_match = yy_cp;" );
-			indent_puts( "yy_full_state = yy_state_ptr;" );
-			indent_puts( "yy_full_lp = yy_lp;" );
-			indent_puts( "break;" );
-			indent_puts( "}" );
-			indent_down();
-
-			indent_puts( "++yy_lp;" );
-			indent_puts( "goto find_rule;" );
-			}
-
-		else
-			{
-			/* Remember matched text in case we back up due to
-			 * trailing context plus REJECT.
-			 */
-			indent_up();
-			indent_puts( "{" );
-			indent_puts( "yy_full_match = yy_cp;" );
-			indent_puts( "break;" );
-			indent_puts( "}" );
-			indent_down();
-			}
-
-		indent_puts( "}" );
-		indent_down();
-
-		indent_puts( "--yy_cp;" );
-
-		/* We could consolidate the following two lines with those at
-		 * the beginning, but at the cost of complaints that we're
-		 * branching inside a loop.
-		 */
-		indent_puts( "yy_current_state = *--yy_state_ptr;" );
-		indent_puts( "yy_lp = yy_accept[yy_current_state];" );
-
-		indent_puts( "}" );
-
-		indent_down();
-		}
-
-	else
-		{ /* compressed */
-		indent_puts( "yy_act = yy_accept[yy_current_state];" );
-
-		if ( interactive && ! reject )
-			{
-			/* Do the guaranteed-needed backing up to figure out
-			 * the match.
-			 */
-			indent_puts( "if ( yy_act == 0 )" );
-			indent_up();
-			indent_puts( "{ /* have to back up */" );
-			indent_puts( "yy_cp = yy_last_accepting_cpos;" );
-			indent_puts(
-				"yy_current_state = yy_last_accepting_state;" );
-			indent_puts( "yy_act = yy_accept[yy_current_state];" );
-			indent_puts( "}" );
-			indent_down();
-			}
-		}
-	}
-
-
-/* genftbl - generate full transition table */
-
-void genftbl()
-	{
-	int i;
-	int end_of_buffer_action = num_rules + 1;
-
-	out_str_dec( long_align ? C_long_decl : C_short_decl,
-		"yy_accept", lastdfa + 1 );
-
-	dfaacc[end_of_buffer_state].dfaacc_state = end_of_buffer_action;
-
-	for ( i = 1; i <= lastdfa; ++i )
-		{
-		int anum = dfaacc[i].dfaacc_state;
-
-		mkdata( anum );
-
-		if ( trace && anum )
-			fprintf( stderr, _( "state # %d accepts: [%d]\n" ),
-				i, anum );
-		}
-
-	dataend();
-
-	if ( useecs )
-		genecs();
-
-	/* Don't have to dump the actual full table entries - they were
-	 * created on-the-fly.
-	 */
-	}
-
-
-/* Generate the code to find the next compressed-table state. */
-
-void gen_next_compressed_state( char_map )
-char *char_map;
-	{
-	indent_put2s( "YY_CHAR yy_c = %s;", char_map );
-
-	/* Save the backing-up info \before/ computing the next state
-	 * because we always compute one more state than needed - we
-	 * always proceed until we reach a jam state
-	 */
-	gen_backing_up();
-
-	indent_puts(
-"while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )" );
-	indent_up();
-	indent_puts( "{" );
-	indent_puts( "yy_current_state = (int) yy_def[yy_current_state];" );
-
-	if ( usemecs )
-		{
-		/* We've arrange it so that templates are never chained
-		 * to one another.  This means we can afford to make a
-		 * very simple test to see if we need to convert to
-		 * yy_c's meta-equivalence class without worrying
-		 * about erroneously looking up the meta-equivalence
-		 * class twice
-		 */
-		do_indent();
-
-		/* lastdfa + 2 is the beginning of the templates */
-		out_dec( "if ( yy_current_state >= %d )\n", lastdfa + 2 );
-
-		indent_up();
-		indent_puts( "yy_c = yy_meta[(unsigned int) yy_c];" );
-		indent_down();
-		}
-
-	indent_puts( "}" );
-	indent_down();
-
-	indent_puts(
-"yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];" );
-	}
-
-
-/* Generate the code to find the next match. */
-
-void gen_next_match()
-	{
-	/* NOTE - changes in here should be reflected in gen_next_state() and
-	 * gen_NUL_trans().
-	 */
-	char *char_map = useecs ?
-				"yy_ec[YY_SC_TO_UI(*yy_cp)]" :
-				"YY_SC_TO_UI(*yy_cp)";
-
-	char *char_map_2 = useecs ?
-				"yy_ec[YY_SC_TO_UI(*++yy_cp)]" :
-				"YY_SC_TO_UI(*++yy_cp)";
-
-	if ( fulltbl )
-		{
-		indent_put2s(
-	"while ( (yy_current_state = yy_nxt[yy_current_state][%s]) > 0 )",
-				char_map );
-
-		indent_up();
-
-		if ( num_backing_up > 0 )
-			{
-			indent_puts( "{" );	/* } for vi */
-			gen_backing_up();
-			outc( '\n' );
-			}
-
-		indent_puts( "++yy_cp;" );
-
-		if ( num_backing_up > 0 )
-			/* { for vi */
-			indent_puts( "}" );
-
-		indent_down();
-
-		outc( '\n' );
-		indent_puts( "yy_current_state = -yy_current_state;" );
-		}
-
-	else if ( fullspd )
-		{
-		indent_puts( "{" );	/* } for vi */
-		indent_puts(
-		"yyconst struct yy_trans_info *yy_trans_info;\n" );
-		indent_puts( "YY_CHAR yy_c;\n" );
-		indent_put2s( "for ( yy_c = %s;", char_map );
-		indent_puts(
-	"      (yy_trans_info = &yy_current_state[(unsigned int) yy_c])->" );
-		indent_puts( "yy_verify == yy_c;" );
-		indent_put2s( "      yy_c = %s )", char_map_2 );
-
-		indent_up();
-
-		if ( num_backing_up > 0 )
-			indent_puts( "{" );	/* } for vi */
-
-		indent_puts( "yy_current_state += yy_trans_info->yy_nxt;" );
-
-		if ( num_backing_up > 0 )
-			{
-			outc( '\n' );
-			gen_backing_up();	/* { for vi */
-			indent_puts( "}" );
-			}
-
-		indent_down();	/* { for vi */
-		indent_puts( "}" );
-		}
-
-	else
-		{ /* compressed */
-		indent_puts( "do" );
-
-		indent_up();
-		indent_puts( "{" );	/* } for vi */
-
-		gen_next_state( false );
-
-		indent_puts( "++yy_cp;" );
-
-		/* { for vi */
-		indent_puts( "}" );
-		indent_down();
-
-		do_indent();
-
-		if ( interactive )
-			out_dec( "while ( yy_base[yy_current_state] != %d );\n",
-				jambase );
-		else
-			out_dec( "while ( yy_current_state != %d );\n",
-				jamstate );
-
-		if ( ! reject && ! interactive )
-			{
-			/* Do the guaranteed-needed backing up to figure out
-			 * the match.
-			 */
-			indent_puts( "yy_cp = yy_last_accepting_cpos;" );
-			indent_puts(
-				"yy_current_state = yy_last_accepting_state;" );
-			}
-		}
-	}
-
-
-/* Generate the code to find the next state. */
-
-void gen_next_state( worry_about_NULs )
-int worry_about_NULs;
-	{ /* NOTE - changes in here should be reflected in gen_next_match() */
-	char char_map[256];
-
-	if ( worry_about_NULs && ! nultrans )
-		{
-		if ( useecs )
-			(void) sprintf( char_map,
-				"(*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : %d)",
-					NUL_ec );
-		else
-			(void) sprintf( char_map,
-				"(*yy_cp ? YY_SC_TO_UI(*yy_cp) : %d)", NUL_ec );
-		}
-
-	else
-		strcpy( char_map, useecs ?
-			"yy_ec[YY_SC_TO_UI(*yy_cp)]" : "YY_SC_TO_UI(*yy_cp)" );
-
-	if ( worry_about_NULs && nultrans )
-		{
-		if ( ! fulltbl && ! fullspd )
-			/* Compressed tables back up *before* they match. */
-			gen_backing_up();
-
-		indent_puts( "if ( *yy_cp )" );
-		indent_up();
-		indent_puts( "{" );	/* } for vi */
-		}
-
-	if ( fulltbl )
-		indent_put2s(
-			"yy_current_state = yy_nxt[yy_current_state][%s];", 
-				char_map );
-
-	else if ( fullspd )
-		indent_put2s(
-			"yy_current_state += yy_current_state[%s].yy_nxt;",
-				char_map );
-
-	else
-		gen_next_compressed_state( char_map );
-
-	if ( worry_about_NULs && nultrans )
-		{
-		/* { for vi */
-		indent_puts( "}" );
-		indent_down();
-		indent_puts( "else" );
-		indent_up();
-		indent_puts(
-			"yy_current_state = yy_NUL_trans[yy_current_state];" );
-		indent_down();
-		}
-
-	if ( fullspd || fulltbl )
-		gen_backing_up();
-
-	if ( reject )
-		indent_puts( "*yy_state_ptr++ = yy_current_state;" );
-	}
-
-
-/* Generate the code to make a NUL transition. */
-
-void gen_NUL_trans()
-	{ /* NOTE - changes in here should be reflected in gen_next_match() */
-	/* Only generate a definition for "yy_cp" if we'll generate code
-	 * that uses it.  Otherwise lint and the like complain.
-	 */
-	int need_backing_up = (num_backing_up > 0 && ! reject);
-
-	if ( need_backing_up && (! nultrans || fullspd || fulltbl) )
-		/* We're going to need yy_cp lying around for the call
-		 * below to gen_backing_up().
-		 */
-		indent_puts( "char *yy_cp = yy_c_buf_p;" );
-
-	outc( '\n' );
-
-	if ( nultrans )
-		{
-		indent_puts(
-			"yy_current_state = yy_NUL_trans[yy_current_state];" );
-		indent_puts( "yy_is_jam = (yy_current_state == 0);" );
-		}
-
-	else if ( fulltbl )
-		{
-		do_indent();
-		out_dec( "yy_current_state = yy_nxt[yy_current_state][%d];\n",
-			NUL_ec );
-		indent_puts( "yy_is_jam = (yy_current_state <= 0);" );
-		}
-
-	else if ( fullspd )
-		{
-		do_indent();
-		out_dec( "int yy_c = %d;\n", NUL_ec );
-
-		indent_puts(
-		"yyconst struct yy_trans_info *yy_trans_info;\n" );
-		indent_puts(
-		"yy_trans_info = &yy_current_state[(unsigned int) yy_c];" );
-		indent_puts( "yy_current_state += yy_trans_info->yy_nxt;" );
-
-		indent_puts(
-			"yy_is_jam = (yy_trans_info->yy_verify != yy_c);" );
-		}
-
-	else
-		{
-		char NUL_ec_str[20];
-
-		(void) sprintf( NUL_ec_str, "%d", NUL_ec );
-		gen_next_compressed_state( NUL_ec_str );
-
-		do_indent();
-		out_dec( "yy_is_jam = (yy_current_state == %d);\n", jamstate );
-
-		if ( reject )
-			{
-			/* Only stack this state if it's a transition we
-			 * actually make.  If we stack it on a jam, then
-			 * the state stack and yy_c_buf_p get out of sync.
-			 */
-			indent_puts( "if ( ! yy_is_jam )" );
-			indent_up();
-			indent_puts( "*yy_state_ptr++ = yy_current_state;" );
-			indent_down();
-			}
-		}
-
-	/* If we've entered an accepting state, back up; note that
-	 * compressed tables have *already* done such backing up, so
-	 * we needn't bother with it again.
-	 */
-	if ( need_backing_up && (fullspd || fulltbl) )
-		{
-		outc( '\n' );
-		indent_puts( "if ( ! yy_is_jam )" );
-		indent_up();
-		indent_puts( "{" );
-		gen_backing_up();
-		indent_puts( "}" );
-		indent_down();
-		}
-	}
-
-
-/* Generate the code to find the start state. */
-
-void gen_start_state()
-	{
-	if ( fullspd )
-		{
-		if ( bol_needed )
-			{
-			indent_puts(
-	"yy_current_state = yy_start_state_list[yy_start + YY_AT_BOL()];" );
-			}
-		else
-			indent_puts(
-			"yy_current_state = yy_start_state_list[yy_start];" );
-		}
-
-	else
-		{
-		indent_puts( "yy_current_state = yy_start;" );
-
-		if ( bol_needed )
-			indent_puts( "yy_current_state += YY_AT_BOL();" );
-
-		if ( reject )
-			{
-			/* Set up for storing up states. */
-			indent_puts( "yy_state_ptr = yy_state_buf;" );
-			indent_puts( "*yy_state_ptr++ = yy_current_state;" );
-			}
-		}
-	}
-
-
-/* gentabs - generate data statements for the transition tables */
-
-void gentabs()
-	{
-	int i, j, k, *accset, nacc, *acc_array, total_states;
-	int end_of_buffer_action = num_rules + 1;
-
-	acc_array = allocate_integer_array( current_max_dfas );
-	nummt = 0;
-
-	/* The compressed table format jams by entering the "jam state",
-	 * losing information about the previous state in the process.
-	 * In order to recover the previous state, we effectively need
-	 * to keep backing-up information.
-	 */
-	++num_backing_up;
-
-	if ( reject )
-		{
-		/* Write out accepting list and pointer list.
-		 *
-		 * First we generate the "yy_acclist" array.  In the process,
-		 * we compute the indices that will go into the "yy_accept"
-		 * array, and save the indices in the dfaacc array.
-		 */
-		int EOB_accepting_list[2];
-
-		/* Set up accepting structures for the End Of Buffer state. */
-		EOB_accepting_list[0] = 0;
-		EOB_accepting_list[1] = end_of_buffer_action;
-		accsiz[end_of_buffer_state] = 1;
-		dfaacc[end_of_buffer_state].dfaacc_set = EOB_accepting_list;
-
-		out_str_dec( long_align ? C_long_decl : C_short_decl,
-			"yy_acclist", MAX( numas, 1 ) + 1 );
-
-		j = 1;	/* index into "yy_acclist" array */
-
-		for ( i = 1; i <= lastdfa; ++i )
-			{
-			acc_array[i] = j;
-
-			if ( accsiz[i] != 0 )
-				{
-				accset = dfaacc[i].dfaacc_set;
-				nacc = accsiz[i];
-
-				if ( trace )
-					fprintf( stderr,
-						_( "state # %d accepts: " ),
-						i );
-
-				for ( k = 1; k <= nacc; ++k )
-					{
-					int accnum = accset[k];
-
-					++j;
-
-					if ( variable_trailing_context_rules &&
-					  ! (accnum & YY_TRAILING_HEAD_MASK) &&
-					   accnum > 0 && accnum <= num_rules &&
-					  rule_type[accnum] == RULE_VARIABLE )
-						{
-						/* Special hack to flag
-						 * accepting number as part
-						 * of trailing context rule.
-						 */
-						accnum |= YY_TRAILING_MASK;
-						}
-
-					mkdata( accnum );
-
-					if ( trace )
-						{
-						fprintf( stderr, "[%d]",
-							accset[k] );
-
-						if ( k < nacc )
-							fputs( ", ", stderr );
-						else
-							putc( '\n', stderr );
-						}
-					}
-				}
-			}
-
-		/* add accepting number for the "jam" state */
-		acc_array[i] = j;
-
-		dataend();
-		}
-
-	else
-		{
-		dfaacc[end_of_buffer_state].dfaacc_state = end_of_buffer_action;
-
-		for ( i = 1; i <= lastdfa; ++i )
-			acc_array[i] = dfaacc[i].dfaacc_state;
-
-		/* add accepting number for jam state */
-		acc_array[i] = 0;
-		}
-
-	/* Spit out "yy_accept" array.  If we're doing "reject", it'll be
-	 * pointers into the "yy_acclist" array.  Otherwise it's actual
-	 * accepting numbers.  In either case, we just dump the numbers.
-	 */
-
-	/* "lastdfa + 2" is the size of "yy_accept"; includes room for C arrays
-	 * beginning at 0 and for "jam" state.
-	 */
-	k = lastdfa + 2;
-
-	if ( reject )
-		/* We put a "cap" on the table associating lists of accepting
-		 * numbers with state numbers.  This is needed because we tell
-		 * where the end of an accepting list is by looking at where
-		 * the list for the next state starts.
-		 */
-		++k;
-
-	out_str_dec( long_align ? C_long_decl : C_short_decl, "yy_accept", k );
-
-	for ( i = 1; i <= lastdfa; ++i )
-		{
-		mkdata( acc_array[i] );
-
-		if ( ! reject && trace && acc_array[i] )
-			fprintf( stderr, _( "state # %d accepts: [%d]\n" ),
-				i, acc_array[i] );
-		}
-
-	/* Add entry for "jam" state. */
-	mkdata( acc_array[i] );
-
-	if ( reject )
-		/* Add "cap" for the list. */
-		mkdata( acc_array[i] );
-
-	dataend();
-
-	if ( useecs )
-		genecs();
-
-	if ( usemecs )
-		{
-		/* Write out meta-equivalence classes (used to index
-		 * templates with).
-		 */
-
-		if ( trace )
-			fputs( _( "\n\nMeta-Equivalence Classes:\n" ),
-			      stderr );
-
-		out_str_dec( C_int_decl, "yy_meta", numecs + 1 );
-
-		for ( i = 1; i <= numecs; ++i )
-			{
-			if ( trace )
-				fprintf( stderr, "%d = %d\n",
-					i, ABS( tecbck[i] ) );
-
-			mkdata( ABS( tecbck[i] ) );
-			}
-
-		dataend();
-		}
-
-	total_states = lastdfa + numtemps;
-
-	out_str_dec( (tblend >= MAX_SHORT || long_align) ?
-			C_long_decl : C_short_decl,
-		"yy_base", total_states + 1 );
-
-	for ( i = 1; i <= lastdfa; ++i )
-		{
-		int d = def[i];
-
-		if ( base[i] == JAMSTATE )
-			base[i] = jambase;
-
-		if ( d == JAMSTATE )
-			def[i] = jamstate;
-
-		else if ( d < 0 )
-			{
-			/* Template reference. */
-			++tmpuses;
-			def[i] = lastdfa - d + 1;
-			}
-
-		mkdata( base[i] );
-		}
-
-	/* Generate jam state's base index. */
-	mkdata( base[i] );
-
-	for ( ++i /* skip jam state */; i <= total_states; ++i )
-		{
-		mkdata( base[i] );
-		def[i] = jamstate;
-		}
-
-	dataend();
-
-	out_str_dec( (total_states >= MAX_SHORT || long_align) ?
-			C_long_decl : C_short_decl,
-		"yy_def", total_states + 1 );
-
-	for ( i = 1; i <= total_states; ++i )
-		mkdata( def[i] );
-
-	dataend();
-
-	out_str_dec( (total_states >= MAX_SHORT || long_align) ?
-			C_long_decl : C_short_decl,
-		"yy_nxt", tblend + 1 );
-
-	for ( i = 1; i <= tblend; ++i )
-		{
-		/* Note, the order of the following test is important.
-		 * If chk[i] is 0, then nxt[i] is undefined.
-		 */
-		if ( chk[i] == 0 || nxt[i] == 0 )
-			nxt[i] = jamstate;	/* new state is the JAM state */
-
-		mkdata( nxt[i] );
-		}
-
-	dataend();
-
-	out_str_dec( (total_states >= MAX_SHORT || long_align) ?
-			C_long_decl : C_short_decl,
-		"yy_chk", tblend + 1 );
-
-	for ( i = 1; i <= tblend; ++i )
-		{
-		if ( chk[i] == 0 )
-			++nummt;
-
-		mkdata( chk[i] );
-		}
-
-	dataend();
-	}
-
-
-/* Write out a formatted string (with a secondary string argument) at the
- * current indentation level, adding a final newline.
- */
-
-void indent_put2s( fmt, arg )
-char fmt[], arg[];
-	{
-	do_indent();
-	out_str( fmt, arg );
-	outn( "" );
-	}
-
-
-/* Write out a string at the current indentation level, adding a final
- * newline.
- */
-
-void indent_puts( str )
-char str[];
-	{
-	do_indent();
-	outn( str );
-	}
-
-
-/* make_tables - generate transition tables and finishes generating output file
- */
-
-void make_tables()
-	{
-	int i;
-	int did_eof_rule = false;
-
-	skelout();
-
-	/* First, take care of YY_DO_BEFORE_ACTION depending on yymore
-	 * being used.
-	 */
-	set_indent( 1 );
-
-	if ( yymore_used && ! yytext_is_array )
-		{
-		indent_puts( "yytext_ptr -= yy_more_len; \\" );
-		indent_puts( "yyleng = (int) (yy_cp - yytext_ptr); \\" );
-		}
-
-	else
-		indent_puts( "yyleng = (int) (yy_cp - yy_bp); \\" );
-
-	/* Now also deal with copying yytext_ptr to yytext if needed. */
-	skelout();
-	if ( yytext_is_array )
-		{
-		if ( yymore_used )
-			indent_puts(
-				"if ( yyleng + yy_more_offset >= YYLMAX ) \\" );
-		else
-			indent_puts( "if ( yyleng >= YYLMAX ) \\" );
-
-		indent_up();
-		indent_puts(
-		"YY_FATAL_ERROR( \"token too large, exceeds YYLMAX\" ); \\" );
-		indent_down();
-
-		if ( yymore_used )
-			{
-			indent_puts(
-"yy_flex_strncpy( &yytext[yy_more_offset], yytext_ptr, yyleng + 1 ); \\" );
-			indent_puts( "yyleng += yy_more_offset; \\" );
-			indent_puts(
-				"yy_prev_more_offset = yy_more_offset; \\" );
-			indent_puts( "yy_more_offset = 0; \\" );
-			}
-		else
-			{
-			indent_puts(
-		"yy_flex_strncpy( yytext, yytext_ptr, yyleng + 1 ); \\" );
-			}
-		}
-
-	set_indent( 0 );
-
-	skelout();
-
-
-	out_dec( "#define YY_NUM_RULES %d\n", num_rules );
-	out_dec( "#define YY_END_OF_BUFFER %d\n", num_rules + 1 );
-
-	if ( fullspd )
-		{
-		/* Need to define the transet type as a size large
-		 * enough to hold the biggest offset.
-		 */
-		int total_table_size = tblend + numecs + 1;
-		char *trans_offset_type =
-			(total_table_size >= MAX_SHORT || long_align) ?
-				"long" : "short";
-
-		set_indent( 0 );
-		indent_puts( "struct yy_trans_info" );
-		indent_up();
-		indent_puts( "{" ); 	/* } for vi */
-
-		if ( long_align )
-			indent_puts( "long yy_verify;" );
-		else
-			indent_puts( "short yy_verify;" );
-
-		/* In cases where its sister yy_verify *is* a "yes, there is
-		 * a transition", yy_nxt is the offset (in records) to the
-		 * next state.  In most cases where there is no transition,
-		 * the value of yy_nxt is irrelevant.  If yy_nxt is the -1th
-		 * record of a state, though, then yy_nxt is the action number
-		 * for that state.
-		 */
-
-		indent_put2s( "%s yy_nxt;", trans_offset_type );
-		indent_puts( "};" );
-		indent_down();
-		}
-
-	if ( fullspd )
-		genctbl();
-	else if ( fulltbl )
-		genftbl();
-	else
-		gentabs();
-
-	/* Definitions for backing up.  We don't need them if REJECT
-	 * is being used because then we use an alternative backin-up
-	 * technique instead.
-	 */
-	if ( num_backing_up > 0 && ! reject )
-		{
-		if ( ! C_plus_plus )
-			{
-			indent_puts(
-			"static yy_state_type yy_last_accepting_state;" );
-			indent_puts(
-				"static char *yy_last_accepting_cpos;\n" );
-			}
-		}
-
-	if ( nultrans )
-		{
-		out_str_dec( C_state_decl, "yy_NUL_trans", lastdfa + 1 );
-
-		for ( i = 1; i <= lastdfa; ++i )
-			{
-			if ( fullspd )
-				out_dec( "    &yy_transition[%d],\n", base[i] );
-			else
-				mkdata( nultrans[i] );
-			}
-
-		dataend();
-		}
-
-	if ( ddebug )
-		{ /* Spit out table mapping rules to line numbers. */
-		if ( ! C_plus_plus )
-			{
-			indent_puts( "extern int yy_flex_debug;" );
-			indent_puts( "int yy_flex_debug = 1;\n" );
-			}
-
-		out_str_dec( long_align ? C_long_decl : C_short_decl,
-			"yy_rule_linenum", num_rules );
-		for ( i = 1; i < num_rules; ++i )
-			mkdata( rule_linenum[i] );
-		dataend();
-		}
-
-	if ( reject )
-		{
-		/* Declare state buffer variables. */
-		if ( ! C_plus_plus )
-			{
-			outn(
-	"static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;" );
-			outn( "static char *yy_full_match;" );
-			outn( "static int yy_lp;" );
-			}
-
-		if ( variable_trailing_context_rules )
-			{
-			if ( ! C_plus_plus )
-				{
-				outn(
-				"static int yy_looking_for_trail_begin = 0;" );
-				outn( "static int yy_full_lp;" );
-				outn( "static int *yy_full_state;" );
-				}
-
-			out_hex( "#define YY_TRAILING_MASK 0x%x\n",
-				(unsigned int) YY_TRAILING_MASK );
-			out_hex( "#define YY_TRAILING_HEAD_MASK 0x%x\n",
-				(unsigned int) YY_TRAILING_HEAD_MASK );
-			}
-
-		outn( "#define REJECT \\" );
-		outn( "{ \\" );		/* } for vi */
-		outn(
-	"*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ \\" );
-		outn(
-	"yy_cp = yy_full_match; /* restore poss. backed-over text */ \\" );
-
-		if ( variable_trailing_context_rules )
-			{
-			outn(
-		"yy_lp = yy_full_lp; /* restore orig. accepting pos. */ \\" );
-			outn(
-		"yy_state_ptr = yy_full_state; /* restore orig. state */ \\" );
-			outn(
-	"yy_current_state = *yy_state_ptr; /* restore curr. state */ \\" );
-			}
-
-		outn( "++yy_lp; \\" );
-		outn( "goto find_rule; \\" );
-		/* { for vi */
-		outn( "}" );
-		}
-
-	else
-		{
-		outn(
-		"/* The intent behind this definition is that it'll catch" );
-		outn( " * any uses of REJECT which flex missed." );
-		outn( " */" );
-		outn( "#define REJECT reject_used_but_not_detected" );
-		}
-
-	if ( yymore_used )
-		{
-		if ( ! C_plus_plus )
-			{
-			if ( yytext_is_array )
-				{
-				indent_puts( "static int yy_more_offset = 0;" );
-				indent_puts(
-					"static int yy_prev_more_offset = 0;" );
-				}
-			else
-				{
-				indent_puts( "static int yy_more_flag = 0;" );
-				indent_puts( "static int yy_more_len = 0;" );
-				}
-			}
-
-		if ( yytext_is_array )
-			{
-			indent_puts(
-	"#define yymore() (yy_more_offset = yy_flex_strlen( yytext ))" );
-			indent_puts( "#define YY_NEED_STRLEN" );
-			indent_puts( "#define YY_MORE_ADJ 0" );
-			indent_puts( "#define YY_RESTORE_YY_MORE_OFFSET \\" );
-			indent_up();
-			indent_puts( "{ \\" );
-			indent_puts( "yy_more_offset = yy_prev_more_offset; \\" );
-			indent_puts( "yyleng -= yy_more_offset; \\" );
-			indent_puts( "}" );
-			indent_down();
-			}
-		else
-			{
-			indent_puts( "#define yymore() (yy_more_flag = 1)" );
-			indent_puts( "#define YY_MORE_ADJ yy_more_len" );
-			indent_puts( "#define YY_RESTORE_YY_MORE_OFFSET" );
-			}
-		}
-
-	else
-		{
-		indent_puts( "#define yymore() yymore_used_but_not_detected" );
-		indent_puts( "#define YY_MORE_ADJ 0" );
-		indent_puts( "#define YY_RESTORE_YY_MORE_OFFSET" );
-		}
-
-	if ( ! C_plus_plus )
-		{
-		if ( yytext_is_array )
-			{
-			outn( "#ifndef YYLMAX" );
-			outn( "#define YYLMAX 8192" );
-			outn( "#endif\n" );
-			outn( "char yytext[YYLMAX];" );
-			outn( "char *yytext_ptr;" );
-			}
-
-		else
-			outn( "char *yytext;" );
-		}
-
-	out( &action_array[defs1_offset] );
-
-	line_directive_out( stdout, 0 );
-
-	skelout();
-
-	if ( ! C_plus_plus )
-		{
-		if ( use_read )
-			{
-			outn(
-"\tif ( (result = read( fileno(yyin), (char *) buf, max_size )) < 0 ) \\" );
-			outn(
-		"\t\tYY_FATAL_ERROR( \"input in flex scanner failed\" );" );
-			}
-
-		else
-			{
-			outn(
-			"\tif ( yy_current_buffer->yy_is_interactive ) \\" );
-			outn( "\t\t{ \\" );
-			outn( "\t\tint c = '*', n; \\" );
-			outn( "\t\tfor ( n = 0; n < max_size && \\" );
-	outn( "\t\t\t     (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\" );
-			outn( "\t\t\tbuf[n] = (char) c; \\" );
-			outn( "\t\tif ( c == '\\n' ) \\" );
-			outn( "\t\t\tbuf[n++] = (char) c; \\" );
-			outn( "\t\tif ( c == EOF && ferror( yyin ) ) \\" );
-			outn(
-	"\t\t\tYY_FATAL_ERROR( \"input in flex scanner failed\" ); \\" );
-			outn( "\t\tresult = n; \\" );
-			outn( "\t\t} \\" );
-			outn(
-	"\telse if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \\" );
-			outn( "\t\t  && ferror( yyin ) ) \\" );
-			outn(
-		"\t\tYY_FATAL_ERROR( \"input in flex scanner failed\" );" );
-			}
-		}
-
-	skelout();
-
-	indent_puts( "#define YY_RULE_SETUP \\" );
-	indent_up();
-	if ( bol_needed )
-		{
-		indent_puts( "if ( yyleng > 0 ) \\" );
-		indent_up();
-		indent_puts( "yy_current_buffer->yy_at_bol = \\" );
-		indent_puts( "\t\t(yytext[yyleng - 1] == '\\n'); \\" );
-		indent_down();
-		}
-	indent_puts( "YY_USER_ACTION" );
-	indent_down();
-
-	skelout();
-
-	/* Copy prolog to output file. */
-	out( &action_array[prolog_offset] );
-
-	line_directive_out( stdout, 0 );
-
-	skelout();
-
-	set_indent( 2 );
-
-	if ( yymore_used && ! yytext_is_array )
-		{
-		indent_puts( "yy_more_len = 0;" );
-		indent_puts( "if ( yy_more_flag )" );
-		indent_up();
-		indent_puts( "{" );
-		indent_puts( "yy_more_len = yy_c_buf_p - yytext_ptr;" );
-		indent_puts( "yy_more_flag = 0;" );
-		indent_puts( "}" );
-		indent_down();
-		}
-
-	skelout();
-
-	gen_start_state();
-
-	/* Note, don't use any indentation. */
-	outn( "yy_match:" );
-	gen_next_match();
-
-	skelout();
-	set_indent( 2 );
-	gen_find_action();
-
-	skelout();
-	if ( do_yylineno )
-		{
-		indent_puts( "if ( yy_act != YY_END_OF_BUFFER )" );
-		indent_up();
-		indent_puts( "{" );
-		indent_puts( "int yyl;" );
-		indent_puts( "for ( yyl = 0; yyl < yyleng; ++yyl )" );
-		indent_up();
-		indent_puts( "if ( yytext[yyl] == '\\n' )" );
-		indent_up();
-		indent_puts( "++yylineno;" );
-		indent_down();
-		indent_down();
-		indent_puts( "}" );
-		indent_down();
-		}
-
-	skelout();
-	if ( ddebug )
-		{
-		indent_puts( "if ( yy_flex_debug )" );
-		indent_up();
-
-		indent_puts( "{" );
-		indent_puts( "if ( yy_act == 0 )" );
-		indent_up();
-		indent_puts( C_plus_plus ?
-			"cerr << \"--scanner backing up\\n\";" :
-			"fprintf( stderr, \"--scanner backing up\\n\" );" );
-		indent_down();
-
-		do_indent();
-		out_dec( "else if ( yy_act < %d )\n", num_rules );
-		indent_up();
-
-		if ( C_plus_plus )
-			{
-			indent_puts(
-	"cerr << \"--accepting rule at line \" << yy_rule_linenum[yy_act] <<" );
-			indent_puts(
-			"         \"(\\\"\" << yytext << \"\\\")\\n\";" );
-			}
-		else
-			{
-			indent_puts(
-	"fprintf( stderr, \"--accepting rule at line %d (\\\"%s\\\")\\n\"," );
-
-			indent_puts(
-				"         yy_rule_linenum[yy_act], yytext );" );
-			}
-
-		indent_down();
-
-		do_indent();
-		out_dec( "else if ( yy_act == %d )\n", num_rules );
-		indent_up();
-
-		if ( C_plus_plus )
-			{
-			indent_puts(
-"cerr << \"--accepting default rule (\\\"\" << yytext << \"\\\")\\n\";" );
-			}
-		else
-			{
-			indent_puts(
-	"fprintf( stderr, \"--accepting default rule (\\\"%s\\\")\\n\"," );
-			indent_puts( "         yytext );" );
-			}
-
-		indent_down();
-
-		do_indent();
-		out_dec( "else if ( yy_act == %d )\n", num_rules + 1 );
-		indent_up();
-
-		indent_puts( C_plus_plus ?
-			"cerr << \"--(end of buffer or a NUL)\\n\";" :
-		"fprintf( stderr, \"--(end of buffer or a NUL)\\n\" );" );
-
-		indent_down();
-
-		do_indent();
-		outn( "else" );
-		indent_up();
-
-		if ( C_plus_plus )
-			{
-			indent_puts(
-	"cerr << \"--EOF (start condition \" << YY_START << \")\\n\";" );
-			}
-		else
-			{
-			indent_puts(
-	"fprintf( stderr, \"--EOF (start condition %d)\\n\", YY_START );" );
-			}
-
-		indent_down();
-
-		indent_puts( "}" );
-		indent_down();
-		}
-
-	/* Copy actions to output file. */
-	skelout();
-	indent_up();
-	gen_bu_action();
-	out( &action_array[action_offset] );
-
-	line_directive_out( stdout, 0 );
-
-	/* generate cases for any missing EOF rules */
-	for ( i = 1; i <= lastsc; ++i )
-		if ( ! sceof[i] )
-			{
-			do_indent();
-			out_str( "case YY_STATE_EOF(%s):\n", scname[i] );
-			did_eof_rule = true;
-			}
-
-	if ( did_eof_rule )
-		{
-		indent_up();
-		indent_puts( "yyterminate();" );
-		indent_down();
-		}
-
-
-	/* Generate code for handling NUL's, if needed. */
-
-	/* First, deal with backing up and setting up yy_cp if the scanner
-	 * finds that it should JAM on the NUL.
-	 */
-	skelout();
-	set_indent( 4 );
-
-	if ( fullspd || fulltbl )
-		indent_puts( "yy_cp = yy_c_buf_p;" );
-
-	else
-		{ /* compressed table */
-		if ( ! reject && ! interactive )
-			{
-			/* Do the guaranteed-needed backing up to figure
-			 * out the match.
-			 */
-			indent_puts( "yy_cp = yy_last_accepting_cpos;" );
-			indent_puts(
-				"yy_current_state = yy_last_accepting_state;" );
-			}
-
-		else
-			/* Still need to initialize yy_cp, though
-			 * yy_current_state was set up by
-			 * yy_get_previous_state().
-			 */
-			indent_puts( "yy_cp = yy_c_buf_p;" );
-		}
-
-
-	/* Generate code for yy_get_previous_state(). */
-	set_indent( 1 );
-	skelout();
-
-	gen_start_state();
-
-	set_indent( 2 );
-	skelout();
-	gen_next_state( true );
-
-	set_indent( 1 );
-	skelout();
-	gen_NUL_trans();
-
-	skelout();
-	if ( do_yylineno )
-		{ /* update yylineno inside of unput() */
-		indent_puts( "if ( c == '\\n' )" );
-		indent_up();
-		indent_puts( "--yylineno;" );
-		indent_down();
-		}
-
-	skelout();
-	/* Update BOL and yylineno inside of input(). */
-	if ( bol_needed )
-		{
-		indent_puts( "yy_current_buffer->yy_at_bol = (c == '\\n');" );
-		if ( do_yylineno )
-			{
-			indent_puts( "if ( yy_current_buffer->yy_at_bol )" );
-			indent_up();
-			indent_puts( "++yylineno;" );
-			indent_down();
-			}
-		}
-
-	else if ( do_yylineno )
-		{
-		indent_puts( "if ( c == '\\n' )" );
-		indent_up();
-		indent_puts( "++yylineno;" );
-		indent_down();
-		}
-
-	skelout();
-
-	/* Copy remainder of input to output. */
-
-	line_directive_out( stdout, 1 );
-
-	if ( sectnum == 3 )
-		(void) flexscan(); /* copy remainder of input to output */
-	}
diff --git a/usr.bin/lex/initparse.c b/usr.bin/lex/initparse.c
new file mode 100644
index 0000000..e9c2878
--- /dev/null
+++ b/usr.bin/lex/initparse.c
@@ -0,0 +1,1849 @@
+/* $FreeBSD$ */
+#ifndef lint
+static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
+#endif
+
+#define YYBYACC 1
+#define YYMAJOR 1
+#define YYMINOR 9
+
+#define YYEMPTY        (-1)
+#define yyclearin      (yychar = YYEMPTY)
+#define yyerrok        (yyerrflag = 0)
+#define YYRECOVERING() (yyerrflag != 0)
+
+#define YYPREFIX "yy"
+
+#define YYPURE 0
+
+#line 35 "parse.y"
+/*  Copyright (c) 1990 The Regents of the University of California. */
+/*  All rights reserved. */
+
+/*  This code is derived from software contributed to Berkeley by */
+/*  Vern Paxson. */
+
+/*  The United States Government has rights in this work pursuant */
+/*  to contract no. DE-AC03-76SF00098 between the United States */
+/*  Department of Energy and the University of California. */
+
+/*  This file is part of flex. */
+
+/*  Redistribution and use in source and binary forms, with or without */
+/*  modification, are permitted provided that the following conditions */
+/*  are met: */
+
+/*  1. Redistributions of source code must retain the above copyright */
+/*     notice, this list of conditions and the following disclaimer. */
+/*  2. Redistributions in binary form must reproduce the above copyright */
+/*     notice, this list of conditions and the following disclaimer in the */
+/*     documentation and/or other materials provided with the distribution. */
+
+/*  Neither the name of the University nor the names of its contributors */
+/*  may be used to endorse or promote products derived from this software */
+/*  without specific prior written permission. */
+
+/*  THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR */
+/*  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
+/*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
+/*  PURPOSE. */
+
+#include "flexdef.h"
+#include "tables.h"
+
+int pat, scnum, eps, headcnt, trailcnt, lastchar, i, rulelen;
+int trlcontxt, xcluflg, currccl, cclsorted, varlength, variable_trail_rule;
+
+int *scon_stk;
+int scon_stk_ptr;
+
+static int madeany = false;  /* whether we've made the '.' character class */
+static int ccldot, cclany;
+int previous_continued_action;	/* whether the previous rule's action was '|' */
+
+#define format_warn3(fmt, a1, a2) \
+	do{ \
+        char fw3_msg[MAXLINE];\
+        snprintf( fw3_msg, MAXLINE,(fmt), (a1), (a2) );\
+        warn( fw3_msg );\
+	}while(0)
+
+/* Expand a POSIX character class expression. */
+#define CCL_EXPR(func) \
+	do{ \
+	int c; \
+	for ( c = 0; c < csize; ++c ) \
+		if ( isascii(c) && func(c) ) \
+			ccladd( currccl, c ); \
+	}while(0)
+
+/* negated class */
+#define CCL_NEG_EXPR(func) \
+	do{ \
+	int c; \
+	for ( c = 0; c < csize; ++c ) \
+		if ( !func(c) ) \
+			ccladd( currccl, c ); \
+	}while(0)
+
+/* While POSIX defines isblank(), it's not ANSI C. */
+#define IS_BLANK(c) ((c) == ' ' || (c) == '\t')
+
+/* On some over-ambitious machines, such as DEC Alpha's, the default
+ * token type is "long" instead of "int"; this leads to problems with
+ * declaring yylval in flexdef.h.  But so far, all the yacc's I've seen
+ * wrap their definitions of YYSTYPE with "#ifndef YYSTYPE"'s, so the
+ * following should ensure that the default token type is "int".
+ */
+#define YYSTYPE int
+
+#line 99 "parse.c"
+
+#ifndef YYSTYPE
+typedef int YYSTYPE;
+#endif
+
+/* compatibility with bison */
+#ifdef YYPARSE_PARAM
+/* compatibility with FreeBSD */
+# ifdef YYPARSE_PARAM_TYPE
+#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
+# else
+#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
+# endif
+#else
+# define YYPARSE_DECL() yyparse(void)
+#endif
+
+/* Parameters sent to lex. */
+#ifdef YYLEX_PARAM
+# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
+# define YYLEX yylex(YYLEX_PARAM)
+#else
+# define YYLEX_DECL() yylex(void)
+# define YYLEX yylex()
+#endif
+
+/* Parameters sent to yyerror. */
+#ifndef YYERROR_DECL
+#define YYERROR_DECL() yyerror(const char *s)
+#endif
+#ifndef YYERROR_CALL
+#define YYERROR_CALL(msg) yyerror(msg)
+#endif
+
+extern int YYPARSE_DECL();
+
+#define CHAR 257
+#define NUMBER 258
+#define SECTEND 259
+#define SCDECL 260
+#define XSCDECL 261
+#define NAME 262
+#define PREVCCL 263
+#define EOF_OP 264
+#define OPTION_OP 265
+#define OPT_OUTFILE 266
+#define OPT_PREFIX 267
+#define OPT_YYCLASS 268
+#define OPT_HEADER 269
+#define OPT_EXTRA_TYPE 270
+#define OPT_TABLES 271
+#define CCE_ALNUM 272
+#define CCE_ALPHA 273
+#define CCE_BLANK 274
+#define CCE_CNTRL 275
+#define CCE_DIGIT 276
+#define CCE_GRAPH 277
+#define CCE_LOWER 278
+#define CCE_PRINT 279
+#define CCE_PUNCT 280
+#define CCE_SPACE 281
+#define CCE_UPPER 282
+#define CCE_XDIGIT 283
+#define CCE_NEG_ALNUM 284
+#define CCE_NEG_ALPHA 285
+#define CCE_NEG_BLANK 286
+#define CCE_NEG_CNTRL 287
+#define CCE_NEG_DIGIT 288
+#define CCE_NEG_GRAPH 289
+#define CCE_NEG_LOWER 290
+#define CCE_NEG_PRINT 291
+#define CCE_NEG_PUNCT 292
+#define CCE_NEG_SPACE 293
+#define CCE_NEG_UPPER 294
+#define CCE_NEG_XDIGIT 295
+#define CCL_OP_DIFF 296
+#define CCL_OP_UNION 297
+#define BEGIN_REPEAT_POSIX 298
+#define END_REPEAT_POSIX 299
+#define BEGIN_REPEAT_FLEX 300
+#define END_REPEAT_FLEX 301
+#define YYERRCODE 256
+static const short yylhs[] = {                           -1,
+    0,    1,    2,    2,    2,    2,    3,    6,    6,    7,
+    7,    7,    8,    9,    9,   10,   10,   10,   10,   10,
+   10,    4,    4,    4,    5,   12,   12,   12,   12,   14,
+   11,   11,   11,   15,   15,   15,   16,   13,   13,   13,
+   13,   18,   18,   17,   19,   19,   19,   19,   19,   20,
+   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
+   20,   21,   21,   21,   23,   23,   24,   24,   24,   24,
+   25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
+   25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
+   25,   25,   25,   25,   22,   22,
+};
+static const short yylen[] = {                            2,
+    5,    0,    3,    2,    0,    1,    1,    1,    1,    2,
+    1,    1,    2,    2,    0,    3,    3,    3,    3,    3,
+    3,    5,    5,    0,    0,    2,    1,    1,    1,    0,
+    4,    3,    0,    3,    1,    1,    1,    2,    3,    2,
+    1,    3,    1,    2,    2,    1,    6,    5,    4,    2,
+    2,    2,    6,    5,    4,    1,    1,    1,    3,    3,
+    1,    3,    3,    1,    3,    4,    4,    2,    2,    0,
+    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+    1,    1,    1,    1,    2,    0,
+};
+static const short yydefred[] = {                         2,
+    0,    0,    6,    0,    7,    8,    9,   15,   24,    0,
+    4,    0,    0,   12,   11,    0,    0,    0,    0,    0,
+    0,    0,   14,    0,    1,    0,   10,    0,    0,    0,
+    0,    0,    0,    0,    0,   24,    0,   16,   18,   19,
+   20,   17,   21,   32,   36,   37,    0,   35,    0,   29,
+   61,   58,   28,    0,   56,   96,    0,    0,    0,   27,
+    0,    0,    0,    0,    0,   64,   31,    0,   23,   26,
+    0,    0,   70,    0,   22,    0,   40,    0,   44,    0,
+    0,    0,   50,   51,   52,    0,    0,   34,   95,   59,
+   60,    0,    0,   71,   72,   73,   74,   75,   76,   77,
+   78,   79,   80,   82,   81,   83,   84,   85,   86,   87,
+   88,   93,   89,   90,   91,   94,   92,   65,   69,   39,
+    0,    0,    0,   62,   63,   66,    0,   49,    0,   55,
+    0,   67,    0,   48,    0,   54,   47,   53,
+};
+static const short yydgoto[] = {                          1,
+    2,    4,    9,   13,   25,   10,   16,   11,   12,   23,
+   26,   59,   60,   35,   47,   48,   61,   62,   63,   64,
+   65,   71,   66,   74,  119,
+};
+static const short yysindex[] = {                         0,
+    0, -222,    0, -155,    0,    0,    0,    0,    0, -215,
+    0, -123,    6,    0,    0, -193,   10,   21,   26,   31,
+   35,   37,    0,   59,    0,  -44,    0, -147, -145, -140,
+ -133, -132, -129,   75, -214,    0,  -19,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   23,    0,  -48,    0,
+    0,    0,    0,  -17,    0,    0,  -17,   27,  128,    0,
+  -17,   -1,  -30,  -41, -189,    0,    0, -121,    0,    0,
+  -31,  -34,    0,  -87,    0,  -25,    0,  -17,    0, -109,
+  -41, -108,    0,    0,    0,   60,   60,    0,    0,    0,
+    0,   46,  107,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  -30,  -36,  -39,    0,    0,    0, -104,    0, -219,    0,
+ -238,    0, -144,    0, -143,    0,    0,    0,
+};
+static const short yyrindex[] = {                         0,
+    0, -141,    0,    0,    0,    0,    0,    0,    0,    0,
+    0, -134,    9,    0,    0, -125,    0,    0,    0,    0,
+    0,    0,    0, -178,    0,   22,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  -21,    0,
+    0,    0,    0,    0,    0,    0,    0,   85,    0,    0,
+    0,  144,   47,    4,  -10,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  146,    0,    0,    0,    0,
+   18,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  124,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   50,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,
+};
+static const short yygindex[] = {                         0,
+    0,    0,    0,  121,  133,    0,    0,    0,    0,    0,
+    0,    0,  106,    0,    0,   93,    0,   32,   84,  -45,
+    0,    0,   25,   90,    0,
+};
+#define YYTABLESIZE 419
+static const short yytable[] = {                         57,
+   83,   84,   90,   56,  131,  118,   91,  129,   25,   57,
+  120,   24,   33,   46,   56,   55,   56,   81,   33,  135,
+   57,   85,   57,   57,   33,   57,   55,   45,   55,   57,
+   57,   57,   57,    3,   77,   57,   57,   46,  133,   46,
+   14,   45,   33,   46,   46,   79,   15,   46,   33,   46,
+   46,   45,   57,   45,   33,   25,   43,   45,   45,   42,
+   58,   25,  136,   45,   45,   24,   68,   25,   27,   33,
+   28,   58,   33,   58,   54,   81,   69,   30,   36,  134,
+   57,   29,   43,   30,   67,   42,   30,   43,   72,   78,
+   42,   31,   76,   43,   46,   32,   42,   33,   78,   33,
+   34,   33,   33,    5,    6,    7,   86,   87,   45,    8,
+  124,  125,   25,   57,   38,   25,   39,    5,    5,    5,
+   73,   40,   78,    5,   13,   13,   13,   46,   41,   42,
+   13,   33,   43,    3,    3,    3,   44,   75,  126,    3,
+   46,   45,   17,   18,   19,   20,   21,   22,  122,  123,
+   58,  127,  132,   41,  137,   38,   49,  138,   37,   70,
+   88,  121,   92,    0,    0,    0,    0,    0,    0,   93,
+   43,    0,    0,   42,    0,    0,    0,   70,    0,    0,
+    0,    0,    0,    0,   94,   95,   96,   97,   98,   99,
+  100,  101,  102,  103,  104,  105,  106,  107,  108,  109,
+  110,  111,  112,  113,  114,  115,  116,  117,    0,    0,
+    0,    0,    0,    0,    0,    0,   68,    0,    0,    0,
+    0,    0,    0,    0,    0,   89,   51,    0,    0,    0,
+    0,    0,   52,    0,   33,   33,   50,   51,    0,   51,
+    0,   33,   33,   52,   53,   52,   57,    0,    0,    0,
+    0,    0,   57,    0,    0,    0,    0,    0,   82,    0,
+   46,  130,  128,    0,   33,   33,   46,   80,    0,    0,
+    0,   33,   33,    0,   45,    0,    0,   25,   25,    0,
+   45,    0,    0,    0,   25,   25,    0,   57,    0,   57,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   46,   93,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   45,    0,   94,   95,   96,
+   97,   98,   99,  100,  101,  102,  103,  104,  105,  106,
+  107,  108,  109,  110,  111,  112,  113,  114,  115,  116,
+  117,   70,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   70,   70,   70,   70,
+   70,   70,   70,   70,   70,   70,   70,   70,   70,   70,
+   70,   70,   70,   70,   70,   70,   70,   70,   70,   70,
+   68,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   68,   68,   68,   68,   68,
+   68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+   68,   68,   68,   68,   68,   68,   68,   68,   68,
+};
+static const short yycheck[] = {                         10,
+   42,   43,   34,   34,   44,   93,   41,   44,    0,   40,
+   36,   60,   34,   10,   34,   46,   34,   63,   40,  258,
+   40,   63,   40,   34,   46,   36,   46,   10,   46,   40,
+   41,   42,   43,  256,   36,   46,   47,   34,  258,   36,
+  256,  256,   34,   40,   41,   47,  262,  262,   40,   46,
+   47,   34,   63,   36,   46,   34,   10,   40,   41,   10,
+   91,   40,  301,   46,   47,   60,   44,   46,  262,   91,
+   61,   91,   94,   91,   94,  121,  125,  256,  123,  299,
+   91,   61,   36,  262,   62,   36,   61,   41,   57,  124,
+   41,   61,   61,   47,   91,   61,   47,   61,  124,   91,
+   42,  123,   94,  259,  260,  261,  296,  297,   91,  265,
+   86,   87,   91,  124,  262,   94,  262,  259,  260,  261,
+   94,  262,  124,  265,  259,  260,  261,  124,  262,  262,
+  265,  123,  262,  259,  260,  261,   62,   10,   93,  265,
+  262,  124,  266,  267,  268,  269,  270,  271,  258,  258,
+   91,   45,  257,   10,  299,   10,   36,  301,   26,   54,
+   68,   78,   73,   -1,   -1,   -1,   -1,   -1,   -1,  257,
+  124,   -1,   -1,  124,   -1,   -1,   -1,   93,   -1,   -1,
+   -1,   -1,   -1,   -1,  272,  273,  274,  275,  276,  277,
+  278,  279,  280,  281,  282,  283,  284,  285,  286,  287,
+  288,  289,  290,  291,  292,  293,  294,  295,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  257,  257,   -1,   -1,   -1,
+   -1,   -1,  263,   -1,  256,  257,  256,  257,   -1,  257,
+   -1,  263,  264,  263,  264,  263,  257,   -1,   -1,   -1,
+   -1,   -1,  263,   -1,   -1,   -1,   -1,   -1,  300,   -1,
+  257,  301,  299,   -1,  256,  257,  263,  298,   -1,   -1,
+   -1,  263,  264,   -1,  257,   -1,   -1,  256,  257,   -1,
+  263,   -1,   -1,   -1,  263,  264,   -1,  298,   -1,  300,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  298,  257,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  298,   -1,  272,  273,  274,
+  275,  276,  277,  278,  279,  280,  281,  282,  283,  284,
+  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
+  295,  257,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  272,  273,  274,  275,
+  276,  277,  278,  279,  280,  281,  282,  283,  284,  285,
+  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
+  257,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  272,  273,  274,  275,  276,
+  277,  278,  279,  280,  281,  282,  283,  284,  285,  286,
+  287,  288,  289,  290,  291,  292,  293,  294,  295,
+};
+#define YYFINAL 1
+#ifndef YYDEBUG
+#define YYDEBUG 0
+#endif
+#define YYMAXTOKEN 301
+#if YYDEBUG
+static const char *yyname[] = {
+
+"end-of-file",0,0,0,0,0,0,0,0,0,"'\\n'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,"'\"'",0,"'$'",0,0,0,"'('","')'","'*'","'+'","','","'-'","'.'","'/'",0,0,
+0,0,0,0,0,0,0,0,0,0,"'<'","'='","'>'","'?'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,"'['",0,"']'","'^'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,"'{'","'|'","'}'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"CHAR","NUMBER","SECTEND",
+"SCDECL","XSCDECL","NAME","PREVCCL","EOF_OP","OPTION_OP","OPT_OUTFILE",
+"OPT_PREFIX","OPT_YYCLASS","OPT_HEADER","OPT_EXTRA_TYPE","OPT_TABLES",
+"CCE_ALNUM","CCE_ALPHA","CCE_BLANK","CCE_CNTRL","CCE_DIGIT","CCE_GRAPH",
+"CCE_LOWER","CCE_PRINT","CCE_PUNCT","CCE_SPACE","CCE_UPPER","CCE_XDIGIT",
+"CCE_NEG_ALNUM","CCE_NEG_ALPHA","CCE_NEG_BLANK","CCE_NEG_CNTRL","CCE_NEG_DIGIT",
+"CCE_NEG_GRAPH","CCE_NEG_LOWER","CCE_NEG_PRINT","CCE_NEG_PUNCT","CCE_NEG_SPACE",
+"CCE_NEG_UPPER","CCE_NEG_XDIGIT","CCL_OP_DIFF","CCL_OP_UNION",
+"BEGIN_REPEAT_POSIX","END_REPEAT_POSIX","BEGIN_REPEAT_FLEX","END_REPEAT_FLEX",
+};
+static const char *yyrule[] = {
+"$accept : goal",
+"goal : initlex sect1 sect1end sect2 initforrule",
+"initlex :",
+"sect1 : sect1 startconddecl namelist1",
+"sect1 : sect1 options",
+"sect1 :",
+"sect1 : error",
+"sect1end : SECTEND",
+"startconddecl : SCDECL",
+"startconddecl : XSCDECL",
+"namelist1 : namelist1 NAME",
+"namelist1 : NAME",
+"namelist1 : error",
+"options : OPTION_OP optionlist",
+"optionlist : optionlist option",
+"optionlist :",
+"option : OPT_OUTFILE '=' NAME",
+"option : OPT_EXTRA_TYPE '=' NAME",
+"option : OPT_PREFIX '=' NAME",
+"option : OPT_YYCLASS '=' NAME",
+"option : OPT_HEADER '=' NAME",
+"option : OPT_TABLES '=' NAME",
+"sect2 : sect2 scon initforrule flexrule '\\n'",
+"sect2 : sect2 scon '{' sect2 '}'",
+"sect2 :",
+"initforrule :",
+"flexrule : '^' rule",
+"flexrule : rule",
+"flexrule : EOF_OP",
+"flexrule : error",
+"scon_stk_ptr :",
+"scon : '<' scon_stk_ptr namelist2 '>'",
+"scon : '<' '*' '>'",
+"scon :",
+"namelist2 : namelist2 ',' sconname",
+"namelist2 : sconname",
+"namelist2 : error",
+"sconname : NAME",
+"rule : re2 re",
+"rule : re2 re '$'",
+"rule : re '$'",
+"rule : re",
+"re : re '|' series",
+"re : series",
+"re2 : re '/'",
+"series : series singleton",
+"series : singleton",
+"series : series BEGIN_REPEAT_POSIX NUMBER ',' NUMBER END_REPEAT_POSIX",
+"series : series BEGIN_REPEAT_POSIX NUMBER ',' END_REPEAT_POSIX",
+"series : series BEGIN_REPEAT_POSIX NUMBER END_REPEAT_POSIX",
+"singleton : singleton '*'",
+"singleton : singleton '+'",
+"singleton : singleton '?'",
+"singleton : singleton BEGIN_REPEAT_FLEX NUMBER ',' NUMBER END_REPEAT_FLEX",
+"singleton : singleton BEGIN_REPEAT_FLEX NUMBER ',' END_REPEAT_FLEX",
+"singleton : singleton BEGIN_REPEAT_FLEX NUMBER END_REPEAT_FLEX",
+"singleton : '.'",
+"singleton : fullccl",
+"singleton : PREVCCL",
+"singleton : '\"' string '\"'",
+"singleton : '(' re ')'",
+"singleton : CHAR",
+"fullccl : fullccl CCL_OP_DIFF braceccl",
+"fullccl : fullccl CCL_OP_UNION braceccl",
+"fullccl : braceccl",
+"braceccl : '[' ccl ']'",
+"braceccl : '[' '^' ccl ']'",
+"ccl : ccl CHAR '-' CHAR",
+"ccl : ccl CHAR",
+"ccl : ccl ccl_expr",
+"ccl :",
+"ccl_expr : CCE_ALNUM",
+"ccl_expr : CCE_ALPHA",
+"ccl_expr : CCE_BLANK",
+"ccl_expr : CCE_CNTRL",
+"ccl_expr : CCE_DIGIT",
+"ccl_expr : CCE_GRAPH",
+"ccl_expr : CCE_LOWER",
+"ccl_expr : CCE_PRINT",
+"ccl_expr : CCE_PUNCT",
+"ccl_expr : CCE_SPACE",
+"ccl_expr : CCE_XDIGIT",
+"ccl_expr : CCE_UPPER",
+"ccl_expr : CCE_NEG_ALNUM",
+"ccl_expr : CCE_NEG_ALPHA",
+"ccl_expr : CCE_NEG_BLANK",
+"ccl_expr : CCE_NEG_CNTRL",
+"ccl_expr : CCE_NEG_DIGIT",
+"ccl_expr : CCE_NEG_GRAPH",
+"ccl_expr : CCE_NEG_PRINT",
+"ccl_expr : CCE_NEG_PUNCT",
+"ccl_expr : CCE_NEG_SPACE",
+"ccl_expr : CCE_NEG_XDIGIT",
+"ccl_expr : CCE_NEG_LOWER",
+"ccl_expr : CCE_NEG_UPPER",
+"string : string CHAR",
+"string :",
+
+};
+#endif
+
+int      yydebug;
+int      yynerrs;
+
+int      yyerrflag;
+int      yychar;
+YYSTYPE  yyval;
+YYSTYPE  yylval;
+
+/* define the initial stack-sizes */
+#ifdef YYSTACKSIZE
+#undef YYMAXDEPTH
+#define YYMAXDEPTH  YYSTACKSIZE
+#else
+#ifdef YYMAXDEPTH
+#define YYSTACKSIZE YYMAXDEPTH
+#else
+#define YYSTACKSIZE 500
+#define YYMAXDEPTH  500
+#endif
+#endif
+
+#define YYINITSTACKSIZE 500
+
+typedef struct {
+    unsigned stacksize;
+    short    *s_base;
+    short    *s_mark;
+    short    *s_last;
+    YYSTYPE  *l_base;
+    YYSTYPE  *l_mark;
+} YYSTACKDATA;
+/* variables for the parser stack */
+static YYSTACKDATA yystack;
+#line 948 "parse.y"
+
+
+/* build_eof_action - build the "<<EOF>>" action for the active start
+ *                    conditions
+ */
+
+void build_eof_action()
+	{
+	int i;
+	char action_text[MAXLINE];
+
+	for ( i = 1; i <= scon_stk_ptr; ++i )
+		{
+		if ( sceof[scon_stk[i]] )
+			format_pinpoint_message(
+				"multiple <<EOF>> rules for start condition %s",
+				scname[scon_stk[i]] );
+
+		else
+			{
+			sceof[scon_stk[i]] = true;
+
+			if (previous_continued_action /* && previous action was regular */)
+				add_action("YY_RULE_SETUP\n");
+
+			snprintf( action_text, sizeof(action_text), "case YY_STATE_EOF(%s):\n",
+				scname[scon_stk[i]] );
+			add_action( action_text );
+			}
+		}
+
+	line_directive_out( (FILE *) 0, 1 );
+
+	/* This isn't a normal rule after all - don't count it as
+	 * such, so we don't have any holes in the rule numbering
+	 * (which make generating "rule can never match" warnings
+	 * more difficult.
+	 */
+	--num_rules;
+	++num_eof_rules;
+	}
+
+
+/* format_synerr - write out formatted syntax error */
+
+void format_synerr( msg, arg )
+const char *msg, arg[];
+	{
+	char errmsg[MAXLINE];
+
+	(void) snprintf( errmsg, sizeof(errmsg), msg, arg );
+	synerr( errmsg );
+	}
+
+
+/* synerr - report a syntax error */
+
+void synerr( str )
+const char *str;
+	{
+	syntaxerror = true;
+	pinpoint_message( str );
+	}
+
+
+/* format_warn - write out formatted warning */
+
+void format_warn( msg, arg )
+const char *msg, arg[];
+	{
+	char warn_msg[MAXLINE];
+
+	snprintf( warn_msg, sizeof(warn_msg), msg, arg );
+	warn( warn_msg );
+	}
+
+
+/* warn - report a warning, unless -w was given */
+
+void warn( str )
+const char *str;
+	{
+	line_warning( str, linenum );
+	}
+
+/* format_pinpoint_message - write out a message formatted with one string,
+ *			     pinpointing its location
+ */
+
+void format_pinpoint_message( msg, arg )
+const char *msg, arg[];
+	{
+	char errmsg[MAXLINE];
+
+	snprintf( errmsg, sizeof(errmsg), msg, arg );
+	pinpoint_message( errmsg );
+	}
+
+
+/* pinpoint_message - write out a message, pinpointing its location */
+
+void pinpoint_message( str )
+const char *str;
+	{
+	line_pinpoint( str, linenum );
+	}
+
+
+/* line_warning - report a warning at a given line, unless -w was given */
+
+void line_warning( str, line )
+const char *str;
+int line;
+	{
+	char warning[MAXLINE];
+
+	if ( ! nowarn )
+		{
+		snprintf( warning, sizeof(warning), "warning, %s", str );
+		line_pinpoint( warning, line );
+		}
+	}
+
+
+/* line_pinpoint - write out a message, pinpointing it at the given line */
+
+void line_pinpoint( str, line )
+const char *str;
+int line;
+	{
+	fprintf( stderr, "%s:%d: %s\n", infilename, line, str );
+	}
+
+
+/* yyerror - eat up an error message from the parser;
+ *	     currently, messages are ignore
+ */
+
+void yyerror( msg )
+const char *msg;
+	{
+	}
+#line 656 "parse.c"
+
+#if YYDEBUG
+#include <stdio.h>		/* needed for printf */
+#endif
+
+#include <stdlib.h>	/* needed for malloc, etc */
+#include <string.h>	/* needed for memset */
+
+/* allocate initial stack or double stack size, up to YYMAXDEPTH */
+static int yygrowstack(YYSTACKDATA *data)
+{
+    int i;
+    unsigned newsize;
+    short *newss;
+    YYSTYPE *newvs;
+
+    if ((newsize = data->stacksize) == 0)
+        newsize = YYINITSTACKSIZE;
+    else if (newsize >= YYMAXDEPTH)
+        return -1;
+    else if ((newsize *= 2) > YYMAXDEPTH)
+        newsize = YYMAXDEPTH;
+
+    i = data->s_mark - data->s_base;
+    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
+    if (newss == 0)
+        return -1;
+
+    data->s_base = newss;
+    data->s_mark = newss + i;
+
+    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
+    if (newvs == 0)
+        return -1;
+
+    data->l_base = newvs;
+    data->l_mark = newvs + i;
+
+    data->stacksize = newsize;
+    data->s_last = data->s_base + newsize - 1;
+    return 0;
+}
+
+#if YYPURE || defined(YY_NO_LEAKS)
+static void yyfreestack(YYSTACKDATA *data)
+{
+    free(data->s_base);
+    free(data->l_base);
+    memset(data, 0, sizeof(*data));
+}
+#else
+#define yyfreestack(data) /* nothing */
+#endif
+
+#define YYABORT  goto yyabort
+#define YYREJECT goto yyabort
+#define YYACCEPT goto yyaccept
+#define YYERROR  goto yyerrlab
+
+int
+YYPARSE_DECL()
+{
+    int yym, yyn, yystate;
+#if YYDEBUG
+    const char *yys;
+
+    if ((yys = getenv("YYDEBUG")) != 0)
+    {
+        yyn = *yys;
+        if (yyn >= '0' && yyn <= '9')
+            yydebug = yyn - '0';
+    }
+#endif
+
+    yynerrs = 0;
+    yyerrflag = 0;
+    yychar = YYEMPTY;
+    yystate = 0;
+
+#if YYPURE
+    memset(&yystack, 0, sizeof(yystack));
+#endif
+
+    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
+    yystack.s_mark = yystack.s_base;
+    yystack.l_mark = yystack.l_base;
+    yystate = 0;
+    *yystack.s_mark = 0;
+
+yyloop:
+    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
+    if (yychar < 0)
+    {
+        if ((yychar = YYLEX) < 0) yychar = 0;
+#if YYDEBUG
+        if (yydebug)
+        {
+            yys = 0;
+            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
+            if (!yys) yys = "illegal-symbol";
+            printf("%sdebug: state %d, reading %d (%s)\n",
+                    YYPREFIX, yystate, yychar, yys);
+        }
+#endif
+    }
+    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
+            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
+    {
+#if YYDEBUG
+        if (yydebug)
+            printf("%sdebug: state %d, shifting to state %d\n",
+                    YYPREFIX, yystate, yytable[yyn]);
+#endif
+        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
+        {
+            goto yyoverflow;
+        }
+        yystate = yytable[yyn];
+        *++yystack.s_mark = yytable[yyn];
+        *++yystack.l_mark = yylval;
+        yychar = YYEMPTY;
+        if (yyerrflag > 0)  --yyerrflag;
+        goto yyloop;
+    }
+    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
+            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
+    {
+        yyn = yytable[yyn];
+        goto yyreduce;
+    }
+    if (yyerrflag) goto yyinrecovery;
+
+    yyerror("syntax error");
+
+    goto yyerrlab;
+
+yyerrlab:
+    ++yynerrs;
+
+yyinrecovery:
+    if (yyerrflag < 3)
+    {
+        yyerrflag = 3;
+        for (;;)
+        {
+            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
+                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
+            {
+#if YYDEBUG
+                if (yydebug)
+                    printf("%sdebug: state %d, error recovery shifting\
+ to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
+#endif
+                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
+                {
+                    goto yyoverflow;
+                }
+                yystate = yytable[yyn];
+                *++yystack.s_mark = yytable[yyn];
+                *++yystack.l_mark = yylval;
+                goto yyloop;
+            }
+            else
+            {
+#if YYDEBUG
+                if (yydebug)
+                    printf("%sdebug: error recovery discarding state %d\n",
+                            YYPREFIX, *yystack.s_mark);
+#endif
+                if (yystack.s_mark <= yystack.s_base) goto yyabort;
+                --yystack.s_mark;
+                --yystack.l_mark;
+            }
+        }
+    }
+    else
+    {
+        if (yychar == 0) goto yyabort;
+#if YYDEBUG
+        if (yydebug)
+        {
+            yys = 0;
+            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
+            if (!yys) yys = "illegal-symbol";
+            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
+                    YYPREFIX, yystate, yychar, yys);
+        }
+#endif
+        yychar = YYEMPTY;
+        goto yyloop;
+    }
+
+yyreduce:
+#if YYDEBUG
+    if (yydebug)
+        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
+                YYPREFIX, yystate, yyn, yyrule[yyn]);
+#endif
+    yym = yylen[yyn];
+    if (yym)
+        yyval = yystack.l_mark[1-yym];
+    else
+        memset(&yyval, 0, sizeof yyval);
+    switch (yyn)
+    {
+case 1:
+#line 119 "parse.y"
+	{ /* add default rule */
+			int def_rule;
+
+			pat = cclinit();
+			cclnegate( pat );
+
+			def_rule = mkstate( -pat );
+
+			/* Remember the number of the default rule so we
+			 * don't generate "can't match" warnings for it.
+			 */
+			default_rule = num_rules;
+
+			finish_rule( def_rule, false, 0, 0, 0);
+
+			for ( i = 1; i <= lastsc; ++i )
+				scset[i] = mkbranch( scset[i], def_rule );
+
+			if ( spprdflt )
+				add_action(
+				"YY_FATAL_ERROR( \"flex scanner jammed\" )" );
+			else
+				add_action( "ECHO" );
+
+			add_action( ";\n\tYY_BREAK\n" );
+			}
+break;
+case 2:
+#line 148 "parse.y"
+	{ /* initialize for processing rules */
+
+			/* Create default DFA start condition. */
+			scinstal( "INITIAL", false );
+			}
+break;
+case 6:
+#line 159 "parse.y"
+	{ synerr( _("unknown error processing section 1") ); }
+break;
+case 7:
+#line 163 "parse.y"
+	{
+			check_options();
+			scon_stk = allocate_integer_array( lastsc + 1 );
+			scon_stk_ptr = 0;
+			}
+break;
+case 8:
+#line 171 "parse.y"
+	{ xcluflg = false; }
+break;
+case 9:
+#line 174 "parse.y"
+	{ xcluflg = true; }
+break;
+case 10:
+#line 178 "parse.y"
+	{ scinstal( nmstr, xcluflg ); }
+break;
+case 11:
+#line 181 "parse.y"
+	{ scinstal( nmstr, xcluflg ); }
+break;
+case 12:
+#line 184 "parse.y"
+	{ synerr( _("bad start condition list") ); }
+break;
+case 16:
+#line 195 "parse.y"
+	{
+			outfilename = copy_string( nmstr );
+			did_outfilename = 1;
+			}
+break;
+case 17:
+#line 200 "parse.y"
+	{ extra_type = copy_string( nmstr ); }
+break;
+case 18:
+#line 202 "parse.y"
+	{ prefix = copy_string( nmstr ); }
+break;
+case 19:
+#line 204 "parse.y"
+	{ yyclass = copy_string( nmstr ); }
+break;
+case 20:
+#line 206 "parse.y"
+	{ headerfilename = copy_string( nmstr ); }
+break;
+case 21:
+#line 208 "parse.y"
+	{ tablesext = true; tablesfilename = copy_string( nmstr ); }
+break;
+case 22:
+#line 212 "parse.y"
+	{ scon_stk_ptr = yystack.l_mark[-3]; }
+break;
+case 23:
+#line 214 "parse.y"
+	{ scon_stk_ptr = yystack.l_mark[-3]; }
+break;
+case 25:
+#line 219 "parse.y"
+	{
+			/* Initialize for a parse of one rule. */
+			trlcontxt = variable_trail_rule = varlength = false;
+			trailcnt = headcnt = rulelen = 0;
+			current_state_type = STATE_NORMAL;
+			previous_continued_action = continued_action;
+			in_rule = true;
+
+			new_rule();
+			}
+break;
+case 26:
+#line 232 "parse.y"
+	{
+			pat = yystack.l_mark[0];
+			finish_rule( pat, variable_trail_rule,
+				headcnt, trailcnt , previous_continued_action);
+
+			if ( scon_stk_ptr > 0 )
+				{
+				for ( i = 1; i <= scon_stk_ptr; ++i )
+					scbol[scon_stk[i]] =
+						mkbranch( scbol[scon_stk[i]],
+								pat );
+				}
+
+			else
+				{
+				/* Add to all non-exclusive start conditions,
+				 * including the default (0) start condition.
+				 */
+
+				for ( i = 1; i <= lastsc; ++i )
+					if ( ! scxclu[i] )
+						scbol[i] = mkbranch( scbol[i],
+									pat );
+				}
+
+			if ( ! bol_needed )
+				{
+				bol_needed = true;
+
+				if ( performance_report > 1 )
+					pinpoint_message(
+			"'^' operator results in sub-optimal performance" );
+				}
+			}
+break;
+case 27:
+#line 268 "parse.y"
+	{
+			pat = yystack.l_mark[0];
+			finish_rule( pat, variable_trail_rule,
+				headcnt, trailcnt , previous_continued_action);
+
+			if ( scon_stk_ptr > 0 )
+				{
+				for ( i = 1; i <= scon_stk_ptr; ++i )
+					scset[scon_stk[i]] =
+						mkbranch( scset[scon_stk[i]],
+								pat );
+				}
+
+			else
+				{
+				for ( i = 1; i <= lastsc; ++i )
+					if ( ! scxclu[i] )
+						scset[i] =
+							mkbranch( scset[i],
+								pat );
+				}
+			}
+break;
+case 28:
+#line 292 "parse.y"
+	{
+			if ( scon_stk_ptr > 0 )
+				build_eof_action();
+	
+			else
+				{
+				/* This EOF applies to all start conditions
+				 * which don't already have EOF actions.
+				 */
+				for ( i = 1; i <= lastsc; ++i )
+					if ( ! sceof[i] )
+						scon_stk[++scon_stk_ptr] = i;
+
+				if ( scon_stk_ptr == 0 )
+					warn(
+			"all start conditions already have <<EOF>> rules" );
+
+				else
+					build_eof_action();
+				}
+			}
+break;
+case 29:
+#line 315 "parse.y"
+	{ synerr( _("unrecognized rule") ); }
+break;
+case 30:
+#line 319 "parse.y"
+	{ yyval = scon_stk_ptr; }
+break;
+case 31:
+#line 323 "parse.y"
+	{ yyval = yystack.l_mark[-2]; }
+break;
+case 32:
+#line 326 "parse.y"
+	{
+			yyval = scon_stk_ptr;
+
+			for ( i = 1; i <= lastsc; ++i )
+				{
+				int j;
+
+				for ( j = 1; j <= scon_stk_ptr; ++j )
+					if ( scon_stk[j] == i )
+						break;
+
+				if ( j > scon_stk_ptr )
+					scon_stk[++scon_stk_ptr] = i;
+				}
+			}
+break;
+case 33:
+#line 343 "parse.y"
+	{ yyval = scon_stk_ptr; }
+break;
+case 36:
+#line 351 "parse.y"
+	{ synerr( _("bad start condition list") ); }
+break;
+case 37:
+#line 355 "parse.y"
+	{
+			if ( (scnum = sclookup( nmstr )) == 0 )
+				format_pinpoint_message(
+					"undeclared start condition %s",
+					nmstr );
+			else
+				{
+				for ( i = 1; i <= scon_stk_ptr; ++i )
+					if ( scon_stk[i] == scnum )
+						{
+						format_warn(
+							"<%s> specified twice",
+							scname[scnum] );
+						break;
+						}
+
+				if ( i > scon_stk_ptr )
+					scon_stk[++scon_stk_ptr] = scnum;
+				}
+			}
+break;
+case 38:
+#line 378 "parse.y"
+	{
+			if ( transchar[lastst[yystack.l_mark[0]]] != SYM_EPSILON )
+				/* Provide final transition \now/ so it
+				 * will be marked as a trailing context
+				 * state.
+				 */
+				yystack.l_mark[0] = link_machines( yystack.l_mark[0],
+						mkstate( SYM_EPSILON ) );
+
+			mark_beginning_as_normal( yystack.l_mark[0] );
+			current_state_type = STATE_NORMAL;
+
+			if ( previous_continued_action )
+				{
+				/* We need to treat this as variable trailing
+				 * context so that the backup does not happen
+				 * in the action but before the action switch
+				 * statement.  If the backup happens in the
+				 * action, then the rules "falling into" this
+				 * one's action will *also* do the backup,
+				 * erroneously.
+				 */
+				if ( ! varlength || headcnt != 0 )
+					warn(
+		"trailing context made variable due to preceding '|' action" );
+
+				/* Mark as variable. */
+				varlength = true;
+				headcnt = 0;
+
+				}
+
+			if ( lex_compat || (varlength && headcnt == 0) )
+				{ /* variable trailing context rule */
+				/* Mark the first part of the rule as the
+				 * accepting "head" part of a trailing
+				 * context rule.
+				 *
+				 * By the way, we didn't do this at the
+				 * beginning of this production because back
+				 * then current_state_type was set up for a
+				 * trail rule, and add_accept() can create
+				 * a new state ...
+				 */
+				add_accept( yystack.l_mark[-1],
+					num_rules | YY_TRAILING_HEAD_MASK );
+				variable_trail_rule = true;
+				}
+			
+			else
+				trailcnt = rulelen;
+
+			yyval = link_machines( yystack.l_mark[-1], yystack.l_mark[0] );
+			}
+break;
+case 39:
+#line 434 "parse.y"
+	{ synerr( _("trailing context used twice") ); }
+break;
+case 40:
+#line 437 "parse.y"
+	{
+			headcnt = 0;
+			trailcnt = 1;
+			rulelen = 1;
+			varlength = false;
+
+			current_state_type = STATE_TRAILING_CONTEXT;
+
+			if ( trlcontxt )
+				{
+				synerr( _("trailing context used twice") );
+				yyval = mkstate( SYM_EPSILON );
+				}
+
+			else if ( previous_continued_action )
+				{
+				/* See the comment in the rule for "re2 re"
+				 * above.
+				 */
+				warn(
+		"trailing context made variable due to preceding '|' action" );
+
+				varlength = true;
+				}
+
+			if ( lex_compat || varlength )
+				{
+				/* Again, see the comment in the rule for
+				 * "re2 re" above.
+				 */
+				add_accept( yystack.l_mark[-1],
+					num_rules | YY_TRAILING_HEAD_MASK );
+				variable_trail_rule = true;
+				}
+
+			trlcontxt = true;
+
+			eps = mkstate( SYM_EPSILON );
+			yyval = link_machines( yystack.l_mark[-1],
+				link_machines( eps, mkstate( '\n' ) ) );
+			}
+break;
+case 41:
+#line 480 "parse.y"
+	{
+			yyval = yystack.l_mark[0];
+
+			if ( trlcontxt )
+				{
+				if ( lex_compat || (varlength && headcnt == 0) )
+					/* Both head and trail are
+					 * variable-length.
+					 */
+					variable_trail_rule = true;
+				else
+					trailcnt = rulelen;
+				}
+			}
+break;
+case 42:
+#line 498 "parse.y"
+	{
+			varlength = true;
+			yyval = mkor( yystack.l_mark[-2], yystack.l_mark[0] );
+			}
+break;
+case 43:
+#line 504 "parse.y"
+	{ yyval = yystack.l_mark[0]; }
+break;
+case 44:
+#line 509 "parse.y"
+	{
+			/* This rule is written separately so the
+			 * reduction will occur before the trailing
+			 * series is parsed.
+			 */
+
+			if ( trlcontxt )
+				synerr( _("trailing context used twice") );
+			else
+				trlcontxt = true;
+
+			if ( varlength )
+				/* We hope the trailing context is
+				 * fixed-length.
+				 */
+				varlength = false;
+			else
+				headcnt = rulelen;
+
+			rulelen = 0;
+
+			current_state_type = STATE_TRAILING_CONTEXT;
+			yyval = yystack.l_mark[-1];
+			}
+break;
+case 45:
+#line 536 "parse.y"
+	{
+			/* This is where concatenation of adjacent patterns
+			 * gets done.
+			 */
+			yyval = link_machines( yystack.l_mark[-1], yystack.l_mark[0] );
+			}
+break;
+case 46:
+#line 544 "parse.y"
+	{ yyval = yystack.l_mark[0]; }
+break;
+case 47:
+#line 547 "parse.y"
+	{
+			varlength = true;
+
+			if ( yystack.l_mark[-3] > yystack.l_mark[-1] || yystack.l_mark[-3] < 0 )
+				{
+				synerr( _("bad iteration values") );
+				yyval = yystack.l_mark[-5];
+				}
+			else
+				{
+				if ( yystack.l_mark[-3] == 0 )
+					{
+					if ( yystack.l_mark[-1] <= 0 )
+						{
+						synerr(
+						_("bad iteration values") );
+						yyval = yystack.l_mark[-5];
+						}
+					else
+						yyval = mkopt(
+							mkrep( yystack.l_mark[-5], 1, yystack.l_mark[-1] ) );
+					}
+				else
+					yyval = mkrep( yystack.l_mark[-5], yystack.l_mark[-3], yystack.l_mark[-1] );
+				}
+			}
+break;
+case 48:
+#line 575 "parse.y"
+	{
+			varlength = true;
+
+			if ( yystack.l_mark[-2] <= 0 )
+				{
+				synerr( _("iteration value must be positive") );
+				yyval = yystack.l_mark[-4];
+				}
+
+			else
+				yyval = mkrep( yystack.l_mark[-4], yystack.l_mark[-2], INFINITE_REPEAT );
+			}
+break;
+case 49:
+#line 589 "parse.y"
+	{
+			/* The series could be something like "(foo)",
+			 * in which case we have no idea what its length
+			 * is, so we punt here.
+			 */
+			varlength = true;
+
+			if ( yystack.l_mark[-1] <= 0 )
+				{
+				  synerr( _("iteration value must be positive")
+					  );
+				yyval = yystack.l_mark[-3];
+				}
+
+			else
+				yyval = link_machines( yystack.l_mark[-3],
+						copysingl( yystack.l_mark[-3], yystack.l_mark[-1] - 1 ) );
+			}
+break;
+case 50:
+#line 611 "parse.y"
+	{
+			varlength = true;
+
+			yyval = mkclos( yystack.l_mark[-1] );
+			}
+break;
+case 51:
+#line 618 "parse.y"
+	{
+			varlength = true;
+			yyval = mkposcl( yystack.l_mark[-1] );
+			}
+break;
+case 52:
+#line 624 "parse.y"
+	{
+			varlength = true;
+			yyval = mkopt( yystack.l_mark[-1] );
+			}
+break;
+case 53:
+#line 630 "parse.y"
+	{
+			varlength = true;
+
+			if ( yystack.l_mark[-3] > yystack.l_mark[-1] || yystack.l_mark[-3] < 0 )
+				{
+				synerr( _("bad iteration values") );
+				yyval = yystack.l_mark[-5];
+				}
+			else
+				{
+				if ( yystack.l_mark[-3] == 0 )
+					{
+					if ( yystack.l_mark[-1] <= 0 )
+						{
+						synerr(
+						_("bad iteration values") );
+						yyval = yystack.l_mark[-5];
+						}
+					else
+						yyval = mkopt(
+							mkrep( yystack.l_mark[-5], 1, yystack.l_mark[-1] ) );
+					}
+				else
+					yyval = mkrep( yystack.l_mark[-5], yystack.l_mark[-3], yystack.l_mark[-1] );
+				}
+			}
+break;
+case 54:
+#line 658 "parse.y"
+	{
+			varlength = true;
+
+			if ( yystack.l_mark[-2] <= 0 )
+				{
+				synerr( _("iteration value must be positive") );
+				yyval = yystack.l_mark[-4];
+				}
+
+			else
+				yyval = mkrep( yystack.l_mark[-4], yystack.l_mark[-2], INFINITE_REPEAT );
+			}
+break;
+case 55:
+#line 672 "parse.y"
+	{
+			/* The singleton could be something like "(foo)",
+			 * in which case we have no idea what its length
+			 * is, so we punt here.
+			 */
+			varlength = true;
+
+			if ( yystack.l_mark[-1] <= 0 )
+				{
+				synerr( _("iteration value must be positive") );
+				yyval = yystack.l_mark[-3];
+				}
+
+			else
+				yyval = link_machines( yystack.l_mark[-3],
+						copysingl( yystack.l_mark[-3], yystack.l_mark[-1] - 1 ) );
+			}
+break;
+case 56:
+#line 691 "parse.y"
+	{
+			if ( ! madeany )
+				{
+				/* Create the '.' character class. */
+                    ccldot = cclinit();
+                    ccladd( ccldot, '\n' );
+                    cclnegate( ccldot );
+
+                    if ( useecs )
+                        mkeccl( ccltbl + cclmap[ccldot],
+                            ccllen[ccldot], nextecm,
+                            ecgroup, csize, csize );
+
+				/* Create the (?s:'.') character class. */
+                    cclany = cclinit();
+                    cclnegate( cclany );
+
+                    if ( useecs )
+                        mkeccl( ccltbl + cclmap[cclany],
+                            ccllen[cclany], nextecm,
+                            ecgroup, csize, csize );
+
+				madeany = true;
+				}
+
+			++rulelen;
+
+            if (sf_dot_all())
+                yyval = mkstate( -cclany );
+            else
+                yyval = mkstate( -ccldot );
+			}
+break;
+case 57:
+#line 725 "parse.y"
+	{
+				/* Sort characters for fast searching.
+				 */
+				qsort( ccltbl + cclmap[yystack.l_mark[0]], ccllen[yystack.l_mark[0]], sizeof (*ccltbl), cclcmp );
+
+			if ( useecs )
+				mkeccl( ccltbl + cclmap[yystack.l_mark[0]], ccllen[yystack.l_mark[0]],
+					nextecm, ecgroup, csize, csize );
+
+			++rulelen;
+
+			if (ccl_has_nl[yystack.l_mark[0]])
+				rule_has_nl[num_rules] = true;
+
+			yyval = mkstate( -yystack.l_mark[0] );
+			}
+break;
+case 58:
+#line 743 "parse.y"
+	{
+			++rulelen;
+
+			if (ccl_has_nl[yystack.l_mark[0]])
+				rule_has_nl[num_rules] = true;
+
+			yyval = mkstate( -yystack.l_mark[0] );
+			}
+break;
+case 59:
+#line 753 "parse.y"
+	{ yyval = yystack.l_mark[-1]; }
+break;
+case 60:
+#line 756 "parse.y"
+	{ yyval = yystack.l_mark[-1]; }
+break;
+case 61:
+#line 759 "parse.y"
+	{
+			++rulelen;
+
+			if (yystack.l_mark[0] == nlch)
+				rule_has_nl[num_rules] = true;
+
+            if (sf_case_ins() && has_case(yystack.l_mark[0]))
+                /* create an alternation, as in (a|A) */
+                yyval = mkor (mkstate(yystack.l_mark[0]), mkstate(reverse_case(yystack.l_mark[0])));
+            else
+                yyval = mkstate( yystack.l_mark[0] );
+			}
+break;
+case 62:
+#line 773 "parse.y"
+	{ yyval = ccl_set_diff  (yystack.l_mark[-2], yystack.l_mark[0]); }
+break;
+case 63:
+#line 774 "parse.y"
+	{ yyval = ccl_set_union (yystack.l_mark[-2], yystack.l_mark[0]); }
+break;
+case 65:
+#line 780 "parse.y"
+	{ yyval = yystack.l_mark[-1]; }
+break;
+case 66:
+#line 783 "parse.y"
+	{
+			cclnegate( yystack.l_mark[-1] );
+			yyval = yystack.l_mark[-1];
+			}
+break;
+case 67:
+#line 790 "parse.y"
+	{
+
+			if (sf_case_ins())
+			  {
+
+			    /* If one end of the range has case and the other
+			     * does not, or the cases are different, then we're not
+			     * sure what range the user is trying to express.
+			     * Examples: [@-z] or [S-t]
+			     */
+			    if (has_case (yystack.l_mark[-2]) != has_case (yystack.l_mark[0])
+				     || (has_case (yystack.l_mark[-2]) && (b_islower (yystack.l_mark[-2]) != b_islower (yystack.l_mark[0])))
+				     || (has_case (yystack.l_mark[-2]) && (b_isupper (yystack.l_mark[-2]) != b_isupper (yystack.l_mark[0]))))
+			      format_warn3 (
+			      _("the character range [%c-%c] is ambiguous in a case-insensitive scanner"),
+					    yystack.l_mark[-2], yystack.l_mark[0]);
+
+			    /* If the range spans uppercase characters but not
+			     * lowercase (or vice-versa), then should we automatically
+			     * include lowercase characters in the range?
+			     * Example: [@-_] spans [a-z] but not [A-Z]
+			     */
+			    else if (!has_case (yystack.l_mark[-2]) && !has_case (yystack.l_mark[0]) && !range_covers_case (yystack.l_mark[-2], yystack.l_mark[0]))
+			      format_warn3 (
+			      _("the character range [%c-%c] is ambiguous in a case-insensitive scanner"),
+					    yystack.l_mark[-2], yystack.l_mark[0]);
+			  }
+
+			if ( yystack.l_mark[-2] > yystack.l_mark[0] )
+				synerr( _("negative range in character class") );
+
+			else
+				{
+				for ( i = yystack.l_mark[-2]; i <= yystack.l_mark[0]; ++i )
+					ccladd( yystack.l_mark[-3], i );
+
+				/* Keep track if this ccl is staying in
+				 * alphabetical order.
+				 */
+				cclsorted = cclsorted && (yystack.l_mark[-2] > lastchar);
+				lastchar = yystack.l_mark[0];
+
+                /* Do it again for upper/lowercase */
+                if (sf_case_ins() && has_case(yystack.l_mark[-2]) && has_case(yystack.l_mark[0])){
+                    yystack.l_mark[-2] = reverse_case (yystack.l_mark[-2]);
+                    yystack.l_mark[0] = reverse_case (yystack.l_mark[0]);
+                    
+                    for ( i = yystack.l_mark[-2]; i <= yystack.l_mark[0]; ++i )
+                        ccladd( yystack.l_mark[-3], i );
+
+                    cclsorted = cclsorted && (yystack.l_mark[-2] > lastchar);
+                    lastchar = yystack.l_mark[0];
+                }
+
+				}
+
+			yyval = yystack.l_mark[-3];
+			}
+break;
+case 68:
+#line 850 "parse.y"
+	{
+			ccladd( yystack.l_mark[-1], yystack.l_mark[0] );
+			cclsorted = cclsorted && (yystack.l_mark[0] > lastchar);
+			lastchar = yystack.l_mark[0];
+
+            /* Do it again for upper/lowercase */
+            if (sf_case_ins() && has_case(yystack.l_mark[0])){
+                yystack.l_mark[0] = reverse_case (yystack.l_mark[0]);
+                ccladd (yystack.l_mark[-1], yystack.l_mark[0]);
+
+                cclsorted = cclsorted && (yystack.l_mark[0] > lastchar);
+                lastchar = yystack.l_mark[0];
+            }
+
+			yyval = yystack.l_mark[-1];
+			}
+break;
+case 69:
+#line 868 "parse.y"
+	{
+			/* Too hard to properly maintain cclsorted. */
+			cclsorted = false;
+			yyval = yystack.l_mark[-1];
+			}
+break;
+case 70:
+#line 875 "parse.y"
+	{
+			cclsorted = true;
+			lastchar = 0;
+			currccl = yyval = cclinit();
+			}
+break;
+case 71:
+#line 883 "parse.y"
+	{ CCL_EXPR(isalnum); }
+break;
+case 72:
+#line 884 "parse.y"
+	{ CCL_EXPR(isalpha); }
+break;
+case 73:
+#line 885 "parse.y"
+	{ CCL_EXPR(IS_BLANK); }
+break;
+case 74:
+#line 886 "parse.y"
+	{ CCL_EXPR(iscntrl); }
+break;
+case 75:
+#line 887 "parse.y"
+	{ CCL_EXPR(isdigit); }
+break;
+case 76:
+#line 888 "parse.y"
+	{ CCL_EXPR(isgraph); }
+break;
+case 77:
+#line 889 "parse.y"
+	{ 
+                          CCL_EXPR(islower);
+                          if (sf_case_ins())
+                              CCL_EXPR(isupper);
+                        }
+break;
+case 78:
+#line 894 "parse.y"
+	{ CCL_EXPR(isprint); }
+break;
+case 79:
+#line 895 "parse.y"
+	{ CCL_EXPR(ispunct); }
+break;
+case 80:
+#line 896 "parse.y"
+	{ CCL_EXPR(isspace); }
+break;
+case 81:
+#line 897 "parse.y"
+	{ CCL_EXPR(isxdigit); }
+break;
+case 82:
+#line 898 "parse.y"
+	{
+                    CCL_EXPR(isupper);
+                    if (sf_case_ins())
+                        CCL_EXPR(islower);
+				}
+break;
+case 83:
+#line 904 "parse.y"
+	{ CCL_NEG_EXPR(isalnum); }
+break;
+case 84:
+#line 905 "parse.y"
+	{ CCL_NEG_EXPR(isalpha); }
+break;
+case 85:
+#line 906 "parse.y"
+	{ CCL_NEG_EXPR(IS_BLANK); }
+break;
+case 86:
+#line 907 "parse.y"
+	{ CCL_NEG_EXPR(iscntrl); }
+break;
+case 87:
+#line 908 "parse.y"
+	{ CCL_NEG_EXPR(isdigit); }
+break;
+case 88:
+#line 909 "parse.y"
+	{ CCL_NEG_EXPR(isgraph); }
+break;
+case 89:
+#line 910 "parse.y"
+	{ CCL_NEG_EXPR(isprint); }
+break;
+case 90:
+#line 911 "parse.y"
+	{ CCL_NEG_EXPR(ispunct); }
+break;
+case 91:
+#line 912 "parse.y"
+	{ CCL_NEG_EXPR(isspace); }
+break;
+case 92:
+#line 913 "parse.y"
+	{ CCL_NEG_EXPR(isxdigit); }
+break;
+case 93:
+#line 914 "parse.y"
+	{ 
+				if ( sf_case_ins() )
+					warn(_("[:^lower:] is ambiguous in case insensitive scanner"));
+				else
+					CCL_NEG_EXPR(islower);
+				}
+break;
+case 94:
+#line 920 "parse.y"
+	{
+				if ( sf_case_ins() )
+					warn(_("[:^upper:] ambiguous in case insensitive scanner"));
+				else
+					CCL_NEG_EXPR(isupper);
+				}
+break;
+case 95:
+#line 929 "parse.y"
+	{
+			if ( yystack.l_mark[0] == nlch )
+				rule_has_nl[num_rules] = true;
+
+			++rulelen;
+
+            if (sf_case_ins() && has_case(yystack.l_mark[0]))
+                yyval = mkor (mkstate(yystack.l_mark[0]), mkstate(reverse_case(yystack.l_mark[0])));
+            else
+                yyval = mkstate (yystack.l_mark[0]);
+
+			yyval = link_machines( yystack.l_mark[-1], yyval);
+			}
+break;
+case 96:
+#line 944 "parse.y"
+	{ yyval = mkstate( SYM_EPSILON ); }
+break;
+#line 1787 "parse.c"
+    }
+    yystack.s_mark -= yym;
+    yystate = *yystack.s_mark;
+    yystack.l_mark -= yym;
+    yym = yylhs[yyn];
+    if (yystate == 0 && yym == 0)
+    {
+#if YYDEBUG
+        if (yydebug)
+            printf("%sdebug: after reduction, shifting from state 0 to\
+ state %d\n", YYPREFIX, YYFINAL);
+#endif
+        yystate = YYFINAL;
+        *++yystack.s_mark = YYFINAL;
+        *++yystack.l_mark = yyval;
+        if (yychar < 0)
+        {
+            if ((yychar = YYLEX) < 0) yychar = 0;
+#if YYDEBUG
+            if (yydebug)
+            {
+                yys = 0;
+                if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
+                if (!yys) yys = "illegal-symbol";
+                printf("%sdebug: state %d, reading %d (%s)\n",
+                        YYPREFIX, YYFINAL, yychar, yys);
+            }
+#endif
+        }
+        if (yychar == 0) goto yyaccept;
+        goto yyloop;
+    }
+    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
+            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
+        yystate = yytable[yyn];
+    else
+        yystate = yydgoto[yym];
+#if YYDEBUG
+    if (yydebug)
+        printf("%sdebug: after reduction, shifting from state %d \
+to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
+#endif
+    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
+    {
+        goto yyoverflow;
+    }
+    *++yystack.s_mark = (short) yystate;
+    *++yystack.l_mark = yyval;
+    goto yyloop;
+
+yyoverflow:
+    yyerror("yacc stack overflow");
+
+yyabort:
+    yyfreestack(&yystack);
+    return (1);
+
+yyaccept:
+    yyfreestack(&yystack);
+    return (0);
+}
diff --git a/usr.bin/lex/initparse.h b/usr.bin/lex/initparse.h
new file mode 100644
index 0000000..6ede604
--- /dev/null
+++ b/usr.bin/lex/initparse.h
@@ -0,0 +1,46 @@
+/* $FreeBSD$ */
+#define CHAR 257
+#define NUMBER 258
+#define SECTEND 259
+#define SCDECL 260
+#define XSCDECL 261
+#define NAME 262
+#define PREVCCL 263
+#define EOF_OP 264
+#define OPTION_OP 265
+#define OPT_OUTFILE 266
+#define OPT_PREFIX 267
+#define OPT_YYCLASS 268
+#define OPT_HEADER 269
+#define OPT_EXTRA_TYPE 270
+#define OPT_TABLES 271
+#define CCE_ALNUM 272
+#define CCE_ALPHA 273
+#define CCE_BLANK 274
+#define CCE_CNTRL 275
+#define CCE_DIGIT 276
+#define CCE_GRAPH 277
+#define CCE_LOWER 278
+#define CCE_PRINT 279
+#define CCE_PUNCT 280
+#define CCE_SPACE 281
+#define CCE_UPPER 282
+#define CCE_XDIGIT 283
+#define CCE_NEG_ALNUM 284
+#define CCE_NEG_ALPHA 285
+#define CCE_NEG_BLANK 286
+#define CCE_NEG_CNTRL 287
+#define CCE_NEG_DIGIT 288
+#define CCE_NEG_GRAPH 289
+#define CCE_NEG_LOWER 290
+#define CCE_NEG_PRINT 291
+#define CCE_NEG_PUNCT 292
+#define CCE_NEG_SPACE 293
+#define CCE_NEG_UPPER 294
+#define CCE_NEG_XDIGIT 295
+#define CCL_OP_DIFF 296
+#define CCL_OP_UNION 297
+#define BEGIN_REPEAT_POSIX 298
+#define END_REPEAT_POSIX 299
+#define BEGIN_REPEAT_FLEX 300
+#define END_REPEAT_FLEX 301
diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c
index 7620c52..d7391ba 100644
--- a/usr.bin/lex/initscan.c
+++ b/usr.bin/lex/initscan.c
@@ -1,76 +1,125 @@
-#line 2 "scan.c"
+/* $FreeBSD$ */
+
+#line 3 "<stdout>"
+
+#define  YY_INT_ALIGNED short int
+
 /* A lexical scanner generated by flex */
 
-/* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
- * $FreeBSD$
- */
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 37
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
 
 #if defined(__FreeBSD__)
+#ifndef __STDC_LIMIT_MACROS
+#define	__STDC_LIMIT_MACROS
+#endif
 #include <sys/cdefs.h>
+#include <stdint.h>
 #else
-#define __unused
-#define __dead2
+#define	__dead2
 #endif
 
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-
+/* begin standard C headers. */
 #include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 
+/* end standard C headers. */
 
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined(__FreeBSD__) || \
+    (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
 #endif
 
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
 
-#ifdef __cplusplus
+#endif /* ! C99 */
 
-#include <stdlib.h>
-#include <unistd.h>
+#endif /* ! FLEXINT_H */
 
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
+#ifdef __cplusplus
 
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
 #else	/* ! __cplusplus */
 
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
 
-#define YY_USE_PROTOS
 #define YY_USE_CONST
 
-#endif	/* __STDC__ */
+#endif	/* defined (__STDC__) */
 #endif	/* ! __cplusplus */
 
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -85,71 +134,70 @@
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN yy_start = 1 + 2 *
+#define BEGIN (yy_start) = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START ((yy_start - 1) / 2)
+#define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
+#define YY_NEW_FILE yyrestart(yyin  )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE 16384
+#endif
 
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t yyleng;
 
-extern int yyleng;
 extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
 		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, yytext_ptr )
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-typedef unsigned int yy_size_t;
-
+#define unput(c) yyunput( c, (yytext_ptr)  )
 
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -165,7 +213,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	int yy_n_chars;
+	yy_size_t yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -186,12 +234,16 @@ struct yy_buffer_state
 	 */
 	int yy_at_bol;
 
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
 	int yy_fill_buffer;
 
 	int yy_buffer_status;
+
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
 	/* When an EOF's been seen but there's still some text to process
@@ -205,28 +257,39 @@ struct yy_buffer_state
 	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
+
 	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-static YY_BUFFER_STATE yy_current_buffer = 0;
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER yy_current_buffer
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+#define yy_current_buffer YY_CURRENT_BUFFER
 
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
+static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t yyleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
+static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
 /* Flag which is used to allow yywrap()'s to do buffer switches
@@ -234,169 +297,373 @@ static int yy_start = 0;	/* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart YY_PROTO(( FILE *input_file ));
+void yyrestart (FILE *input_file  );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
+void yy_delete_buffer (YY_BUFFER_STATE b  );
+void yy_flush_buffer (YY_BUFFER_STATE b  );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state (void );
 
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
+static void yyensure_buffer_stack (void );
+static void yy_load_buffer_state (void );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
 
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) __unused;
-static void yy_flex_free YY_PROTO(( void * ));
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
+
+void *yyalloc (yy_size_t  );
+void *yyrealloc (void *,yy_size_t  );
+void yyfree (void *  );
 
 #define yy_new_buffer yy_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
+	if ( ! YY_CURRENT_BUFFER ){\
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
 
 typedef unsigned char YY_CHAR;
+
 FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
 typedef int yy_state_type;
+
+extern int yylineno;
+
+int yylineno = 1;
+
 extern char *yytext;
 #define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] )) __dead2;
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  ) __dead2;
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
+	(yytext_ptr) = yy_bp; \
+	(yytext_ptr) -= (yy_more_len); \
+	yyleng = (size_t) (yy_cp - (yytext_ptr)); \
+	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
+	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 165
-#define YY_END_OF_BUFFER 166
-static yyconst short int yy_accept[769] =
+#define YY_NUM_RULES 251
+#define YY_END_OF_BUFFER 252
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_acclist[1223] =
     {   0,
-        0,    0,    0,    0,   87,   87,  163,  163,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  166,  164,
-        7,   18,  164,   16,    1,   17,  164,  164,  164,  164,
-       15,  108,  100,  101,  108,   93,  108,  107,  108,  108,
-      108,  107,   99,   89,  108,  108,   91,   92,   87,   88,
-       87,   86,   85,   86,   86,  163,  163,   28,   29,   28,
-       28,   28,   28,   28,   28,   31,   30,   32,   31,  113,
-      109,  110,  112,  114,  141,  142,  141,  139,  138,  140,
-
-      115,  117,  115,  116,  115,  120,  120,  120,  120,  122,
-      124,  122,  122,  122,  122,  123,  151,  155,  151,  154,
-      156,  156,  152,  152,  152,  149,  150,  164,   82,  164,
-       21,   22,   21,   20,  157,  159,  157,  160,  161,  147,
-      147,  148,  147,  147,  147,  147,  147,  147,  147,   81,
-       34,   33,   81,   81,   81,   81,   35,   81,   81,   81,
-       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
-       81,   81,   81,   81,   81,   81,   26,   23,   26,   24,
-        7,   18,    0,   16,    1,   17,    0,    0,    0,   14,
-        8,    0,    0,    0,    0,    4,    5,    0,    2,   15,
-
-      100,  101,    0,    0,    0,   95,    0,    0,  105,  105,
-        0,  162,  162,  162,   94,    0,   99,   89,    0,    0,
-        0,   91,   92,  104,   90,    0,   87,   88,   86,   85,
-       85,   83,   84,  163,  163,   28,   29,   28,   28,   28,
-       28,   31,   30,   32,  111,  112,  142,  138,  117,    0,
-      118,  119,  124,  121,  151,  155,    0,  153,    0,  144,
-      152,  152,  152,    0,   82,    0,   21,   22,   21,   19,
-      157,  159,  158,  147,  147,  147,  148,  143,  147,  147,
-      147,   34,   33,    0,   80,    0,    0,   81,   81,   81,
-       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
-
-       81,   81,   81,   36,   81,   81,   81,   81,   81,   81,
-       81,   81,   81,   81,    0,   25,   24,    0,   14,    8,
-        0,   12,    0,    0,    0,    0,    0,    4,    5,    0,
-        6,    0,   96,    0,   97,    0,    0,  105,  105,    0,
-      105,  105,  105,  162,  162,    0,  106,   90,   98,    0,
-      104,    0,   83,   84,   28,   28,   28,   27,   28,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  152,  152,  143,  143,  147,  147,    0,    0,   81,
-       81,   81,   81,   81,   44,   81,   81,   81,   49,   81,
-       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
-
-       81,   81,   81,   81,   81,   81,   81,   81,    0,   81,
-       81,   81,   81,    0,    0,    0,   12,    0,    0,    0,
-        0,    0,    0,    4,    5,    0,  105,  105,  105,  105,
-      105,  105,  162,    0,    0,   28,   28,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      152,  152,  147,  147,   37,   38,   81,   81,   81,   81,
-       81,   81,   81,   81,   50,   51,   81,   81,   81,   55,
-       81,   81,   81,   81,   81,   81,   60,   81,   81,   81,
-       81,   81,   81,   67,    0,    0,    0,   81,   81,   81,
-       81,    0,   13,    0,    0,    0,    0,    0,    0,  105,
-
-      105,  105,  105,  105,  105,    0,    0,   28,   28,  137,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  152,  152,  147,  147,   39,   81,   41,   81,
-       43,   81,   81,   81,   47,   81,   52,   81,   81,   81,
-       81,   81,   81,   81,   81,   81,   62,   81,   81,   65,
-       81,    0,    0,    0,    0,   81,   81,   81,   81,    3,
-        0,    0,    0,    0,  105,  105,  105,    0,    0,   28,
-       28,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  145,  146,  145,  146,   81,   42,   81,
-       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
-
-       81,   78,   61,   81,   64,   81,    0,    0,    0,    0,
-       81,   81,   69,   70,    0,   10,    0,   11,    0,  103,
-        0,  102,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   81,   81,   81,   45,   81,   48,
-       81,   81,   81,   81,   77,   81,   59,   63,   66,    0,
-        0,    0,    0,   79,   81,    0,  102,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,   81,
-       81,   81,   46,   81,   81,   56,   81,   81,    0,    0,
-        0,    0,   68,    0,    9,    0,  125,  126,  127,  128,
-      129,  130,  131,  132,  133,  134,  135,    0,   81,   81,
-
-       81,   81,   81,   81,   81,    0,    0,    0,    0,    0,
-      136,   81,   81,   81,   81,   54,   81,   81,    0,    0,
-        0,    0,    0,    0,   81,   81,   81,   53,   81,   58,
-        0,    0,    0,    0,    0,    0,   81,   81,   81,   81,
-       72,    0,    0,    0,    0,   73,   81,   81,   81,   81,
-       71,    0,   75,    0,   81,   81,   81,   74,   76,   81,
-       81,   81,   81,   81,   81,   57,   40,    0
+      248,  248,  252,  250,  251,    9,  250,  251,   20,  250,
+      251,  250,  251,   18,  250,  251,    1,    9,  250,  251,
+       19,   20,  250,  251,  250,  251,  250,  251,  250,  251,
+      250,  251,   17,   18,  250,  251,  164,  250,  251,  149,
+      164,  250,  251,  150,  250,  251,  164,  250,  251,  142,
+      164,  250,  251,  164,  250,  251,  161,  163,  164,  250,
+      251,  162,  163,  164,  250,  251,  163,  164,  250,  251,
+      163,  164,  250,  251,  164,  250,  251,  164,  250,  251,
+      164,  250,  251,  163,  164,  250,  251,  148,  149,  164,
+      250,  251,  138,  150,  250,  251,  164,  250,  251,  164,
+
+      250,  251,  140,  164,  250,  251,  141,  164,  250,  251,
+      136,  250,  251,  137,  250,  251,  136,  250,  251,  135,
+      136,  250,  251,  134,  136,  250,  251,  135,  136,  250,
+      251,  248,  249,  250,  251,  248,  249,  250,  251,  249,
+      250,  251,  249,  250,  251,   41,  250,  251,   42,  250,
+      251,   41,  250,  251,   41,  250,  251,   41,  250,  251,
+       41,  250,  251,   41,  250,  251,   41,  250,  251,   50,
+      250,  251,   49,  250,  251,   51,  250,  251,  250,  251,
+      170,  250,  251,  170,  250,  251,  165,  250,  251,  170,
+      250,  251,  166,  170,  250,  251,  167,  170,  250,  251,
+
+      169,  170,  250,  251,  171,  250,  251,  219,  250,  251,
+      220,  250,  251,  219,  250,  251,  217,  219,  250,  251,
+      216,  219,  250,  251,  218,  219,  250,  251,  172,  250,
+      251,  174,  250,  251,  172,  250,  251,  173,  250,  251,
+      172,  250,  251,  186,  250,  251,  186,  250,  251,  186,
+      250,  251,  186,  250,  251,  188,  190,  250,  251,  190,
+      250,  251,  188,  190,  250,  251,  188,  190,  250,  251,
+      188,  190,  250,  251,  188,  190,  250,  251,  189,  190,
+      250,  251,  233,  239,  250,  251,  238,  250,  251,  233,
+      239,  250,  251,  237,  239,  250,  251,  239,  250,  251,
+
+      239,  250,  251,  235,  239,  250,  251,  235,  239,  250,
+      251,  235,  239,  250,  251,  234,  239,  250,  251,  234,
+      239,  250,  251,  229,  239,  250,  251,  230,  239,  250,
+      251,  250,  251,  131,  250,  251,  250,  251,   25,  250,
+      251,   26,  250,  251,   25,  250,  251,   22,  250,  251,
+       25,  250,  251,   25,  250,  251,  240,  244,  250,  251,
+      242,  250,  251,  240,  244,  250,  251,  243,  244,  250,
+      251,  244,  250,  251,  227,  250,  251,  227,  250,  251,
+      228,  250,  251,  227,  250,  251,  227,  250,  251,  227,
+      250,  251,  227,  250,  251,  227,  250,  251,  227,  250,
+
+      251,  227,  250,  251,  130,  250,  251,   53,  130,  250,
+      251,   52,  250,  251,  130,  250,  251,  130,  250,  251,
+      130,  250,  251,  130,  250,  251,   54,  130,  250,  251,
+      130,  250,  251,  130,  250,  251,  130,  250,  251,  130,
+      250,  251,  130,  250,  251,  130,  250,  251,  130,  250,
+      251,  130,  250,  251,  130,  250,  251,  130,  250,  251,
+      130,  250,  251,  130,  250,  251,  130,  250,  251,  130,
+      250,  251,  130,  250,  251,  130,  250,  251,  130,  250,
+      251,  130,  250,  251,  130,  250,  251,  130,  250,  251,
+      130,  250,  251,   37,  250,  251,   34,  250,  251,   37,
+
+      250,  251,   35,   37,  250,  251,   48,  250,  251,   45,
+      250,  251,  250,  251,   48,  250,  251,   48,  250,  251,
+       44,  250,  251,   43,  250,  251,  176,  250,  251,  175,
+      250,  251,  177,  250,  251,  178,  250,  251,  179,  250,
+      251,  180,  250,  251,  181,  250,  251,  182,  250,  251,
+      183,  250,  251,   32,  250,  251,   33,  250,  251,   32,
+      250,  251,   31,  250,  251,   29,  250,  251,   30,  250,
+      251,   29,  250,  251,   28,  250,  251,    9,   20,   18,
+        1,    9,   19,   20,   16,   10,   16,    4,   16,    5,
+        2,   17,   18,  149,  150,  144,  160,  158,  154,  154,
+
+      245,  245,  245,  143,  148,  149,  138,  150,  140,  141,
+      153,  139,  137,  135,  134,  134,  132,  135,  133,  135,
+      248,  248,  246,  247,   42,   39,   40,   50,   49,   51,
+      165,  165,  168,  169,  220,  216,  174,  184,  185,  190,
+      187,  233,  238,  236,  222,  235,  235,  235,  231,  232,
+      131,   26,   21,   23,   24,  240,  242,  241,  228,  221,
+      225,  226,   53,   52,  129,  130,  130,  130,  130,  130,
+      130,  130,  130,  130,  130,  130,  130,  130,  130,  130,
+      130,  130,  130,  130,  130,   55,  130,  130,  130,  130,
+      130,  130,  130,  130,  130,  130,  130,   36,   35,   45,
+
+       46,   47,   32,   33,   30,   27,   16,   10,   16,   14,
+        4,   16,    5,    6,  145,  146,  159,  154,  154,  154,
+      154,  154,  245,  245,  156,  155,  157,  139,  145,  147,
+      153,  132,  135,  133,  135,   38,  235,  235,  221,  130,
+      130,  130,  130,  130,  130,  130,   67,  130,  130,  130,
+      130,   72,  130,  130,  130,  130,  130,  130,  130,  130,
+      130,  130,  130,  130,  130,  130,  130,  130,  130,  130,
+      130,  130,  130,  130,  130,  130,  130,  130,  130,  130,
+      130,  130,  130,  130,  130,  130,  130,   14,   15,    4,
+        8,   16,    5,  154,  154,  154,  154,  154,  154,  154,
+
+      245,  157,  235,  235,   56,   57,  130,  130,  130,  130,
+      130,  130,  130,  130,  130,  130,  130,   73,  130,   74,
+      130,  130,  130,  130,  130,   79,  130,  130,  130,  130,
+      130,  130,  130,  130,   84,  130,  130,  130,  130,  130,
+      130,  130,  130,  130,  130,   93,  130,  130,  130,  130,
+      130,  130,  130,  130,  130,  130,   15,    8,   16,    8,
+       16,    8,   16,  154,  154,  154,  154,  154,  154,  154,
+      215,  235,  235,   58,  130,  130,  130,   60,  130,  130,
+       64,  130,  130,  130,  130,  130,   70,  130,  130,  130,
+      130,   75,  130,  130,  130,  130,  130,  130,  130,  130,
+
+      130,  130,  130,  130,   87,  130,  130,  130,  130,  130,
+       91,  130,  130,  130,  130,  130,  130,  130,  130,  130,
+      130,  130,    3,    8,   16,    7,    8,   16,  154,  154,
+      154,  223,  224,  223,  235,  224,  235,  130,  130,  130,
+       63,  130,  130,  130,  130,  130,  130,  130,  130,  126,
+      130,  130,  130,  130,  130,  130,  130,  130,  130,  124,
+      130,  130,   86,  130,  130,   89,  130,  130,   90,  130,
+      130,  130,  130,  105,  130,  130,   95,  130,  130,   96,
+      130,   12,   13,  152,  151,  152,  130,  130,  130,  130,
+      130,  130,  130,   68,  130,  130,   71,  130,  130,  130,
+
+      130,  130,  130,  130,  123,  130,  130,   83,  130,  130,
+      130,   88,  130,  130,   92,  130,  103,  130,  125,  130,
+      130,  130,  151,  130,  130,  130,  130,  130,  130,  130,
+       69,  130,  130,  130,  130,  130,   80,  130,  130,  130,
+      130,  130,  130,  130,  114,   94,  130,  130,  115,   11,
+      191,  215,  192,  215,  193,  215,  194,  215,  195,  215,
+      196,  215,  197,  215,  198,  215,  199,  215,  200,  215,
+      201,  215,  130,  130,  130,  130,  130,  130,  130,  130,
+      130,  130,  130,  130,  130,  130,   85,  130,  130,  130,
+      116,  104,  130,  117,  202,  215,  203,  215,  204,  215,
+
+      205,  215,  206,  215,  207,  215,  208,  215,  209,  215,
+      210,  215,  211,  215,  212,  215,  213,  215,  130,  130,
+      130,  130,  130,  130,  130,  122,  130,  130,  130,   77,
+      130,  130,  130,  130,  130,  130,  110,  120,  118,  111,
+      121,  119,  214,  215,  130,  130,  130,  130,  130,  130,
+      130,  126,  130,   76,  130,  130,   82,  130,  130,  127,
+      130,  130,  106,  108,  107,  109,  130,  130,  130,   65,
+      130,  130,  130,  130,  130,   78,  130,  130,  112,  113,
+       98,   99,  130,  130,  130,  130,  130,  130,  130,  128,
+      130,   97,  101,  130,  130,  130,  130,  130,   68,  130,
+
+      130,  100,  102,  130,  130,   62,  130,   66,  130,  130,
+      130,  130,   61,  130,   69,  130,  130,  130,   81,  130,
+       59,  130
     } ;
 
-static yyconst int yy_ec[256] =
+static yyconst flex_int16_t yy_accept[1108] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    2,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    4,
+        6,    9,   12,   14,   17,   21,   25,   27,   29,   31,
+       33,   37,   40,   44,   47,   50,   54,   57,   62,   67,
+       71,   75,   78,   81,   84,   88,   93,   97,  100,  103,
+      107,  111,  114,  117,  120,  124,  128,  132,  136,  140,
+      143,  146,  149,  152,  155,  158,  161,  164,  167,  170,
+
+      173,  176,  179,  181,  184,  187,  190,  193,  197,  201,
+      205,  208,  211,  214,  217,  221,  225,  229,  232,  235,
+      238,  241,  244,  247,  250,  253,  256,  260,  263,  267,
+      271,  275,  279,  283,  287,  290,  294,  298,  301,  304,
+      308,  312,  316,  320,  324,  328,  332,  334,  337,  339,
+      342,  345,  348,  351,  354,  357,  361,  364,  368,  372,
+      375,  378,  381,  384,  387,  390,  393,  396,  399,  402,
+      405,  408,  412,  415,  418,  421,  424,  427,  431,  434,
+      437,  440,  443,  446,  449,  452,  455,  458,  461,  464,
+      467,  470,  473,  476,  479,  482,  485,  488,  491,  494,
+
+      497,  500,  503,  507,  510,  513,  515,  518,  521,  524,
+      527,  530,  533,  536,  539,  542,  545,  548,  551,  554,
+      557,  560,  563,  566,  569,  572,  575,  578,  579,  580,
+      580,  581,  583,  585,  585,  585,  585,  586,  588,  588,
+      588,  588,  588,  589,  590,  591,  591,  592,  594,  595,
+      596,  596,  596,  596,  597,  597,  598,  599,  599,  600,
+      601,  601,  602,  603,  604,  604,  604,  605,  605,  607,
+      609,  609,  609,  609,  610,  611,  612,  613,  613,  614,
+      615,  616,  617,  619,  621,  622,  623,  624,  625,  626,
+      626,  626,  627,  628,  628,  629,  630,  631,  631,  632,
+
+      632,  633,  634,  635,  636,  637,  638,  638,  639,  640,
+      641,  642,  643,  644,  644,  645,  645,  646,  647,  648,
+      649,  650,  651,  651,  652,  652,  653,  654,  655,  656,
+      657,  658,  659,  659,  659,  660,  661,  662,  663,  664,
+      665,  665,  666,  666,  666,  667,  668,  669,  670,  671,
+      672,  673,  674,  675,  676,  677,  678,  679,  680,  681,
+      682,  683,  684,  685,  686,  687,  688,  689,  690,  691,
+      692,  693,  694,  695,  696,  697,  698,  698,  699,  700,
+      701,  702,  703,  704,  705,  706,  707,  707,  708,  710,
+      710,  711,  711,  711,  711,  711,  711,  712,  713,  714,
+
+      714,  715,  715,  716,  716,  717,  717,  718,  718,  719,
+      720,  720,  721,  722,  723,  724,  725,  726,  727,  727,
+      728,  730,  731,  731,  732,  732,  734,  736,  736,  736,
+      736,  737,  737,  737,  737,  737,  737,  737,  737,  737,
+      737,  737,  737,  737,  737,  738,  739,  740,  740,  740,
+      741,  742,  743,  744,  745,  746,  747,  749,  750,  751,
+      752,  754,  755,  756,  757,  758,  759,  760,  761,  762,
+      763,  764,  765,  766,  767,  768,  769,  770,  771,  772,
+      773,  774,  775,  776,  777,  778,  779,  780,  781,  782,
+      783,  784,  785,  786,  787,  788,  788,  788,  788,  788,
+
+      790,  790,  790,  790,  790,  790,  790,  791,  793,  794,
+      794,  795,  796,  797,  798,  799,  800,  801,  802,  803,
+      803,  803,  803,  803,  803,  803,  803,  803,  803,  803,
+      803,  803,  803,  803,  803,  803,  803,  803,  803,  803,
+      803,  803,  803,  803,  803,  803,  804,  805,  806,  807,
+      808,  809,  810,  811,  812,  813,  814,  815,  816,  817,
+      818,  820,  822,  823,  824,  825,  826,  828,  829,  830,
+      831,  832,  833,  834,  835,  837,  838,  839,  840,  841,
+      842,  843,  844,  845,  846,  848,  849,  850,  851,  852,
+      853,  854,  855,  856,  857,  857,  857,  857,  857,  858,
+
+      858,  858,  858,  858,  858,  860,  862,  864,  864,  865,
+      866,  867,  868,  869,  870,  871,  871,  871,  871,  871,
+      872,  872,  872,  872,  872,  872,  872,  872,  872,  872,
+      872,  872,  872,  872,  872,  872,  872,  872,  872,  872,
+      872,  872,  872,  872,  873,  874,  876,  877,  878,  880,
+      881,  883,  884,  885,  886,  887,  889,  890,  891,  892,
+      894,  895,  896,  897,  898,  899,  900,  901,  902,  903,
+      904,  905,  907,  908,  909,  910,  911,  913,  914,  915,
+      916,  917,  918,  919,  920,  921,  922,  923,  923,  923,
+      923,  923,  924,  924,  924,  924,  926,  927,  929,  929,
+
+      930,  931,  932,  932,  932,  933,  934,  934,  934,  934,
+      934,  934,  934,  934,  934,  934,  934,  934,  934,  934,
+      934,  934,  934,  934,  934,  934,  934,  934,  934,  934,
+      934,  936,  938,  939,  940,  941,  943,  944,  945,  946,
+      947,  948,  949,  950,  952,  953,  954,  955,  956,  957,
+      958,  959,  960,  962,  963,  965,  966,  968,  969,  971,
+      972,  973,  974,  976,  976,  977,  979,  980,  980,  982,
+      982,  982,  982,  982,  982,  983,  983,  984,  984,  985,
+      985,  987,  987,  987,  987,  987,  987,  987,  987,  987,
+      987,  987,  987,  987,  987,  987,  987,  987,  987,  987,
+
+      987,  987,  987,  987,  987,  987,  988,  989,  990,  991,
+      992,  993,  994,  996,  997,  999, 1000, 1001, 1002, 1003,
+     1004, 1005, 1007, 1008, 1010, 1011, 1012, 1014, 1015, 1017,
+     1019, 1021, 1021, 1021, 1021, 1021, 1021, 1021, 1022, 1023,
+     1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
+     1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024,
+     1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024,
+     1024, 1024, 1024, 1024, 1024, 1025, 1026, 1027, 1028, 1029,
+     1030, 1031, 1033, 1034, 1035, 1036, 1037, 1039, 1040, 1041,
+     1042, 1043, 1044, 1045, 1045, 1045, 1046, 1046, 1046, 1046,
+
+     1046, 1046, 1046, 1048, 1049, 1049, 1049, 1050, 1050, 1050,
+     1050, 1050, 1050, 1050, 1050, 1050, 1050, 1051, 1051, 1053,
+     1055, 1057, 1059, 1061, 1063, 1065, 1067, 1069, 1071, 1073,
+     1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073,
+     1073, 1073, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080,
+     1081, 1082, 1083, 1084, 1085, 1086, 1087, 1089, 1090, 1091,
+     1091, 1091, 1091, 1091, 1091, 1091, 1092, 1092, 1094, 1094,
+     1094, 1094, 1094, 1094, 1095, 1095, 1095, 1095, 1095, 1095,
+     1097, 1099, 1101, 1103, 1105, 1107, 1109, 1111, 1113, 1115,
+     1117, 1119, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126,
+
+     1128, 1129, 1130, 1132, 1133, 1134, 1135, 1136, 1137, 1137,
+     1137, 1138, 1138, 1139, 1140, 1141, 1141, 1141, 1141, 1142,
+     1143, 1143, 1143, 1143, 1143, 1143, 1143, 1145, 1146, 1147,
+     1148, 1149, 1150, 1151, 1152, 1154, 1156, 1157, 1159, 1160,
+     1162, 1163, 1164, 1165, 1165, 1166, 1167, 1167, 1167, 1167,
+     1167, 1167, 1167, 1167, 1168, 1169, 1170, 1172, 1173, 1174,
+     1175, 1176, 1178, 1179, 1180, 1181, 1182, 1182, 1182, 1182,
+     1182, 1183, 1184, 1185, 1186, 1187, 1188, 1189, 1190, 1192,
+     1193, 1193, 1194, 1194, 1195, 1196, 1197, 1198, 1199, 1201,
+     1202, 1203, 1204, 1205, 1206, 1208, 1210, 1211, 1212, 1213,
+
+     1215, 1217, 1218, 1219, 1221, 1223, 1223
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
+        4,    4,    5,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    5,    6,    7,    8,    1,    9,   10,
-       10,   11,   12,   13,   14,   10,   15,   16,   16,   16,
-       16,   16,   16,   16,   17,   18,   19,   20,    1,   21,
-       22,   23,   10,    1,   31,   32,   33,   34,   35,   36,
-       37,   38,   39,   40,   41,   42,   43,   44,   45,   46,
-       47,   48,   49,   50,   51,   52,   53,   54,   55,   47,
-       26,   27,   28,   29,   30,    1,   31,   32,   33,   34,
-
-       35,   36,   37,   38,   39,   40,   41,   42,   43,   44,
-       45,   46,   47,   48,   49,   50,   51,   52,   53,   54,
-       55,   47,   56,   57,   58,    1,    1,    1,    1,    1,
+        1,    2,    1,    6,    7,    8,    9,    1,   10,   11,
+       12,   13,   14,   15,   16,   17,   18,   19,   19,   19,
+       19,   19,   19,   19,   20,   21,   22,   23,    1,   24,
+       25,   26,   27,    1,   28,   29,   30,   31,   32,   33,
+       34,   35,   36,   37,   38,   39,   40,   41,   42,   43,
+       44,   45,   46,   47,   48,   49,   50,   51,   52,   44,
+       53,   54,   55,   56,   57,    1,   58,   59,   60,   61,
+
+       62,   63,   64,   65,   66,   67,   68,   69,   70,   71,
+       72,   73,   44,   74,   75,   76,   77,   78,   79,   80,
+       81,   44,   82,   83,   84,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -413,876 +680,1250 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[59] =
+static yyconst flex_int32_t yy_meta[85] =
     {   0,
-        1,    1,    2,    1,    3,    1,    1,    1,    4,    1,
-        5,    6,    1,    7,    4,    8,    8,    8,    8,    1,
-        1,    1,    1,    9,   10,    1,   11,   12,    1,   13,
-       14,   14,   14,   14,   14,   14,   15,   15,   15,   15,
-       15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
-       15,   15,   15,   15,   15,    4,    1,   16
+        1,    1,    2,    1,    3,    4,    1,    1,    1,    5,
+        1,    6,    1,    7,    1,    8,    1,    5,    9,    9,
+        9,    9,   10,    1,    1,    1,    1,   11,   11,   11,
+       11,   11,   11,   12,   12,   12,   12,   12,   12,   12,
+       12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
+       12,   12,   13,   14,   15,    1,   16,   11,   11,   11,
+       11,   11,   11,   12,   12,   12,   12,   12,   12,   12,
+       12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
+       12,    5,    1,   17
     } ;
 
-static yyconst short int yy_base[858] =
+static yyconst flex_int16_t yy_base[1201] =
     {   0,
-        0,   58,  115,  172,  120,  129, 2712, 2711,  230, 2705,
-      136,  141,  288,    0, 2683, 2682,  144,  151,  185,  191,
-      178,  188,  344,  347,  375,    0,  125,  131,  147,  216,
-      431,  434,  461,    0,  519,    0,  205,  349, 2710, 2716,
-      353, 2716, 2706,    0,  360, 2716, 2705,  144,  570, 2696,
-        0, 2716,  577, 2716, 2703, 2716,  438, 2716, 2684,  126,
-      149,  427,  591, 2716, 2701,  141, 2682, 2716,    0, 2716,
-     2699,    0, 2699, 2697,  155, 2696, 2716,    0, 2716, 2695,
-     2716,    0, 2662, 2641, 2637,    0, 2692, 2716, 2690, 2716,
-     2716, 2663,    0, 2716, 2716, 2716, 2688, 2716,  431, 2716,
-
-     2716, 2716, 2687, 2716,  567, 2716, 2669,  571,  164, 2716,
-     2716, 2685,    0, 2667,  573, 2716,    0, 2716, 2683, 2716,
-      573, 2674,    0, 2649, 2628, 2716, 2716,  222, 2716,  356,
-      448, 2716,  450, 2667,    0, 2716, 2678, 2716,    0,    0,
-      198, 2716, 2677, 2621, 2716, 2667,    0, 2642, 2621, 2716,
-     2673, 2716, 2671, 2668, 2640, 2639, 2716,  544, 2639,  579,
-     2634, 2635,  318,    0, 2623, 2631,  424,  562, 2614,  587,
-     2629, 2613, 2618, 2626, 2629, 2604, 2716, 2716, 2653,  612,
-      634, 2716, 2654,    0,  637, 2716, 2653,  600, 2616,    0,
-        0,  641,  647,  651,  669,    0,    0,  453, 2716,    0,
-
-      672, 2716, 2651, 2597,  605, 2716, 2649, 2616,  620,  657,
-      645, 2716,  662,    0, 2716, 2592,  688, 2716, 2646, 2592,
-     2636, 2625, 2716,    0, 2716, 2610,    0, 2716,    0,    0,
-     2642,    0,    0, 2640, 2716,    0, 2716,    0, 2602, 2598,
-      745,    0, 2638, 2716, 2716,    0, 2716,  688, 2716,  773,
-     2716, 2716, 2716, 2716,    0, 2716,  673, 2716,    0, 2716,
-        0, 2599, 2595,  690, 2716,  698,  707, 2716,  709, 2716,
-        0, 2716, 2716,    0,  596, 2579, 2716,  827,    0, 2596,
-     2592, 2632, 2716, 2628, 2716, 2593, 2592,    0,  642, 2582,
-      563, 2617, 2579,  620, 2578, 2577, 2583,  669, 2570, 2584,
-
-     2572,    0, 2569, 2716, 2570, 2571, 2579, 2582,  685,  125,
-     2570, 2567, 2566,  688, 2608, 2716,  716, 2568,    0,    0,
-      720, 2716, 2608,  884, 2562, 2559, 2569,    0,    0,  723,
-     2716,  739, 2716,  805, 2716,  808, 2562,  787,  869,  876,
-      930,  881,  973,  800,    0, 2548, 2716, 2716, 2716, 2570,
-        0, 2559,    0,    0, 2568, 2557,    0, 2716,    0, 1009,
-     2581,  678,  870,  871,  874,  879,  913,  992,  974, 1013,
-      885, 2565, 2554,    0, 1067, 2563, 2552, 2546, 2545, 2557,
-     2562, 2561, 2550, 2557,    0, 2554, 2537, 2556,    0, 2536,
-     2543, 2533, 2548, 2568, 2537, 2549, 2544, 2542, 2541, 2532,
-
-     2539, 2540, 2538, 2539,  578, 2520, 2538, 2525,  860, 2526,
-     2528, 2521, 2517, 2529,  817, 1044, 2716,  822, 1095,  914,
-     2532, 2523, 2517,    0,    0, 2524, 1102, 1025, 1142, 2539,
-     1028, 1163, 2716, 2513, 2521, 2523, 2507,    0, 2526, 1058,
-      891, 1014, 1019,  894, 1038, 1080, 1072, 1086, 1083, 1081,
-     2520, 2504, 2518, 2502, 2716, 2716, 2505, 2493, 2492, 2495,
-     2507, 1148, 2507, 2492,    0,    0, 2492, 2493, 2507,    0,
-     2525, 2490, 2498, 2522, 2485, 2495,    0, 2500, 2491, 2487,
-     2479, 2479, 2483,    0,  875, 2494, 2481, 2494, 2480, 2475,
-     2491, 2519, 2716,  920,  999, 2465, 2474, 2468, 2494, 2496,
-
-     1105, 1184, 1081,  902,  969, 2479, 2491, 2463, 2477, 2716,
-      165, 1090, 1144, 1143, 1147, 1163, 1095, 1145, 1037, 1085,
-     1150, 1173, 2461, 2475, 2459, 2473,    0, 2458,    0, 2460,
-        0, 1165, 2454, 2469,    0, 2461,    0, 2471, 2410, 2414,
-     2434, 2400, 2393, 2405, 2385, 2382,    0, 2383, 2335,    0,
-     2335, 2330, 2326, 2309, 2278, 2259, 2269, 2268, 2256, 2297,
-     1046, 2238, 2242, 2253, 1179, 1142, 1145, 2247, 2246,    0,
-        0, 1191, 1192, 1172, 1201, 1202, 1204, 1205, 1206, 1207,
-     1209, 1210, 1208,    0,    0,    0,    0, 2254,    0, 2221,
-     2229, 2218, 2208, 2200, 2209, 2198, 2195, 2165, 2168, 2149,
-
-     2132,    0,    0, 2129,    0, 2139, 2143, 2134, 2124, 2137,
-     2117, 2116,    0,    0, 1228, 2716, 1232, 2716, 2111, 2716,
-     2117, 2716, 2115, 2114, 2108, 2107, 2106, 2103, 2102, 2098,
-     2095, 2063, 2047, 1213, 2012, 1986, 1975,    0, 1954,    0,
-     1947, 1950, 1941, 1945,    0, 1942,    0,    0,    0, 1938,
-     1940, 1934, 1905,    0, 1872, 1234, 2716, 1888, 1882, 1881,
-     1864, 1848, 1832, 1828, 1827, 1826, 1823, 1806, 1809, 1784,
-     1787, 1772,    0, 1781, 1786,    0, 1766, 1767, 1759, 1744,
-     1213, 1736,    0, 1236, 2716, 1245, 2716, 2716, 2716, 2716,
-     2716, 2716, 2716, 2716, 2716, 2716, 2716, 1750, 1727, 1720,
-
-     1701, 1687, 1670, 1681, 1667, 1679, 1659,  689, 1658, 1671,
-     2716, 1657, 1627, 1621, 1635,    0, 1603, 1596, 1595, 1608,
-     1602, 1587, 1586, 1583, 1581, 1587, 1555,    0, 1547,    0,
-     1527, 1507, 1520, 1503, 1483, 1482, 1485, 1443, 1440, 1228,
-     2716, 1225, 1224, 1206, 1210, 2716, 1213, 1202, 1018,  948,
-     2716,  945, 2716,  884,  780,  771,  779, 2716, 2716,  689,
-      673,  581,  408,  318,   86,    0,    0, 2716, 1263, 1279,
-     1295, 1311, 1327, 1343, 1359, 1375, 1391, 1407, 1423, 1439,
-     1455, 1471, 1481, 1496, 1505, 1520, 1536, 1545, 1560, 1576,
-     1592, 1608, 1624, 1634, 1649, 1659, 1674, 1690, 1706, 1718,
-
-     1728, 1743, 1759, 1775, 1791, 1807, 1817, 1832, 1843, 1236,
-     1858, 1874, 1890, 1898, 1905, 1920, 1936, 1952, 1968, 1977,
-     1985, 2001, 2017, 2033, 2049, 2065, 2081, 2097, 2113, 2123,
-     2138, 2148, 2155, 2170, 2182, 2192, 2207, 2223, 2239, 2255,
-     2265, 2280, 2291, 2306, 2322, 2338, 2354, 2364, 2373, 2388,
-     2404, 2420, 2429, 2437, 2453, 2469, 2485
+        0,   84,  167,  250,  171,  184,  174,  179,  192,  233,
+      196,  200,  334,    0, 3343, 3340,  203,  416,  206,  211,
+      187,  216,  276,  417,  500,    0,  210,  223,  421,  427,
+      436,  440,  583,  588,  669,    0,  277,  299,  584,  751,
+      579,  580,  576,  732,  279,  305,  310,  444, 3378, 3975,
+      228, 3975, 3371,    0,  322, 3975, 3358,  423,  827, 3328,
+        0, 3975,  755, 3975, 3337, 3975,  448, 3312, 3975, 3975,
+     3323, 3291,  222,  408,  444,  764, 3975, 3311,  230, 3289,
+     3975, 3975, 3975, 3306,    0, 3306,  164, 3304, 3975, 3236,
+     3217, 3975, 3975, 3266,  239,  119, 3215, 3212, 3180,    0,
+
+     3248, 3975, 3243, 3975,  476, 3227, 3222, 3975, 3168,    0,
+     3975, 3975, 3975, 3203, 3975,  464, 3975, 3975, 3975, 3186,
+     3975,  742, 3975, 3161,  751,  180, 3975, 3975, 3171,    0,
+     3149,  757, 3975,    0, 3975, 3149, 3975,  200, 3138,    0,
+      429,  241, 3097, 3092, 3975, 3975,  306, 3975,  323, 3975,
+     3975, 3126, 3108, 3072, 3069,    0, 3975, 3115, 3975,    0,
+     3975,  446, 3975, 3114, 3031, 3098,  435,  371, 3045, 3026,
+     3975, 3076, 3975, 3074, 3070,  439,  440, 3975,  578,  751,
+      586,  562,  735,  752,    0,  572,  577,  588,  786,  749,
+      396,  809,  727,  582,  747,  753,  764,  769,  580, 3975,
+
+     3975, 3067,  588, 3975, 3975, 3053, 3002, 2996, 3975, 3975,
+     3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975,    0,
+     3975, 3046, 3975, 3975, 3975, 3018, 2986,  837, 3975, 2998,
+        0,  847, 3975, 2997,  817,  777,    0,    0,  891,  903,
+      912,  924,    0,  774,    0,  451, 3975,    0,  858, 3975,
+     2996, 2914,  472, 3975, 2974, 2953, 3975,  791,  236,  822,
+      899, 3975,  275,    0, 2873, 2872, 3975, 2871,  949, 3975,
+     2949, 2850, 2918, 2906, 3975,    0, 3975,  796, 3975,    0,
+        0, 2925,    0,    0, 2597, 3975, 3975, 3975, 3975,  795,
+      794, 3975, 3975,  484,    0, 2597, 3975,  877, 2596, 2594,
+
+     2594, 3975,    0, 3975,  918, 3975, 1005, 3975, 3975, 3975,
+     3975,    0, 3975,  611, 3975,    0, 3975,    0,  853,  851,
+     3975, 3975,  490, 3975,  608, 3975, 3975, 3975, 3975,    0,
+     3975, 3975,  596, 2510, 3975,    0, 3975, 3975, 2588, 3975,
+     2581, 3975,  894,  906,    0,  911,  717,  727,  923,  728,
+     2571,  882,  930,  889,  902,  916,  917,  940,  928,  923,
+      940,  933,    0,  932, 3975,  935,  939,  951,  956, 1059,
+      964,  965, 1052,  955,  957, 1099, 2578, 3975, 1078, 3975,
+     3975, 3975,    0, 3975, 3975, 3975,  987,    0,    0, 1087,
+     3975, 2576, 1132,  985, 1046, 1058,    0, 1058,    0, 1009,
+
+     3975, 1016, 3975, 1057, 3975, 1099, 3975, 1068,  731, 1088,
+     1095, 1178, 1244, 1280,  988,    0, 3975, 3975, 2492, 1162,
+     3975, 3975, 1081,    0, 1086,    0,    0, 1098, 1105, 1100,
+     3975, 1167, 1245, 1246, 1247, 1250, 2539, 1248, 1249, 1258,
+     1244, 1251, 1259, 1321, 1233, 1224,    0, 1072, 1228, 1243,
+     1261, 1287, 1298, 1289, 1298, 1287,    0, 1299, 1228, 1308,
+        0, 1280, 1298, 1307, 1316, 1314, 1316, 2532, 1322, 1337,
+     1338, 1340, 1342, 1342, 1348, 1353, 1356, 1347, 1357, 1362,
+     1366, 1358, 1353, 1356, 1377, 1366, 1370, 1371, 1367, 1383,
+     1384, 1379, 1391, 1392, 1381, 1388, 1397, 1275, 1455, 3975,
+
+     1439, 1463, 1444, 1415, 1412, 1415,    0, 1409,    0, 1429,
+     1492, 1558, 1594, 1524, 2449, 1564, 1639, 3975, 3975, 1537,
+     1556, 1560, 1407, 2427, 1558, 1563, 1559, 1564, 1572, 1584,
+     1574, 1562, 1615, 1619, 1609, 1625, 1626, 1643, 1614, 1651,
+     1662, 1658, 1664, 1665, 1616, 1616, 1637, 3975, 3975, 1638,
+     1631, 2352, 1634, 1641, 1655, 1650, 1677, 1679, 1671, 1689,
+        0,    0, 1690, 1677, 1681, 1697,    0, 2348, 1684, 1694,
+     2274, 1686, 1685, 1695,    0, 1692, 1711, 1704, 1703, 1701,
+     1713, 1703, 1704, 1712,    0, 1717, 1731, 1731, 1719, 1723,
+     1722, 1741, 1726, 1742, 1734, 1747, 1741, 2241, 3975, 1464,
+
+     1485, 1729, 1743, 1740,    0, 1721, 1591, 2173, 1585, 2139,
+     1771, 1807, 1417,  962, 1426, 1755, 2049, 1745, 1769, 3975,
+     1774, 1782, 1789, 1775, 1796, 1791, 1810, 1800, 1820, 1822,
+     1821, 1823, 1832, 1831, 1838, 1840, 1853, 1856, 1854, 1855,
+     1863, 1865, 1861, 1846, 1862,    0, 1853, 1864,    0, 1857,
+        0, 2008, 1866, 1862, 1869,    0, 1874, 1893, 1870,    0,
+     1888, 1875, 1886, 1882, 1880, 1878, 1897, 1876, 1882, 1889,
+     1889,    0, 1904, 1895, 1899, 1919,    0, 1907, 1909, 1908,
+     1923, 1791, 1924, 1925, 1919, 1747, 1917, 1918, 1918, 1938,
+     1924, 1726, 1599, 1927, 1937, 1970, 3975, 1702, 1652, 1923,
+
+     1755, 1941, 1625, 1618, 3975, 3975, 1961, 1977, 1966, 1969,
+     1956, 1979, 1983, 1986, 1989, 1984, 1992, 1987, 1994, 1990,
+     1988, 1995, 2007, 2004, 2016, 2022, 1996, 2028, 2018, 2026,
+        0,    0, 1620, 1990, 2009,    0, 2035, 2020, 2035, 2029,
+     2024, 2025, 2029, 1589, 2049, 2041, 2052, 2048, 2053, 2054,
+     2044, 2057,    0, 2064,    0, 2048,    0, 1576,    0, 2064,
+     2070, 2056,    0, 2096, 2062,    0, 2067, 2108,    0, 1531,
+     2072, 2078, 1438, 1853, 3975, 2105, 3975, 2068, 3975, 1463,
+     3975, 1407, 1402, 1348, 1345, 1314, 1307, 1269, 1260, 1256,
+     1210, 1158, 2106, 2111, 2097, 2118, 2122, 2129, 2125, 2140,
+
+     2131, 2136, 2141, 2143, 2156, 2131, 2138, 2147, 2101, 2151,
+     2138, 2153,    0, 2141,    0, 2144, 2165, 2153, 2159, 2158,
+     2165,    0, 2165,    0, 2167, 2169,    0, 2178,    0,    0,
+        0, 2183, 2167, 2179, 2210, 2178, 2189, 2188, 2189, 2202,
+     2186, 2194, 2218, 2196, 2202, 1119, 1114, 2206, 2118, 3975,
+     1106, 1100, 1081, 1068, 1065, 1061, 1057,  972,  968,  965,
+      914,  925,  893,  881,  874,  869,  865,  861,  854,  843,
+      807,  802,  776, 2235, 2212, 2226, 2221, 2227, 2239, 2238,
+     2228,    0, 2228, 2239, 2242, 2252,    0, 2238, 2244, 2249,
+     2244, 2258, 2263, 2269, 2255, 3975, 2263, 2265, 2265, 2281,
+
+     2265, 2262,    0, 2285, 2288, 2274, 3975, 2277, 2280, 2295,
+     2279, 2280, 2283, 2303, 2283, 2330, 3975, 2335, 3975, 3975,
+     3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975,  735,
+      612,  608,  598,  441,  374,  261,  245,  202,  152,  149,
+      137,  165, 2296, 2303, 2304, 2320, 2326, 2316, 2324, 2329,
+     2324, 2316, 2319, 2335, 2324, 2327,    0, 2332, 2328, 2327,
+     2332, 2345, 2348, 2352, 2344, 3975, 2338,    0, 2338, 2343,
+     2357, 2362, 2357, 3975, 2371, 2356, 2359, 2358, 2380, 3975,
+     3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975,
+     3975,  128, 2384, 2382, 2373, 2387, 2376, 2378, 2378,    0,
+
+     2395, 2396,    0, 2385, 2384, 2405, 2403, 2401, 2405, 2413,
+     3975, 2401, 3975, 3975, 3975, 2409, 2416, 2404, 3975, 3975,
+     2400, 2422, 2422, 2414, 2417, 2417, 3975, 2421, 2421, 2418,
+     2424, 2441, 2442, 2443,    0,    0, 2453,    0, 2436,    0,
+     2451, 3975, 3975, 2445, 3975, 3975, 2446, 2457, 2445, 2461,
+     2464, 2462, 2468, 2473, 2466, 2460,    0, 2462, 2459, 2461,
+     2483,    0, 2463, 3975, 3975, 3975, 2484, 2488, 2476, 2482,
+     3975, 2495, 2485, 2497, 2495, 2501, 2506, 2493,    0, 3975,
+     2496, 3975, 2508, 2498, 2506, 2503, 2506, 2505,    0, 2520,
+     3975, 3975, 2522, 2514,    0,    0, 2529, 2514, 2515,    0,
+
+        0, 2533, 2539,    0,    0, 3975, 2601, 2618, 2635, 2652,
+     2669, 2686, 2703, 2720, 2737, 2754, 2771, 2788, 2805, 2822,
+     2839, 2856, 2873, 2890, 2907, 2917, 2933, 2942, 2958, 2975,
+     2986, 3002, 3019, 3036, 3053, 3063, 3079, 3096, 3113, 3127,
+     3137, 3153, 3170, 3187, 3204, 3215, 2009, 3227, 3244, 3254,
+     3270, 3287, 3294, 3300, 3316, 3326, 3342, 3359, 3376, 2564,
+     3386, 3403, 3420, 3437, 3454, 3471, 3488, 3505, 3522, 3532,
+     3548, 3562, 3572, 3588, 3605, 3622, 3639, 3650, 3662, 3679,
+     3696, 3713, 3730, 3740, 3749, 3765, 3782, 3799, 2571, 3809,
+     3826, 3843, 3860, 3877, 3885, 3890, 3906, 3923, 3940, 3957
+
     } ;
 
-static yyconst short int yy_def[858] =
+static yyconst flex_int16_t yy_def[1201] =
     {   0,
-      768,  768,  769,  769,  770,  771,  772,  772,  768,    9,
-      773,  773,  768,   13,  774,  774,  775,  775,  776,  776,
-      777,  777,  778,  778,  768,   25,  779,  779,  780,  780,
-      781,  781,  768,   33,  768,   35,  782,  782,  768,  768,
-      768,  768,  768,  783,  768,  768,  768,  768,  784,  768,
-      785,  768,  768,  768,  768,  768,  768,  768,  768,  786,
-      787,  788,  768,  768,  768,  768,  768,  768,  789,  768,
-      789,  790,  791,  790,  790,  792,  768,  793,  768,  793,
-      768,  794,  794,  794,  793,  795,  768,  768,  795,  768,
-      768,  768,  796,  768,  768,  768,  768,  768,  768,  768,
-
-      768,  768,  768,  768,  787,  768,  768,  787,  797,  768,
-      768,  768,  798,  768,  787,  768,  799,  768,  799,  768,
-      800,  768,  801,  801,  801,  768,  768,  802,  768,  802,
-      803,  768,  803,  768,  804,  768,  804,  768,  805,  806,
-      806,  768,  806,  806,  768,  806,  807,  807,  807,  768,
-      768,  768,  768,  808,  768,  768,  768,  809,  809,  809,
-      809,  809,  809,  809,  809,  809,  809,  810,  809,  809,
-      809,  809,  809,  809,  809,  809,  768,  768,  811,  768,
-      768,  768,  768,  783,  768,  768,  768,  768,  768,  812,
-      813,  768,  768,  768,  768,  814,  815,  816,  768,  785,
-
-      768,  768,  768,  768,  817,  768,  768,  768,  818,  818,
-      819,  768,  768,  820,  768,  821,  768,  768,  768,  768,
-      768,  768,  768,  822,  768,  768,  823,  768,  824,  825,
-      825,  826,  827,  828,  768,  829,  768,  830,  830,  830,
-      768,  831,  768,  768,  768,  832,  768,  768,  768,  833,
-      768,  768,  768,  768,  834,  768,  835,  768,  835,  768,
-      836,  836,  836,  837,  768,  837,  838,  768,  838,  768,
-      839,  768,  768,  840,  840,  840,  768,  768,  841,  841,
-      841,  768,  768,  842,  768,  768,  768,  843,  843,  843,
-      843,  843,  843,  843,  843,  843,  843,  843,  843,  843,
-
-      843,  843,  843,  768,  843,  843,  843,  843,  843,  843,
-      843,  843,  843,  843,  844,  768,  768,  768,  845,  846,
-      847,  768,  768,  768,  768,  768,  768,  848,  849,  850,
-      768,  850,  768,  851,  768,  851,  768,  852,  852,  852,
-      768,  852,  852,  768,  853,  854,  768,  768,  768,  768,
-      855,  768,  826,  827,  830,  830,  241,  768,  241,  241,
-      833,  833,  833,  833,  833,  833,  833,  833,  833,  833,
-      833,  836,  836,  278,  278,  841,  841,  768,  768,  843,
-      843,  843,  843,  843,  843,  843,  843,  843,  843,  843,
-      843,  843,  843,  843,  843,  843,  843,  843,  843,  843,
-
-      843,  843,  843,  843,  843,  843,  843,  843,  768,  843,
-      843,  843,  843,  768,  847,  847,  768,  847,  847,  768,
-      768,  768,  768,  848,  849,  768,  341,  852,  343,  341,
-      852,  343,  768,  768,  768,  830,  830,  360,  768,  833,
-      833,  833,  833,  833,  833,  833,  833,  833,  833,  833,
-      836,  836,  841,  841,  768,  768,  843,  843,  843,  843,
-      843,  843,  843,  843,  843,  843,  843,  843,  843,  843,
-      843,  843,  843,  843,  843,  843,  843,  843,  843,  843,
-      843,  843,  843,  843,  768,  768,  768,  843,  843,  843,
-      843,  768,  768,  847,  847,  768,  768,  768,  768,  427,
-
-      852,  343,  852,  852,  852,  768,  768,  830,  830,  768,
-      833,  833,  833,  833,  833,  833,  833,  833,  833,  833,
-      833,  833,  836,  836,  841,  841,  843,  843,  843,  843,
-      843,  843,  843,  843,  843,  843,  843,  843,  843,  843,
-      843,  843,  843,  843,  843,  843,  843,  843,  843,  843,
-      843,  768,  768,  768,  768,  843,  843,  843,  843,  768,
-      856,  768,  768,  768,  852,  852,  852,  768,  768,  830,
-      830,  833,  833,  833,  833,  833,  833,  833,  833,  833,
-      833,  833,  833,  836,  836,  841,  841,  843,  843,  843,
-      843,  843,  843,  843,  843,  843,  843,  843,  843,  843,
-
-      843,  843,  843,  843,  843,  843,  768,  768,  768,  768,
-      843,  843,  843,  843,  856,  768,  856,  768,  768,  768,
-      768,  768,  833,  833,  833,  833,  833,  833,  833,  833,
-      833,  833,  833,  833,  843,  843,  843,  843,  843,  843,
-      843,  843,  843,  843,  843,  843,  843,  843,  843,  768,
-      768,  768,  768,  843,  843,  857,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  833,  843,
-      843,  843,  843,  843,  843,  843,  843,  843,  768,  768,
-      768,  768,  843,  857,  768,  857,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  843,  843,
-
-      843,  843,  843,  843,  843,  768,  768,  768,  768,  768,
-      768,  843,  843,  843,  843,  843,  843,  843,  768,  768,
-      768,  768,  768,  768,  843,  843,  843,  843,  843,  843,
-      768,  768,  768,  768,  768,  768,  843,  843,  843,  843,
-      768,  768,  768,  768,  768,  768,  843,  843,  843,  843,
-      768,  768,  768,  768,  843,  843,  843,  768,  768,  843,
-      843,  843,  843,  843,  843,  843,  843,    0,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768
+     1106, 1106, 1107, 1107, 1108, 1109, 1110, 1110, 1111, 1111,
+     1112, 1112, 1106,   13, 1113, 1113, 1114, 1114, 1115, 1115,
+     1116, 1116, 1117, 1117, 1106,   25, 1118, 1118, 1119, 1119,
+     1120, 1120, 1121, 1121, 1106,   35, 1122, 1122, 1123, 1123,
+     1113, 1113, 1113, 1113, 1124, 1124, 1125, 1125, 1106, 1106,
+     1106, 1106, 1106, 1126, 1106, 1106, 1106, 1106, 1127, 1106,
+     1128, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1129, 1130, 1131, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1132, 1133, 1132, 1134, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1135,
+
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1136,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1130, 1106, 1106, 1130, 1137, 1106, 1106, 1106, 1138,
+     1106, 1130, 1106, 1139, 1106, 1139, 1106, 1140, 1106, 1141,
+     1141, 1141, 1106, 1106, 1106, 1106, 1142, 1106, 1142, 1106,
+     1106, 1106, 1106, 1106, 1106, 1143, 1106, 1143, 1106, 1144,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1145, 1106, 1106, 1106, 1146, 1146,
+     1146, 1146, 1146, 1146, 1146, 1146, 1146, 1146, 1146, 1147,
+     1146, 1146, 1146, 1146, 1146, 1146, 1146, 1146, 1146, 1106,
+
+     1106, 1148, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1149,
+     1106, 1149, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1150, 1106, 1106, 1106, 1106, 1106, 1151, 1152, 1106, 1106,
+     1106, 1106, 1153, 1151, 1154, 1155, 1106, 1156, 1106, 1106,
+     1106, 1106, 1157, 1106, 1106, 1106, 1106, 1106, 1158, 1158,
+     1159, 1106, 1106, 1160, 1106, 1106, 1106, 1161, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1162, 1106, 1106, 1106, 1163,
+     1164, 1164, 1165, 1166, 1167, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1168, 1169, 1106, 1106, 1106, 1106, 1106,
+
+     1106, 1106, 1170, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1171, 1106, 1172, 1106, 1172, 1106, 1173, 1173, 1173,
+     1106, 1106, 1174, 1106, 1174, 1106, 1106, 1106, 1106, 1175,
+     1106, 1106, 1106, 1106, 1106, 1176, 1106, 1106, 1106, 1106,
+     1177, 1106, 1106, 1106, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1106, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1179, 1106, 1106, 1106,
+     1106, 1106, 1180, 1106, 1106, 1106, 1106, 1181, 1182, 1183,
+     1106, 1106, 1106, 1106, 1106, 1106, 1184, 1181, 1185, 1186,
+
+     1106, 1186, 1106, 1187, 1106, 1187, 1106, 1106, 1188, 1188,
+     1188, 1106, 1188, 1188, 1106, 1189, 1106, 1106, 1190, 1106,
+     1106, 1106, 1106, 1191, 1106, 1192, 1193, 1106, 1106, 1194,
+     1106, 1194, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
+     1195, 1195, 1195, 1195, 1196, 1196, 1197, 1106, 1106, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1106, 1106, 1183, 1183, 1106,
+
+     1183, 1183, 1106, 1106, 1106, 1106, 1184, 1198, 1185, 1106,
+     1106, 1188,  414,  412,  412, 1188,  414, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1195, 1195, 1195, 1195, 1195, 1195,
+     1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
+     1195, 1195, 1195, 1195, 1195, 1196, 1196, 1106, 1106, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1106, 1106, 1106, 1106, 1106, 1183,
+
+     1183, 1106, 1106, 1106, 1198, 1198, 1198, 1106,  511,  511,
+     1188,  414, 1188, 1188, 1188, 1106, 1106, 1106, 1106, 1106,
+     1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
+     1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
+     1195, 1195, 1195, 1196, 1196, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1106, 1106, 1106,
+     1106, 1106, 1199, 1106, 1106, 1198, 1106, 1198, 1106, 1188,
+
+     1188, 1188, 1106, 1106, 1106, 1106, 1195, 1195, 1195, 1195,
+     1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
+     1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
+     1196, 1196, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1106, 1178, 1178, 1178, 1106, 1178, 1106,
+     1106, 1106, 1106, 1199, 1106, 1199, 1106, 1106, 1106, 1106,
+     1106, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
+     1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
+
+     1195, 1195, 1195, 1195, 1195, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1106, 1106, 1106, 1106, 1106, 1106, 1178, 1178, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1200, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
+     1195, 1195, 1195, 1195, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+
+     1106, 1106, 1178, 1178, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1200, 1106, 1200, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1195, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1178, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1178, 1178, 1178,
+     1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1178, 1178, 1178, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1106,
+     1106, 1106, 1106, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+     1106, 1106, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178,
+
+     1178, 1178, 1178, 1178, 1178,    0, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106
+
     } ;
 
-static yyconst short int yy_nxt[2775] =
+static yyconst flex_int16_t yy_nxt[4060] =
     {   0,
-       40,   41,   42,   43,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   44,   44,   40,   40,   40,   40,   44,
-       44,   44,   44,   44,   44,   44,   44,   44,   44,   44,
-       44,   44,   44,   44,   44,   44,   44,   44,   44,   44,
-       44,   44,   44,   44,   44,   40,   40,   40,   40,   45,
-       46,   47,   40,   48,   40,   49,   40,   40,   40,   40,
-       40,   40,   50,   40,   40,   40,   40,   40,   40,   40,
-       40,   51,   51,   40,   40,   40,   40,   51,   51,   51,
-       51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
-
-       51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
-       51,   51,   51,   40,   40,   40,   53,   54,   55,   56,
-      767,   57,   70,   71,   58,   58,   58,  129,  130,   58,
-       73,   70,   74,  129,  130,   59,   75,   87,   88,   89,
-       60,   61,   87,   88,   89,  188,   96,   97,  224,  132,
-      133,  210,  211,   96,   97,  404,   98,  134,  405,   99,
-       99,   99,   99,   98,  213,  213,   99,   99,   99,   99,
-       62,   58,   58,   63,   64,   65,   56,  252,   57,   66,
-       40,   58,   58,   58,  439,  189,   58,  102,  103,  104,
-       40,  252,   67,  102,  103,  104,  225,   60,   61,  275,
-
-       68,  100,  214,  107,  108,  276,  109,  178,  100,  179,
-      232,  105,  233,  107,  108,  572,  109,  105,  132,  133,
-      180,  180,  180,  180,  265,  266,  134,   62,   58,   58,
-       78,   78,   79,   80,   78,   78,   78,   78,   78,   78,
-       81,   78,   78,   78,   78,   78,   78,   78,   78,   78,
-       78,   78,   78,   82,   82,   78,   78,   78,   78,   82,
+       50,   51,   52,   50,   53,   50,   50,   50,   50,   50,
+       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
+       50,   50,   50,   50,   50,   50,   50,   54,   54,   54,
+       54,   54,   54,   54,   54,   54,   54,   54,   54,   54,
+       54,   54,   54,   54,   54,   54,   54,   54,   54,   54,
+       54,   54,   50,   50,   50,   50,   54,   54,   54,   54,
+       54,   54,   54,   54,   54,   54,   54,   54,   54,   54,
+       54,   54,   54,   54,   54,   54,   54,   54,   54,   54,
+       54,   50,   50,   50,   50,   55,   56,   50,   57,   50,
+       58,   50,   59,   50,   50,   50,   50,   50,   50,   50,
+
+       50,   60,   50,   50,   50,   50,   50,   50,   50,   50,
+       50,   61,   61,   61,   61,   61,   61,   61,   61,   61,
+       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
+       61,   61,   61,   61,   61,   61,   50,   50,   50,   50,
+       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
+       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
+       61,   61,   61,   61,   61,   50,   50,   50,   63,   64,
+      291,   65,   66,   83,   67,   84,   89,   68,   69,   70,
+       70,   89, 1027,   70,   71,   86,   83,  992,   84,   50,
+       72,  991,   87,   70,   93,  309,   94,  101,  102,  291,
+
+      103,  101,  102,  990,  103,  113,  989,  114,  119,  315,
+      120,  121,  148,  119,  149,  120,  121,  115,   50,   73,
+       74,  116,  116,  116,  116,  148,   90,  149,   91,  228,
+      229,   90,  230,   91,  309,   93,   95,   94,  276,  124,
+      125,   99,  126,   96,   97,  283,   98,  284,   75,   70,
+       70,   76,   77,  316,   78,   66,  988,   67,   79,  122,
+       68,   69,   70,   70,  122,   95,   70,   71,  124,  125,
+      290,  126,   96,   80,  260,  261,   70,   95,  128,  201,
+      129,  221,  202,  222,   96,   97,  117,   98,  410,  411,
+      223,  130,  320,  415,  415,  203,  203,  203,  203,  987,
+
+      290,  201,   73,   74,  202,   81,   95,  221,  324,  222,
+      325,  277,  225,   96,  226,  986,  223,  203,  203,  203,
+      203,  320,  227,  232,  233,  324,  234,  325,  131,  132,
+      133,   75,   70,   70,  104,  105,  106,  104,  107,  104,
+      104,  104,  104,  104,  104,  104,  108,  104,  108,  104,
+      104,  104,  104,  104,  104,  104,  104,  104,  104,  109,
+      104,  110,  110,  110,  110,  110,  110,  110,  110,  110,
+      110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
+      110,  110,  110,  110,  110,  110,  104,  104,  104,  104,
+      110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
+
+      110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
+      110,  110,  110,  110,  110,  104,  104,  104,  113,  128,
+      114,  129,  291,  151,  235,  152,  263,  263,  985,  151,
+      115,  152,  130,  153,  116,  116,  116,  116,  157,  153,
+      158,  159,  157,  366,  158,  159,  225,  333,  226,  254,
+      254,  291,  255,  401,  334,  402,  227,  265,  264,  266,
+      319,  236,  267,  267,  267,  267,  290,  343,  344,  131,
+      132,  133,  366,  154,  405,  155,  406,  298,  299,  154,
+      300,  155,  305,  305,  305,  305,  431,  264,  432,  160,
+      319,  236,  324,  160,  325,  984,  290,  343,  344,  117,
+
+      134,  134,  135,  134,  136,  137,  134,  134,  134,  138,
+      134,  134,  134,  134,  134,  134,  134,  139,  134,  134,
+      134,  134,  134,  134,  134,  134,  134,  140,  140,  140,
+      140,  140,  140,  140,  140,  140,  140,  140,  140,  140,
+      140,  140,  140,  140,  141,  140,  140,  140,  140,  140,
+      140,  142,  143,  134,  144,  134,  140,  140,  140,  140,
+      140,  140,  140,  140,  140,  140,  140,  140,  140,  140,
+      140,  140,  140,  141,  140,  140,  140,  140,  140,  140,
+      142,  145,  134,  146,  162,  163,  205,  164,  206,  162,
+      163,  165,  164,  353,  211,  211,  165,  333,  216,  351,
+
+      166,  212,  212,  358,  334,  166,  379,  379,  379,  379,
+      324,  217,  325,  352,  213,  213,  346,  359,  347,  360,
+      315,  218,  348,  353,  214,  214,  219,  167,  371,  215,
+      215,  376,  167,  358,  168,  169,  207,  170,  208,  168,
+      169,  217,  170,  352,  213,  213,  346,  359,  347,  360,
+      218,  348,  983,  214,  214,  219,  167,  371,  215,  215,
+      376,  167,  982,  168,  316,  209,  981,  210,  168,  171,
+      172,  173,  171,  174,  175,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  176,  177,
+      171,  171,  171,  178,  171,  171,  179,  180,  181,  182,
+
+      183,  184,  185,  186,  187,  185,  185,  188,  189,  190,
+      191,  192,  185,  193,  194,  195,  196,  197,  198,  185,
+      199,  171,  171,  171,  171,  171,  179,  180,  181,  182,
+      183,  184,  185,  186,  187,  185,  185,  188,  189,  190,
+      191,  192,  193,  194,  195,  196,  197,  198,  185,  199,
+      171,  171,  171,  205,  216,  206,  249,  250,  370,  251,
+      263,  263,  452,  252,  354,  269,  270,  217,  271,  263,
+      263,  453,  272,  456,  372,  263,  263,  218,  349,  356,
+      364,  273,  219,  410,  411,  355,  350,  274,  370,  980,
+      365,  452,  264,  373,  354,  374,  375,  217,  941,  357,
+
+      453,  264,  456,  207,  372,  208,  218,  264,  349,  356,
+      364,  219,  387,  361,  355,  398,  350,  362,  235,  275,
+      365,  264,  408,  373,  940,  374,  375,  425,  357,  939,
+      264,  428,  209,  429,  210,  238,  264,  253,  228,  229,
+      367,  230,  387,  361,  412,  398,  253,  362,  232,  233,
+      368,  234,  408,  369,  239,  236,  240,  425,  240,  249,
+      250,  428,  251,  429,  240,  938,  252,  240,  241,  242,
+      367,  240,  243,  244,  410,  411,  937,  245,  298,  299,
+      368,  300,  369,  936,  239,  236,  240,  935,  240,  445,
+      446,  934,  390,  391,  240,  392,  933,  240,  241,  242,
+
+      240,  243,  244,  932,  390,  391,  245,  392,  246,  393,
+      393,  393,  393,  390,  391,  931,  392,  413,  413,  445,
+      446,  393,  393,  393,  393,  390,  391,  458,  392,  448,
+      393,  393,  393,  393,  461,  394,  305,  305,  305,  305,
+      253,  449,  393,  393,  393,  393,  450,  930,  462,  414,
+      269,  270,  454,  271,  395,  464,  458,  272,  459,  448,
+      451,  463,  460,  461,  394,  396,  273,  465,  929,  455,
+      466,  449,  274,  468,  467,  469,  450,  462,  414,  470,
+      471,  472,  454,  473,  395,  464,  474,  476,  459,  451,
+      463,  480,  460,  482,  481,  396,  475,  465,  455,  485,
+
+      466,  486,  468,  467,  275,  469,  262,  262,  470,  471,
+      472,  401,  473,  402,  410,  411,  474,  476,  401,  928,
+      402,  480,  927,  482,  481,  475,  926,  497,  485,  504,
+      486,  253,  433,  434,  435,  436,  437,  437,  438,  437,
+      437,  437,  437,  439,  437,  437,  437,  440,  437,  437,
+      441,  437,  442,  437,  437,  443,  437,  497,  504,  405,
+      444,  406,  433,  434,  435,  436,  437,  437,  438,  437,
+      437,  437,  437,  439,  437,  437,  437,  440,  437,  441,
+      437,  442,  437,  437,  443,  437,  477,  483,  499,  500,
+      478,  501,  505,  506,  484,  479,  379,  379,  379,  379,
+
+      508,  405,  431,  406,  432,  502,  502,  502,  502,  510,
+      511,  925,  520,  512,  512,  924,  477,  483,  548,  923,
+      478,  505,  922,  506,  484,  479,  487,  521,  488,  522,
+      508,  489,  490,  503,  391,  921,  392,  491,  492,  510,
+      410,  411,  520,  493,  494,  513,  523,  548,  495,  409,
+      393,  393,  393,  393,  920,  496,  487,  521,  488,  522,
+      919,  489,  490,  519,  519,  519,  519,  491,  492,  431,
+      914,  432,  493,  494,  513,  913,  523,  495,  409,  409,
+      861,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+
+      409,  409,  409,  409,  409,  514,  514,  514,  514,  514,
+      514,  514,  514,  514,  514,  514,  514,  514,  514,  514,
+      514,  514,  514,  514,  514,  514,  514,  514,  514,  514,
+      410,  411,  860,  515,  409,  514,  514,  514,  514,  514,
+      514,  514,  514,  514,  514,  514,  514,  514,  514,  514,
+      514,  514,  514,  514,  514,  514,  514,  514,  514,  409,
+      409,  409,  516,  516,  546,  547,  524,  524,  524,  524,
+      524,  524,  524,  524,  549,  558,  550,  599,  859,  600,
+      524,  524,  858,  525,  526,  528,  533,  527,  551,  535,
+      530,  857,  529,  534,  546,  547,  410,  411,  517,  517,
+
+      517,  517,  531,  549,  558,  532,  550,  517,  517,  517,
+      517,  517,  517,  525,  526,  528,  533,  527,  551,  535,
+      530,  529,  552,  534,  560,  553,  554,  555,  556,  856,
+      557,  531,  410,  411,  532,  559,  855,  517,  517,  517,
+      517,  517,  517, 1106,  561,  562,  563,  565,  536,  537,
+      538,  539,  552,  560,  540,  553,  554,  555,  556,  541,
+      557,  564,  567,  542,  568,  559,  543,  854,  544,  569,
+      853,  545,  570,  561,  571,  562,  563,  565,  536,  537,
+      538,  539,  572,  573,  540,  574,  575,  576,  577,  541,
+      564,  578,  567,  542,  568,  543,  581,  544,  582,  569,
+
+      545,  579,  570,  583,  571,  584,  585,  580,  586,  587,
+      606,  588,  572,  573,  589,  574,  575,  576,  577,  590,
+      591,  578,  592,  593,  852,  594,  581,  582,  598,  851,
+      595,  579,  583,  596,  597,  584,  585,  580,  586,  587,
+      588,  500,  602,  600,  589,  503,  391,  603,  392,  590,
+      591,  619,  592,  593,  594,  604,  499,  500,  598,  501,
+      595,  608,  596,  597,  601,  500,  599,  501,  600,  410,
+      411,  259,  602,  502,  502,  502,  502,  603,  410,  411,
+      619,  502,  502,  502,  502,  604,  601,  500,  850,  501,
+      607,  608,  409,  409,  848,  409,  409,  409,  409,  409,
+
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  609,
+      609,  609,  609,  609,  609,  609,  609,  609,  609,  609,
+      609,  609,  609,  609,  609,  609,  609,  609,  609,  609,
+      609,  609,  609,  609,  410,  411,  613,  610,  409,  609,
+      609,  609,  609,  609,  609,  609,  609,  609,  609,  609,
+      609,  609,  609,  609,  609,  609,  609,  609,  609,  609,
+      609,  609,  609,  409,  409,  409,  611,  611,  616,  409,
+      524,  524,  614,  614,  524,  524,  524,  845,  617,  618,
+      623,  828,  696,  697,  524,  698,  524,  625,  621,  626,
+
+      622,  775,  629,  776,  817,  624,  524,  700,  616,  628,
+      410,  411,  612,  612,  612,  612,  410,  411,  617,  618,
+      623,  612,  612,  612,  612,  612,  612,  625,  621,  626,
+      622,  524,  629,  627,  624,  806,  524,  524,  524,  628,
+      409,  524,  630,  781,  632,  644,  643,  524,  524,  636,
+      780,  612,  612,  612,  612,  612,  612,  615,  615,  615,
+      615,  631,  627,  633,  634,  524,  615,  615,  615,  615,
+      615,  615,  630,  524,  632,  644,  643,  779,  646,  636,
+      524,  645,  647,  635,  524,  649,  524,  524,  650,  651,
+      652,  631,  653,  633,  634,  637,  615,  615,  615,  615,
+
+      615,  615,  639,  638,  697,  640,  641,  642,  646,  654,
+      645,  647,  656,  635,  649,  655,  658,  650,  657,  651,
+      652,  659,  606,  660,  637,  661,  662,  692,  664,  665,
+      669,  639,  667,  638,  640,  668,  641,  642,  670,  654,
+      671,  672,  656,  673,  675,  655,  658,  657,  674,  676,
+      677,  659,  660,  678,  661,  679,  662,  664,  680,  665,
+      669,  667,  681,  683,  668,  682,  684,  670,  685,  687,
+      671,  672,  686,  673,  675,  688,  690,  674,  676,  677,
+      693,  689,  691,  678,  694,  679,  695,  703,  680,  701,
+      701,  705,  681,  683,  682,  684,  524,  524,  685,  687,
+
+      706,  686,  607,  768,  524,  688,  690,  410,  411,  693,
+      689,  524,  691,  524,  694,  695,  708,  703,  524,  710,
+      705,  707,  524,  410,  411,  702,  702,  702,  702,  709,
+      706,  711,  524,  712,  702,  702,  702,  702,  702,  702,
+      714,  713,  524,  524,  524,  524,  708,  764,  710,  715,
+      707,  716,  717,  524,  524,  775,  718,  776,  721,  709,
+      524,  711,  524,  712,  702,  702,  702,  702,  702,  702,
+      714,  713,  719,  723,  720,  524,  524,  524,  524,  715,
+      724,  716,  717,  524,  722,  524,  718,  524,  721,  726,
+      728,  752,  731,  732,  734,  727,  730,  748,  733,  736,
+
+      741,  738,  719,  723,  720,  725,  735,  729,  743,  740,
+      724,  739,  742,  722,  744,  745,  746,  747,  749,  726,
+      728,  731,  750,  732,  734,  727,  730,  733,  751,  736,
+      741,  738,  753,  754,  725,  755,  735,  729,  740,  756,
+      739,  757,  742,  744,  758,  745,  746,  747,  749,  759,
+      761,  750,  760,  762,  763,  765,  766,  767,  751,  769,
+      770,  753,  754,  771,  755,  772,  773,  777,  778,  756,
+      757,  696,  697,  758,  698,  410,  411,  409,  524,  759,
+      761,  760,  762,  524,  763,  765,  766,  767,  524,  769,
+      770,  524,  771,  410,  411,  772,  773,  777,  778,  524,
+
+      782,  524,  786,  784,  783,  524,  524,  785,  524,  524,
+      524,  524,  524,  787,  524,  791,  524,  524,  524,  363,
+      363,  807,  793,  737,  795,  802,  524,  788,  796,  524,
+      782,  786,  789,  784,  783,  790,  792,  785,  524,  797,
+      524,  794,  798,  787,  524,  791,  799,  800,  524,  804,
+      524,  807,  793,  808,  795,  802,  788,  803,  796,  805,
+      811,  789,  801,  809,  790,  792,  812,  813,  797,  814,
+      794,  815,  798,  810,  704,  816,  799,  800,  818,  804,
+      819,  820,  808,  821,  822,  823,  825,  803,  824,  805,
+      811,  826,  801,  809,  827,  829,  812,  813,  814,  830,
+
+      815,  831,  838,  810,  816,  839,  846,  775,  818,  776,
+      819,  820,  849,  821,  822,  823,  825,  824,  847,  524,
+      917,  826,  918,  827,  864,  829,  832,  833,  524,  830,
+      831,  834,  838,  524,  835,  839,  846,  836,  840,  841,
+      524,  849,  837,  842,  524,  878,  843,  524,  847,  844,
+      863,  524,  862,  524,  864,  865,  832,  833,  524,  868,
+      866,  834,  524,  524,  835,  524,  875,  836,  840,  841,
+      876,  837,  872,  842,  878,  867,  843,  870,  524,  844,
+      863,  862,  871,  880,  869,  865,  882,  873,  877,  868,
+      866,  874,  879,  881,  409,  883,  875,  884,  699,  885,
+
+      876,  886,  872,  887,  867,  888,  870,  889,  890,  891,
+      892,  871,  880,  869,  894,  882,  873,  895,  877,  896,
+      902,  874,  879,  881,  883,  901,  893,  884,  885,  903,
+      904,  886,  887,  905,  907,  888,  906,  889,  890,  891,
+      892,  897,  692,  911,  894,  898,  895,  912,  899,  896,
+      902,  915,  943,  908,  901,  893,  909,  524,  900,  903,
+      904,  944,  946,  905,  907,  906,  910,  945,  947,  948,
+      950,  897,  911,  949,  951,  898,  912,  952,  899,  953,
+      915,  942,  943,  908,  954,  955,  909,  900,  956,  666,
+      957,  944,  946,  958,  959,  910,  945,  960,  947,  948,
+
+      950,  961,  949,  962,  951,  963,  964,  952,  965,  953,
+      942,  966,  967,  954,  968,  955,  969,  971,  956,  957,
+      970,  972,  973,  958,  959,  974,  975,  960,  976,  979,
+      961,  977,  917,  962,  918,  963,  964,  917,  965,  918,
+      966,  967,  993,  994,  968,  995,  969,  971,  978,  970,
+      996,  972,  973,  997,  974,  975,  998,  976,  979,  999,
+     1000,  977, 1001,  663, 1002, 1003, 1004,  648, 1005, 1006,
+     1007,  993, 1008,  994, 1009,  995, 1010,  978, 1011, 1012,
+      996, 1013, 1014,  997, 1015, 1016,  998, 1017, 1018,  999,
+     1000, 1019, 1001, 1002, 1003, 1020, 1004, 1005, 1021, 1006,
+
+     1007, 1008, 1022, 1009, 1025, 1010, 1023, 1026, 1011, 1012,
+     1024, 1013, 1014, 1015, 1016, 1028, 1017, 1029, 1018, 1030,
+     1031, 1019, 1032, 1033, 1034, 1020, 1035, 1036, 1021, 1037,
+     1038, 1022, 1039, 1025, 1040, 1023, 1041, 1026, 1042, 1024,
+     1043, 1044, 1045, 1046, 1047, 1028, 1048, 1029, 1030, 1049,
+     1031, 1032, 1033, 1034, 1050, 1057, 1035, 1036, 1037, 1038,
+     1051, 1052, 1039, 1053, 1040, 1054, 1041, 1055, 1042, 1056,
+     1043, 1044, 1045, 1046, 1047, 1048, 1058, 1059, 1060, 1049,
+     1061,  620, 1062, 1063, 1050, 1057, 1064, 1065, 1066, 1051,
+     1052, 1067, 1053, 1068, 1054, 1069, 1055, 1070, 1056, 1071,
+
+     1072, 1073, 1074, 1075,  409, 1076, 1058, 1059, 1060, 1077,
+     1061, 1062, 1078, 1063, 1079, 1080, 1064, 1065, 1066, 1081,
+     1067, 1082, 1083, 1068, 1084, 1069, 1085, 1070, 1086, 1071,
+     1072, 1073, 1074, 1075, 1076, 1087, 1088, 1089, 1077, 1090,
+     1091, 1092, 1078, 1079, 1093, 1080, 1094,  566, 1095, 1081,
+     1082, 1096, 1083, 1097, 1084, 1098, 1085, 1099, 1086, 1100,
+     1101,  524, 1102, 1103, 1104, 1087, 1088, 1089, 1090, 1091,
+     1105, 1092,  416, 1093,  416,  420, 1094, 1095,  391,  518,
+     1096,  518, 1097,  378,  457, 1098,  342, 1099, 1100,  339,
+     1101, 1102, 1103,  336, 1104,  301,  299,  301,  296,  286,
+
+     1105,   62,   62,   62,   62,   62,   62,   62,   62,   62,
+       62,   62,   62,   62,   62,   62,   62,   62,   82,   82,
        82,   82,   82,   82,   82,   82,   82,   82,   82,   82,
-       82,   82,   82,   82,   82,   82,   82,   83,   82,   82,
-       82,   82,   82,   82,   84,   78,   78,   78,   90,   90,
-       40,   90,   90,   90,   90,   90,   90,   90,   91,   90,
-
-       91,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-       92,   93,   93,   90,   90,   90,   90,   93,   93,   93,
-       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
-       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
-       93,   93,   93,   90,   90,   90,  111,  112,  296,  111,
-      112,  178,  766,  179,  181,  182,  183,  113,  265,  266,
-      113,  185,  186,  187,  180,  180,  180,  180,  297,  114,
-      115,  116,  114,  115,  116,  117,  117,  118,  119,  120,
-      117,  117,  117,  121,  117,  117,  117,  117,  117,  122,
-      117,  117,  117,  117,  117,  117,  117,  117,  123,  123,
-
-      117,  117,  117,  117,  123,  123,  123,  123,  123,  123,
+       82,   82,   82,   82,   82,   85,   85,   85,   85,   85,
+       85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
+       85,   85,   88,   88,   88,   88,   88,   88,   88,   88,
+       88,   88,   88,   88,   88,   88,   88,   88,   88,   92,
+       92,   92,   92,   92,   92,   92,   92,   92,   92,   92,
+       92,   92,   92,   92,   92,   92,  100,  100,  100,  100,
+      100,  100,  100,  100,  100,  100,  100,  100,  100,  100,
+
+      100,  100,  100,   50,   50,   50,   50,   50,   50,   50,
+       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
+      112,  112,  112,  112,  112,  112,  112,  112,  112,  112,
+      112,  112,  112,  112,  112,  112,  112,  118,  118,  118,
+      118,  118,  118,  118,  118,  118,  118,  118,  118,  118,
+      118,  118,  118,  118,  123,  123,  123,  123,  123,  123,
       123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-      123,  123,  124,  123,  123,  123,  123,  123,  123,  125,
-      126,  117,  127,  136,  137,  138,  136,  137,  138,  206,
-      206,  207,  215,  215,  215,  215,  248,  248,  248,  248,
-      268,  269,  268,  269,  300,  331,  332,  139,  301,  765,
-      139,  140,  141,  142,  143,  140,  140,  140,  144,  140,
-      140,  145,  140,  140,  140,  146,  140,  140,  140,  140,
-      140,  140,  140,  140,  147,  147,  140,  140,  140,  140,
+      123,  127,  127,  127,  127,  127,  127,  127,  127,  127,
+      127,  127,  127,  127,  127,  127,  127,  127,  147,  147,
       147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
 
-      147,  147,  147,  147,  147,  147,  147,  147,  148,  147,
-      147,  147,  147,  147,  147,  149,  140,  140,  140,  150,
-      151,  152,  153,  154,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  155,  156,  150,  150,  150,
-      157,  150,  150,  150,  150,  150,  150,  150,  150,  158,
-      159,  160,  161,  162,  163,  164,  164,  165,  164,  164,
-      166,  167,  168,  169,  170,  164,  171,  172,  164,  173,
-      174,  175,  164,  176,  150,  150,  150,  191,  201,  202,
-      203,  258,  213,  213,  204,  289,  213,  213,  213,  213,
-      292,  290,  217,  218,  219,  383,  303,  275,  220,  259,
-
-      192,  188,  193,  276,  193,  221,  304,  335,  336,  293,
-      193,  222,  384,  193,  194,  195,  480,  193,  196,  223,
-      214,  306,  481,  197,  214,  198,  214,  317,  317,  317,
-      317,  307,  764,  205,  308,  181,  182,  183,  185,  186,
-      187,  189,  321,  322,  323,  339,  340,  205,  321,  322,
-      323,  387,  321,  322,  323,  388,  324,  324,  324,  324,
-      342,  342,  324,  324,  324,  324,  324,  324,  324,  324,
-      321,  322,  323,  201,  202,  203,  341,  344,  344,  204,
-      380,  258,  339,  340,  324,  324,  324,  324,  325,  217,
-      218,  219,  265,  266,  381,  220,  326,  439,  343,  259,
-
-      265,  266,  221,  248,  248,  248,  248,  673,  222,  268,
-      269,  268,  269,  327,  392,  402,  223,  409,  393,  440,
-      410,  416,  417,  418,  403,  331,  332,  763,  205,  411,
-      412,  317,  317,  317,  317,  419,  419,  419,  419,  721,
-      413,  331,  332,  722,  205,  357,  357,  358,  359,  357,
-      357,  357,  357,  357,  357,  360,  357,  357,  357,  357,
-      357,  357,  357,  357,  357,  357,  357,  357,  360,  360,
-      357,  357,  357,  357,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      357,  357,  357,  362,  363,  364,  365,  335,  336,  366,
-      335,  336,  339,  340,  367,  212,  212,  762,  368,  493,
-      494,  369,  761,  370,  417,  494,  371,  374,  374,  760,
-      374,  374,  374,  374,  374,  374,  374,  375,  374,  374,
-      374,  374,  374,  374,  374,  374,  374,  374,  374,  374,
-      375,  375,  374,  374,  374,  374,  375,  375,  375,  375,
-      375,  375,  375,  375,  375,  375,  375,  375,  375,  375,
-      375,  375,  375,  375,  375,  375,  375,  375,  375,  375,
-      375,  375,  374,  374,  374,  420,  322,  323,  427,  439,
-      439,  428,  428,  439,  339,  340,  431,  431,  439,  324,
-
-      324,  324,  324,  338,  439,  485,  339,  340,  486,  487,
-      439,  441,  443,  439,  442,  420,  322,  323,  450,  552,
-      759,  513,  493,  494,  516,  553,  444,  339,  340,  429,
-      338,  338,  439,  338,  338,  338,  338,  338,  338,  338,
-      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
-      338,  338,  338,  430,  430,  339,  340,  445,  338,  338,
+      147,  147,  147,  147,  147,  150,  150,  150,  150,  150,
+      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
+      150,  150,  156,  156,  156,  156,  156,  156,  156,  156,
+      156,  156,  156,  156,  156,  156,  156,  156,  156,  161,
+      161,  161,  161,  161,  161,  161,  161,  161,  161,  161,
+      161,  161,  161,  161,  161,  161,  200,  200,  200,  200,
+      200,  200,  200,  200,  200,  200,  200,  200,  200,  200,
+      200,  200,  200,  204,  204,  204,  204,  204,  204,  204,
+      204,  204,  204,  204,  204,  204,  204,  204,  204,  204,
+      220,  220,  220,  220,  220,  220,  220,  220,  220,  220,
+
+      220,  220,  220,  220,  220,  220,  220,  224,  224,  224,
+      224,  224,  224,  224,  224,  224,  224,  224,  224,  224,
+      224,  224,  224,  224,  231,  231,  282,  231,  231,  423,
+      422,  421,  231,  237,  237,  237,  237,  237,  237,  237,
+      237,  237,  237,  237,  237,  237,  237,  237,  237,  248,
+      248,  270,  248,  248,  420,  418,  417,  248,  259,  407,
+      259,  259,  259,  259,  259,  259,  259,  259,  259,  259,
+      259,  259,  259,  259,  259,  262,  254,  262,  262,  262,
+      262,  262,  262,  262,  262,  262,  262,  262,  262,  262,
+      262,  262,  268,  268,  268,  403,  268,  268,  250,  233,
+
+      229,  268,  280,  386,  280,  280,  280,  280,  280,  280,
+      280,  280,  280,  280,  280,  280,  280,  280,  280,  281,
+      385,  281,  281,  281,  281,  281,  281,  281,  281,  281,
+      281,  281,  281,  281,  281,  281,  285,  285,  285,  285,
+      285,  285,  285,  285,  285,  285,  285,  285,  384,  285,
+      382,  285,  285,  295,  381,  380,  295,  295,  295,  295,
+      295,  295,  295,  295,  295,  295,  295,  295,  295,  295,
+      303,  303,  378,  303,  303,  342,  340,  339,  303,  308,
+      338,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  311,  337,  311,  311,
+
+      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
+      317,  311,  311,  312,  336,  312,  335,  331,  312,  312,
+      312,  312,  312,  329,  328,  327,  312,  314,  326,  314,
+      314,  314,  314,  314,  314,  314,  314,  314,  314,  314,
+      314,  314,  314,  314,  318,  318,  322,  318,  318,  321,
+      317,  313,  318,  323,  323,  323,  323,  323,  323,  323,
+      323,  323,  323,  323,  323,  323,  323,  323,  323,  323,
+      330,  307,  330,  310,  330,  330,  330,  330,  330,  330,
+      330,  330,  330,  307,  330,  330,  330,  332,  306,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+
+      332,  332,  332,  332,  341,  304,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  345,  345,  302,  299,  345,  345,  377,  301,  377,
+      377,  377,  377,  377,  377,  377,  377,  377,  377,  377,
+      377,  377,  377,  377,  383,  297,  383,  383,  383,  296,
+      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
+      383,  231,  231,  294,  231,  231,  293,  292,  289,  231,
+      388,  288,  388,  388,  388,  388,  388,  388,  388,  388,
+      388,  388,  388,  388,  388,  388,  388,  389,  287,  389,
+      389,  389,  389,  389,  389,  389,  389,  389,  389,  389,
+
+      389,  389,  389,  389,  397,  397,  286,  282,  279,  397,
+      399,  399,  278,  270,  258,  399,  400,  400,  400,  400,
+      400,  400,  400,  400,  400,  400,  400,  400,  400,  400,
+      400,  400,  400,  248,  248,  257,  248,  248,  256,  250,
+      247,  248,  404,  404,  404,  404,  404,  404,  404,  404,
+      404,  404,  404,  404,  404,  404,  404,  404,  404,  409,
+      233,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  229,  409,  409,  259, 1106,  259,  259,
+      259,  259,  259,  259,  259,  259,  259,  259,  259,  259,
+      259,  259,  259,  419,  419,  111,  419,  419,  111, 1106,
+
+     1106,  419,  419,  424, 1106,  424,  424,  424,  424,  424,
+      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
+      280, 1106,  280,  280,  280,  280,  280,  280,  280,  280,
+      280,  280,  280,  280,  280,  280,  280,  281, 1106,  281,
+      281,  281,  281,  281,  281,  281,  281,  281,  281,  281,
+      281,  281,  281,  281,  426, 1106,  426,  426,  426,  426,
+      426,  426,  426,  426,  426,  426,  426,  426,  426,  426,
+      426,  427, 1106,  427,  427,  427,  427,  427,  427,  427,
+      427,  427,  427,  427,  427,  427,  427,  427,  285,  285,
+      285,  285,  285,  285,  285,  285,  285,  285,  285,  285,
+
+     1106,  285, 1106,  285,  285,  430,  430,  430,  430,  430,
       430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
+      430,  430,  295, 1106, 1106,  295,  295,  295,  295,  295,
+      295,  295,  295,  295,  295,  295,  295,  295,  295,  303,
+      303, 1106,  303,  303, 1106, 1106, 1106,  303,  312, 1106,
+      312, 1106, 1106,  312,  312,  312,  312,  312, 1106, 1106,
+     1106,  312,  314, 1106,  314,  314,  314,  314,  314,  314,
+      314,  314,  314,  314,  314,  314,  314,  314,  314,  318,
+      318, 1106,  318,  318, 1106, 1106, 1106,  318,  323,  323,
+      323,  323,  323,  323,  323,  323,  323,  323,  323,  323,
+
+      323,  323,  323,  323,  323,  330, 1106,  330, 1106,  330,
+      330,  330,  330,  330,  330,  330,  330,  330, 1106,  330,
+      330,  330,  447, 1106,  447,  447,  447,  447,  447,  447,
+      447,  447,  447,  447,  447,  447,  447,  447,  447,  341,
+     1106,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  345,  345, 1106, 1106,
+      345,  345,  377, 1106,  377,  377,  377,  377,  377,  377,
+      377,  377,  377,  377,  377,  377,  377,  377,  377,  383,
+     1106,  383,  383,  383, 1106,  383,  383,  383,  383,  383,
+      383,  383,  383,  383,  383,  383,  388, 1106,  388,  388,
+
+      388,  388,  388,  388,  388,  388,  388,  388,  388,  388,
+      388,  388,  388,  389, 1106,  389,  389,  389,  389,  389,
+      389,  389,  389,  389,  389,  389,  389,  389,  389,  389,
+      498,  498,  498,  498,  498,  498,  498,  498,  498,  498,
+      498,  498,  498,  498,  498,  498,  498,  507,  507, 1106,
+      507,  507, 1106, 1106, 1106,  507,  509,  509, 1106,  509,
+      509, 1106, 1106, 1106,  509,  400,  400,  400,  400,  400,
+      400,  400,  400,  400,  400,  400,  400,  400,  400,  400,
+      400,  400,  404,  404,  404,  404,  404,  404,  404,  404,
+      404,  404,  404,  404,  404,  404,  404,  404,  404,  409,
+
+     1106,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409, 1106,  409,  409,  419,  419, 1106,  419,
+      419, 1106, 1106, 1106,  419,  419,  424, 1106,  424,  424,
+      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
+      424,  424,  424,  426, 1106,  426,  426,  426,  426,  426,
+      426,  426,  426,  426,  426,  426,  426,  426,  426,  426,
+      427, 1106,  427,  427,  427,  427,  427,  427,  427,  427,
+      427,  427,  427,  427,  427,  427,  427,  430,  430,  430,
       430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  338,  338,  338,  432,  432,
-      432,  432,  758,  439,  339,  340,  432,  757,  339,  340,
-
-      495,  417,  418,  432,  432,  432,  432,  432,  432,  360,
-      360,  439,  438,  360,  360,  360,  360,  360,  360,  448,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  439,  439,  360,  360,  360,  360,  439,  446,
-      501,  501,  447,  504,  504,  416,  417,  418,  616,  617,
-      339,  340,  638,  339,  340,  515,  439,  439,  449,  419,
-      419,  419,  419,  514,  360,  360,  360,  375,  375,  580,
-      375,  375,  375,  375,  375,  375,  375,  439,  375,  375,
-      375,  375,  375,  375,  375,  375,  375,  375,  375,  375,
-      517,  439,  375,  375,  375,  375,  495,  417,  418,  439,
-
-      439,  511,  439,  512,  439,  439,  339,  340,  209,  439,
-      419,  419,  419,  419,  439,  519,  520,  581,  518,  522,
-      566,  566,  375,  375,  375,  500,  500,  573,  521,  578,
-      339,  340,  500,  500,  500,  500,  500,  500,  500,  500,
-      500,  500,  500,  500,  500,  500,  500,  500,  500,  500,
-      500,  500,  500,  500,  500,  500,  500,  502,  502,  502,
-      502,  532,  439,  439,  439,  502,  439,  339,  340,  439,
-      339,  340,  502,  502,  502,  502,  502,  502,  505,  505,
-      505,  505,  439,  533,  582,  576,  505,  574,  579,  534,
-      575,  439,  439,  505,  505,  505,  505,  505,  505,  567,
-
-      567,  567,  567,  590,  339,  340,  338,  567,  577,  583,
-      439,  439,  625,  591,  567,  567,  567,  567,  567,  567,
-      439,  439,  624,  439,  439,  439,  439,  439,  439,  439,
-      616,  617,  439,  623,  616,  617,  685,  686,  685,  686,
-      756,  628,  626,  632,  708,  755,  634,  685,  686,  302,
-      302,  627,  629,  754,  753,  630,  631,  633,  752,  751,
-      750,  709,  669,   52,   52,   52,   52,   52,   52,   52,
-       52,   52,   52,   52,   52,   52,   52,   52,   52,   69,
-       69,   69,   69,   69,   69,   69,   69,   69,   69,   69,
-       69,   69,   69,   69,   69,   72,   72,   72,   72,   72,
-
-       72,   72,   72,   72,   72,   72,   72,   72,   72,   72,
-       72,   76,   76,   76,   76,   76,   76,   76,   76,   76,
-       76,   76,   76,   76,   76,   76,   76,   86,   86,   86,
-       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-       86,   86,   86,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   95,
-       95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
-       95,   95,   95,   95,   95,  101,  101,  101,  101,  101,
-      101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-      101,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-
-      106,  106,  106,  106,  106,  106,  106,  110,  110,  110,
-      110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
-      110,  110,  110,  128,  128,  128,  128,  128,  128,  128,
-      128,  128,  128,  128,  128,  128,  128,  128,  128,  131,
-      131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
-      131,  131,  131,  131,  131,  135,  135,  135,  135,  135,
-      135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
-      135,  177,  177,  177,  177,  177,  177,  177,  177,  177,
-      177,  177,  177,  177,  177,  177,  177,  184,  184,  184,
-      184,  749,  748,  184,  184,  184,  190,  190,  190,  190,
-
-      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
-      190,  200,  200,  200,  200,  747,  746,  200,  200,  200,
-      209,  745,  209,  209,  209,  209,  209,  209,  209,  209,
-      209,  209,  209,  209,  209,  209,  212,  744,  212,  212,
-      212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
-      212,  212,  216,  216,  216,  743,  742,  216,  216,  216,
-      227,  741,  227,  227,  227,  227,  227,  227,  227,  227,
-      227,  227,  227,  227,  227,  227,  229,  740,  229,  229,
-      229,  229,  229,  229,  229,  229,  229,  229,  229,  229,
-      229,  229,  230,  739,  230,  230,  230,  230,  230,  230,
-
-      230,  230,  230,  230,  230,  230,  230,  230,  234,  234,
-      234,  234,  234,  234,  234,  234,  234,  234,  234,  234,
-      234,  234,  234,  234,  236,  738,  236,  236,  737,  236,
-      236,  236,  736,  735,  236,  236,  734,  733,  732,  236,
-      238,  238,  238,  238,  731,  730,  238,  238,  238,  242,
-      729,  242,  242,  242,  242,  242,  242,  242,  242,  242,
-      242,  242,  242,  242,  242,  246,  246,  246,  246,  728,
-      727,  246,  246,  246,  251,  726,  251,  251,  251,  251,
-      251,  251,  251,  251,  251,  251,  251,  251,  251,  251,
-      254,  725,  254,  254,  254,  254,  254,  254,  254,  254,
-
-      254,  724,  254,  254,  254,  254,  255,  723,  720,  719,
-      255,  255,  255,  255,  718,  717,  255,  255,  257,  716,
-      257,  257,  257,  257,  257,  257,  257,  257,  257,  257,
-      257,  257,  257,  257,  261,  261,  261,  261,  715,  714,
-      261,  261,  261,  264,  264,  264,  264,  264,  264,  264,
-      264,  264,  264,  264,  264,  264,  264,  264,  264,  267,
-      267,  267,  267,  713,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  271,  712,  711,  271,  271,
-      271,  271,  271,  271,  271,  710,  271,  271,  271,  271,
-      271,  273,  707,  273,  273,  273,  273,  273,  273,  273,
-
-      273,  273,  273,  273,  273,  273,  273,  274,  706,  274,
-      274,  705,  274,  274,  274,  704,  703,  274,  274,  702,
-      701,  700,  274,  279,  279,  279,  279,  699,  698,  279,
-      279,  279,  284,  697,  284,  284,  284,  284,  284,  284,
-      284,  284,  284,  284,  284,  284,  284,  284,  288,  288,
-      696,  288,  288,  695,  694,  693,  288,  288,  315,  692,
-      315,  315,  315,  315,  315,  315,  315,  315,  315,  315,
-      315,  315,  315,  315,  319,  691,  319,  319,  319,  319,
-      319,  319,  319,  319,  319,  319,  319,  319,  319,  319,
-      320,  690,  320,  320,  320,  320,  320,  320,  320,  320,
-
-      320,  320,  320,  320,  320,  320,  328,  328,  689,  688,
-      328,  328,  328,  329,  329,  687,  683,  329,  329,  329,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-      330,  330,  330,  330,  330,  330,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  338,  682,  338,  338,  338,  338,  338,  338,
-      338,  338,  338,  681,  338,  338,  338,  338,  209,  680,
-      209,  209,  209,  209,  209,  209,  209,  209,  209,  209,
-      209,  209,  209,  209,  345,  345,  679,  678,  677,  676,
-      345,  346,  346,  346,  346,  675,  674,  346,  346,  346,
-
-      346,  351,  673,  351,  351,  351,  351,  351,  351,  351,
-      351,  351,  351,  351,  351,  351,  351,  227,  672,  227,
-      227,  227,  227,  227,  227,  227,  227,  227,  227,  227,
-      227,  227,  227,  229,  671,  229,  229,  229,  229,  229,
-      229,  229,  229,  229,  229,  229,  229,  229,  229,  230,
-      670,  230,  230,  230,  230,  230,  230,  230,  230,  230,
-      230,  230,  230,  230,  230,  353,  668,  353,  353,  353,
-      353,  353,  353,  353,  353,  353,  353,  353,  353,  353,
-      353,  354,  667,  354,  354,  354,  354,  354,  354,  354,
-      354,  354,  354,  354,  354,  354,  354,  234,  234,  234,
-
-      234,  234,  234,  234,  234,  234,  234,  234,  234,  234,
-      234,  234,  234,  236,  666,  236,  236,  665,  236,  236,
-      236,  664,  663,  236,  236,  662,  661,  660,  236,  238,
-      238,  238,  238,  659,  658,  238,  238,  238,  242,  657,
-      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
-      242,  242,  242,  242,  246,  246,  246,  246,  656,  655,
-      246,  246,  246,  361,  361,  654,  653,  652,  361,  361,
-      255,  651,  650,  649,  255,  255,  255,  255,  648,  647,
-      255,  255,  257,  646,  257,  257,  257,  257,  257,  257,
-      257,  257,  257,  257,  257,  257,  257,  257,  261,  261,
-
-      261,  261,  645,  644,  261,  261,  261,  264,  264,  264,
-      264,  264,  264,  264,  264,  264,  264,  264,  264,  264,
-      264,  264,  264,  267,  267,  267,  267,  643,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  271,
-      642,  641,  271,  271,  271,  271,  271,  271,  271,  640,
-      271,  271,  271,  271,  271,  274,  639,  274,  274,  638,
-      274,  274,  274,  637,  636,  274,  274,  635,  622,  621,
-      274,  279,  279,  279,  279,  620,  619,  279,  279,  279,
-      284,  618,  284,  284,  284,  284,  284,  284,  284,  284,
-      284,  284,  284,  284,  284,  284,  288,  288,  560,  288,
-
-      288,  614,  613,  612,  288,  288,  315,  611,  315,  315,
-      315,  315,  315,  315,  315,  315,  315,  315,  315,  315,
-      315,  315,  319,  610,  319,  319,  319,  319,  319,  319,
-      319,  319,  319,  319,  319,  319,  319,  319,  320,  609,
-      320,  320,  320,  320,  320,  320,  320,  320,  320,  320,
-      320,  320,  320,  320,  415,  415,  415,  415,  415,  415,
-      415,  415,  415,  415,  415,  415,  415,  415,  415,  415,
-      424,  424,  424,  424,  608,  607,  424,  424,  424,  425,
-      425,  425,  425,  606,  605,  425,  425,  425,  330,  330,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-
-      330,  330,  330,  330,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      338,  604,  338,  338,  338,  338,  338,  338,  338,  338,
-      338,  603,  338,  338,  338,  338,  433,  433,  602,  601,
-      600,  599,  433,  346,  346,  346,  346,  598,  597,  346,
-      346,  346,  346,  351,  596,  351,  351,  351,  351,  351,
-      351,  351,  351,  351,  351,  351,  351,  351,  351,  615,
-      615,  615,  615,  615,  615,  615,  615,  615,  615,  615,
-      615,  615,  615,  615,  615,  684,  684,  684,  684,  684,
-      684,  684,  684,  684,  684,  684,  684,  684,  684,  684,
-
-      684,  595,  594,  593,  592,  589,  588,  587,  586,  585,
-      584,  571,  570,  569,  568,  565,  564,  563,  562,  561,
-      560,  559,  558,  557,  556,  555,  554,  551,  550,  549,
-      548,  547,  546,  545,  544,  543,  542,  541,  540,  539,
-      538,  537,  536,  535,  531,  530,  529,  528,  527,  526,
-      525,  524,  523,  510,  509,  508,  507,  506,  503,  499,
-      498,  497,  496,  492,  491,  490,  489,  488,  484,  483,
-      482,  479,  478,  477,  476,  475,  474,  473,  472,  471,
-      470,  469,  468,  467,  466,  465,  464,  463,  462,  461,
-      460,  459,  458,  457,  456,  455,  454,  453,  452,  451,
-
-      439,  437,  436,  435,  434,  347,  426,  423,  422,  421,
-      322,  414,  316,  408,  407,  406,  401,  400,  399,  398,
-      397,  396,  395,  394,  391,  390,  389,  386,  385,  382,
-      379,  378,  285,  282,  377,  376,  278,  373,  372,  243,
-      356,  355,  235,  231,  352,  350,  349,  348,  218,  347,
-      337,  206,  333,  202,  318,  186,  182,  316,  314,  313,
-      312,  311,  310,  309,  305,  299,  298,  295,  294,  291,
-      287,  286,  285,  283,  282,  281,  280,  260,  278,  277,
-      272,  270,  263,  262,  260,  256,  250,  253,  250,  249,
-      247,  245,  244,  243,  241,  240,  239,  237,  235,  228,
-
-      231,  228,  226,  218,  208,  202,  199,  186,  182,  768,
-       94,   94,   85,   77,   77,   39,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768
+      430,  430,  430,  430,  437,  437,  437,  318,  318, 1106,
+
+      318,  318, 1106, 1106, 1106,  318,  447, 1106,  447,  447,
+      447,  447,  447,  447,  447,  447,  447,  447,  447,  447,
+      447,  447,  447,  605, 1106,  605,  605,  605,  605,  605,
+      605,  605,  605,  605,  605,  605,  605,  605,  605,  605,
+      774,  774,  774,  774,  774,  774,  774,  774,  774,  774,
+      774,  774,  774,  774,  774,  774,  774,  916,  916,  916,
+      916,  916,  916,  916,  916,  916,  916,  916,  916,  916,
+      916,  916,  916,  916,   49, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106
     } ;
 
-static yyconst short int yy_chk[2775] =
+static yyconst flex_int16_t yy_chk[4060] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    2,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    2,    2,    2,    2,    2,    2,
+        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+
+        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-
         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-        2,    2,    2,    2,    2,    2,    3,    3,    3,    3,
-      765,    3,    5,    5,    3,    3,    3,   27,   27,    3,
-        6,    6,    6,   28,   28,    3,    6,   11,   11,   11,
-        3,    3,   12,   12,   12,   48,   17,   17,   66,   29,
-       29,   60,   60,   18,   18,  310,   17,   29,  310,   17,
-       17,   17,   17,   18,   61,   61,   18,   18,   18,   18,
-        3,    3,    3,    4,    4,    4,    4,  109,    4,    4,
-       21,    4,    4,    4,  511,   48,    4,   19,   19,   19,
-       22,  109,    4,   20,   20,   20,   66,    4,    4,  141,
-
-        4,   17,   61,   21,   21,  141,   21,   37,   18,   37,
-       75,   19,   75,   22,   22,  511,   22,   20,   30,   30,
-       37,   37,   37,   37,  128,  128,   30,    4,    4,    4,
-        9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-        9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-        9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-        9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-        9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-        9,    9,    9,    9,    9,    9,    9,    9,   13,   13,
+        2,    2,    2,    2,    2,    2,    2,    2,    3,    3,
+       96,    3,    3,    5,    3,    5,    7,    3,    3,    3,
+        3,    8,  992,    3,    3,    6,    6,  942,    6,   21,
+        3,  941,    6,    3,    9,  126,    9,   11,   11,   96,
+
+       11,   12,   12,  940,   12,   17,  939,   17,   19,  138,
+       19,   19,   27,   20,   27,   20,   20,   17,   22,    3,
+        3,   17,   17,   17,   17,   28,    7,   28,    7,   51,
+       51,    8,   51,    8,  126,   10,    9,   10,   79,   21,
+       21,   10,   21,    9,    9,   87,    9,   87,    3,    3,
+        3,    4,    4,  138,    4,    4,  938,    4,    4,   19,
+        4,    4,    4,    4,   20,    9,    4,    4,   22,   22,
+       95,   22,    9,    4,   73,   73,    4,   10,   23,   37,
+       23,   45,   37,   45,   10,   10,   17,   10,  259,  259,
+       45,   23,  142,  263,  263,   37,   37,   37,   37,  937,
+
+       95,   38,    4,    4,   38,    4,   10,   46,  147,   46,
+      147,   79,   47,   10,   47,  936,   46,   38,   38,   38,
+       38,  142,   47,   55,   55,  149,   55,  149,   23,   23,
+       23,    4,    4,    4,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-
        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-       13,   13,   13,   13,   13,   13,   23,   23,  163,   24,
-       24,   38,  764,   38,   41,   41,   41,   23,  130,  130,
-       24,   45,   45,   45,   38,   38,   38,   38,  163,   23,
-       23,   23,   24,   24,   24,   25,   25,   25,   25,   25,
+
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   18,   24,
+       18,   24,  168,   29,   58,   29,   74,   74,  935,   30,
+       18,   30,   24,   29,   18,   18,   18,   18,   31,   30,
+       31,   31,   32,  191,   32,   32,   48,  162,   48,   67,
+       67,  168,   67,  246,  162,  246,   48,   75,   74,   75,
+      141,   58,   75,   75,   75,   75,  167,  176,  177,   24,
+       24,   24,  191,   29,  253,   29,  253,  105,  105,   30,
+      105,   30,  116,  116,  116,  116,  294,   74,  294,   31,
+      141,   58,  323,   32,  323,  934,  167,  176,  177,   18,
+
        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-
        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-       25,   25,   25,   31,   31,   31,   32,   32,   32,   57,
-       57,   57,   62,   62,   62,   62,   99,   99,   99,   99,
-      131,  131,  133,  133,  167,  198,  198,   31,  167,  763,
-       32,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-
-       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-       33,   33,   33,   33,   33,   33,   33,   33,   33,   35,
+       25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
+       25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
+       25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
+       25,   25,   25,   25,   33,   33,   39,   33,   39,   34,
+       34,   33,   34,  182,   41,   42,   34,  333,   43,  181,
+
+       33,   41,   42,  186,  333,   34,  203,  203,  203,  203,
+      325,   43,  325,  181,   41,   42,  179,  187,  179,  188,
+      314,   43,  179,  182,   41,   42,   43,   33,  194,   41,
+       42,  199,   34,  186,   33,   33,   39,   33,   39,   34,
+       34,   43,   34,  181,   41,   42,  179,  187,  179,  188,
+       43,  179,  933,   41,   42,   43,   33,  194,   41,   42,
+      199,   34,  932,   33,  314,   39,  931,   39,   34,   35,
        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
+
        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
        35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   35,   49,   53,   53,
-       53,  121,  105,  105,   53,  158,  108,  108,  115,  115,
-      160,  158,   63,   63,   63,  291,  168,  275,   63,  121,
-
-       49,  188,   49,  275,   49,   63,  168,  205,  205,  160,
-       49,   63,  291,   49,   49,   49,  405,   49,   49,   63,
-      105,  170,  405,   49,  108,   49,  115,  180,  180,  180,
-      180,  170,  762,   53,  170,  181,  181,  181,  185,  185,
-      185,  188,  192,  192,  192,  209,  209,   63,  193,  193,
-      193,  294,  194,  194,  194,  294,  192,  192,  192,  192,
-      211,  211,  193,  193,  193,  193,  194,  194,  194,  194,
-      195,  195,  195,  201,  201,  201,  210,  213,  213,  201,
-      289,  257,  210,  210,  195,  195,  195,  195,  192,  217,
-      217,  217,  264,  264,  289,  217,  194,  362,  211,  257,
-
-      266,  266,  217,  248,  248,  248,  248,  761,  217,  267,
-      267,  269,  269,  195,  298,  309,  217,  314,  298,  362,
-      314,  321,  321,  321,  309,  330,  330,  760,  201,  314,
-      314,  317,  317,  317,  317,  321,  321,  321,  321,  708,
-      314,  332,  332,  708,  217,  241,  241,  241,  241,  241,
-      241,  241,  241,  241,  241,  241,  241,  241,  241,  241,
-      241,  241,  241,  241,  241,  241,  241,  241,  241,  241,
-      241,  241,  241,  241,  241,  241,  241,  241,  241,  241,
-      241,  241,  241,  241,  241,  241,  241,  241,  241,  241,
-      241,  241,  241,  241,  241,  241,  241,  241,  241,  241,
-
-      241,  241,  241,  250,  250,  250,  250,  334,  334,  250,
-      336,  336,  338,  338,  250,  344,  344,  757,  250,  415,
-      415,  250,  756,  250,  418,  418,  250,  278,  278,  755,
-      278,  278,  278,  278,  278,  278,  278,  278,  278,  278,
-      278,  278,  278,  278,  278,  278,  278,  278,  278,  278,
-      278,  278,  278,  278,  278,  278,  278,  278,  278,  278,
-      278,  278,  278,  278,  278,  278,  278,  278,  278,  278,
-      278,  278,  278,  278,  278,  278,  278,  278,  278,  278,
-      278,  278,  278,  278,  278,  324,  324,  324,  339,  363,
-      364,  340,  340,  365,  339,  339,  342,  342,  366,  324,
-
-      324,  324,  324,  340,  371,  409,  342,  342,  409,  409,
-      441,  363,  365,  444,  364,  420,  420,  420,  371,  485,
-      754,  441,  494,  494,  444,  485,  366,  504,  504,  340,
-      341,  341,  367,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  367,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  343,  343,
-      343,  343,  752,  369,  505,  505,  343,  750,  343,  343,
-
-      495,  495,  495,  343,  343,  343,  343,  343,  343,  360,
-      360,  368,  360,  360,  360,  360,  360,  360,  360,  369,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  370,  442,  360,  360,  360,  360,  443,  368,
-      428,  428,  368,  431,  431,  416,  416,  416,  561,  561,
-      428,  428,  749,  431,  431,  443,  519,  445,  370,  416,
-      416,  416,  416,  442,  360,  360,  360,  375,  375,  519,
-      375,  375,  375,  375,  375,  375,  375,  440,  375,  375,
-      375,  375,  375,  375,  375,  375,  375,  375,  375,  375,
-      445,  447,  375,  375,  375,  375,  419,  419,  419,  446,
-
-      450,  440,  449,  440,  520,  448,  503,  503,  503,  512,
-      419,  419,  419,  419,  517,  447,  448,  520,  446,  450,
-      501,  501,  375,  375,  375,  427,  427,  512,  449,  517,
-      501,  501,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  429,  429,  429,
-      429,  462,  514,  513,  518,  429,  515,  566,  566,  521,
-      567,  567,  429,  429,  429,  429,  429,  429,  432,  432,
-      432,  432,  516,  462,  521,  515,  432,  513,  518,  462,
-      514,  574,  522,  432,  432,  432,  432,  432,  432,  502,
-
-      502,  502,  502,  532,  565,  565,  565,  502,  516,  522,
-      572,  573,  574,  532,  502,  502,  502,  502,  502,  502,
-      575,  576,  573,  577,  578,  579,  580,  583,  581,  582,
-      615,  615,  634,  572,  617,  617,  656,  656,  684,  684,
-      748,  577,  575,  581,  681,  747,  583,  686,  686,  810,
-      810,  576,  578,  745,  744,  579,  580,  582,  743,  742,
-      740,  681,  634,  769,  769,  769,  769,  769,  769,  769,
-      769,  769,  769,  769,  769,  769,  769,  769,  769,  770,
-      770,  770,  770,  770,  770,  770,  770,  770,  770,  770,
-      770,  770,  770,  770,  770,  771,  771,  771,  771,  771,
-
-      771,  771,  771,  771,  771,  771,  771,  771,  771,  771,
-      771,  772,  772,  772,  772,  772,  772,  772,  772,  772,
-      772,  772,  772,  772,  772,  772,  772,  773,  773,  773,
-      773,  773,  773,  773,  773,  773,  773,  773,  773,  773,
-      773,  773,  773,  774,  774,  774,  774,  774,  774,  774,
-      774,  774,  774,  774,  774,  774,  774,  774,  774,  775,
-      775,  775,  775,  775,  775,  775,  775,  775,  775,  775,
-      775,  775,  775,  775,  775,  776,  776,  776,  776,  776,
-      776,  776,  776,  776,  776,  776,  776,  776,  776,  776,
-      776,  777,  777,  777,  777,  777,  777,  777,  777,  777,
-
-      777,  777,  777,  777,  777,  777,  777,  778,  778,  778,
-      778,  778,  778,  778,  778,  778,  778,  778,  778,  778,
-      778,  778,  778,  779,  779,  779,  779,  779,  779,  779,
-      779,  779,  779,  779,  779,  779,  779,  779,  779,  780,
-      780,  780,  780,  780,  780,  780,  780,  780,  780,  780,
-      780,  780,  780,  780,  780,  781,  781,  781,  781,  781,
-      781,  781,  781,  781,  781,  781,  781,  781,  781,  781,
-      781,  782,  782,  782,  782,  782,  782,  782,  782,  782,
-      782,  782,  782,  782,  782,  782,  782,  783,  783,  783,
-      783,  739,  738,  783,  783,  783,  784,  784,  784,  784,
-
-      784,  784,  784,  784,  784,  784,  784,  784,  784,  784,
-      784,  785,  785,  785,  785,  737,  736,  785,  785,  785,
-      786,  735,  786,  786,  786,  786,  786,  786,  786,  786,
-      786,  786,  786,  786,  786,  786,  787,  734,  787,  787,
-      787,  787,  787,  787,  787,  787,  787,  787,  787,  787,
-      787,  787,  788,  788,  788,  733,  732,  788,  788,  788,
-      789,  731,  789,  789,  789,  789,  789,  789,  789,  789,
-      789,  789,  789,  789,  789,  789,  790,  729,  790,  790,
-      790,  790,  790,  790,  790,  790,  790,  790,  790,  790,
-      790,  790,  791,  727,  791,  791,  791,  791,  791,  791,
-
-      791,  791,  791,  791,  791,  791,  791,  791,  792,  792,
-      792,  792,  792,  792,  792,  792,  792,  792,  792,  792,
-      792,  792,  792,  792,  793,  726,  793,  793,  725,  793,
-      793,  793,  724,  723,  793,  793,  722,  721,  720,  793,
-      794,  794,  794,  794,  719,  718,  794,  794,  794,  795,
-      717,  795,  795,  795,  795,  795,  795,  795,  795,  795,
-      795,  795,  795,  795,  795,  796,  796,  796,  796,  715,
-      714,  796,  796,  796,  797,  713,  797,  797,  797,  797,
-      797,  797,  797,  797,  797,  797,  797,  797,  797,  797,
-      798,  712,  798,  798,  798,  798,  798,  798,  798,  798,
-
-      798,  710,  798,  798,  798,  798,  799,  709,  707,  706,
-      799,  799,  799,  799,  705,  704,  799,  799,  800,  703,
-      800,  800,  800,  800,  800,  800,  800,  800,  800,  800,
-      800,  800,  800,  800,  801,  801,  801,  801,  702,  701,
-      801,  801,  801,  802,  802,  802,  802,  802,  802,  802,
-      802,  802,  802,  802,  802,  802,  802,  802,  802,  803,
-      803,  803,  803,  700,  803,  803,  803,  803,  803,  803,
-      803,  803,  803,  803,  803,  804,  699,  698,  804,  804,
-      804,  804,  804,  804,  804,  682,  804,  804,  804,  804,
-      804,  805,  680,  805,  805,  805,  805,  805,  805,  805,
-
-      805,  805,  805,  805,  805,  805,  805,  806,  679,  806,
-      806,  678,  806,  806,  806,  677,  675,  806,  806,  674,
-      672,  671,  806,  807,  807,  807,  807,  670,  669,  807,
-      807,  807,  808,  668,  808,  808,  808,  808,  808,  808,
-      808,  808,  808,  808,  808,  808,  808,  808,  809,  809,
-      667,  809,  809,  666,  665,  664,  809,  809,  811,  663,
-      811,  811,  811,  811,  811,  811,  811,  811,  811,  811,
-      811,  811,  811,  811,  812,  662,  812,  812,  812,  812,
-      812,  812,  812,  812,  812,  812,  812,  812,  812,  812,
-      813,  661,  813,  813,  813,  813,  813,  813,  813,  813,
-
-      813,  813,  813,  813,  813,  813,  814,  814,  660,  659,
-      814,  814,  814,  815,  815,  658,  655,  815,  815,  815,
-      816,  816,  816,  816,  816,  816,  816,  816,  816,  816,
-      816,  816,  816,  816,  816,  816,  817,  817,  817,  817,
-      817,  817,  817,  817,  817,  817,  817,  817,  817,  817,
-      817,  817,  818,  653,  818,  818,  818,  818,  818,  818,
-      818,  818,  818,  652,  818,  818,  818,  818,  819,  651,
-      819,  819,  819,  819,  819,  819,  819,  819,  819,  819,
-      819,  819,  819,  819,  820,  820,  650,  646,  644,  643,
-      820,  821,  821,  821,  821,  642,  641,  821,  821,  821,
-
-      821,  822,  639,  822,  822,  822,  822,  822,  822,  822,
-      822,  822,  822,  822,  822,  822,  822,  823,  637,  823,
-      823,  823,  823,  823,  823,  823,  823,  823,  823,  823,
-      823,  823,  823,  824,  636,  824,  824,  824,  824,  824,
-      824,  824,  824,  824,  824,  824,  824,  824,  824,  825,
-      635,  825,  825,  825,  825,  825,  825,  825,  825,  825,
-      825,  825,  825,  825,  825,  826,  633,  826,  826,  826,
-      826,  826,  826,  826,  826,  826,  826,  826,  826,  826,
-      826,  827,  632,  827,  827,  827,  827,  827,  827,  827,
-      827,  827,  827,  827,  827,  827,  827,  828,  828,  828,
-
-      828,  828,  828,  828,  828,  828,  828,  828,  828,  828,
-      828,  828,  828,  829,  631,  829,  829,  630,  829,  829,
-      829,  629,  628,  829,  829,  627,  626,  625,  829,  830,
-      830,  830,  830,  624,  623,  830,  830,  830,  831,  621,
-      831,  831,  831,  831,  831,  831,  831,  831,  831,  831,
-      831,  831,  831,  831,  832,  832,  832,  832,  619,  612,
-      832,  832,  832,  833,  833,  611,  610,  609,  833,  833,
-      834,  608,  607,  606,  834,  834,  834,  834,  604,  601,
-      834,  834,  835,  600,  835,  835,  835,  835,  835,  835,
-      835,  835,  835,  835,  835,  835,  835,  835,  836,  836,
-
-      836,  836,  599,  598,  836,  836,  836,  837,  837,  837,
-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,
-      837,  837,  837,  838,  838,  838,  838,  597,  838,  838,
-      838,  838,  838,  838,  838,  838,  838,  838,  838,  839,
-      596,  595,  839,  839,  839,  839,  839,  839,  839,  594,
-      839,  839,  839,  839,  839,  840,  593,  840,  840,  592,
-      840,  840,  840,  591,  590,  840,  840,  588,  569,  568,
-      840,  841,  841,  841,  841,  564,  563,  841,  841,  841,
-      842,  562,  842,  842,  842,  842,  842,  842,  842,  842,
-      842,  842,  842,  842,  842,  842,  843,  843,  560,  843,
-
-      843,  559,  558,  557,  843,  843,  844,  556,  844,  844,
-      844,  844,  844,  844,  844,  844,  844,  844,  844,  844,
-      844,  844,  845,  555,  845,  845,  845,  845,  845,  845,
-      845,  845,  845,  845,  845,  845,  845,  845,  846,  554,
-      846,  846,  846,  846,  846,  846,  846,  846,  846,  846,
-      846,  846,  846,  846,  847,  847,  847,  847,  847,  847,
-      847,  847,  847,  847,  847,  847,  847,  847,  847,  847,
-      848,  848,  848,  848,  553,  552,  848,  848,  848,  849,
-      849,  849,  849,  551,  549,  849,  849,  849,  850,  850,
-      850,  850,  850,  850,  850,  850,  850,  850,  850,  850,
-
-      850,  850,  850,  850,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      852,  548,  852,  852,  852,  852,  852,  852,  852,  852,
-      852,  546,  852,  852,  852,  852,  853,  853,  545,  544,
-      543,  542,  853,  854,  854,  854,  854,  541,  540,  854,
-      854,  854,  854,  855,  539,  855,  855,  855,  855,  855,
-      855,  855,  855,  855,  855,  855,  855,  855,  855,  856,
-      856,  856,  856,  856,  856,  856,  856,  856,  856,  856,
-      856,  856,  856,  856,  856,  857,  857,  857,  857,  857,
-      857,  857,  857,  857,  857,  857,  857,  857,  857,  857,
-
-      857,  538,  536,  534,  533,  530,  528,  526,  525,  524,
-      523,  509,  508,  507,  506,  500,  499,  498,  497,  496,
-      492,  491,  490,  489,  488,  487,  486,  483,  482,  481,
-      480,  479,  478,  476,  475,  474,  473,  472,  471,  469,
-      468,  467,  464,  463,  461,  460,  459,  458,  457,  454,
-      453,  452,  451,  439,  437,  436,  435,  434,  430,  426,
-      423,  422,  421,  414,  413,  412,  411,  410,  408,  407,
-      406,  404,  403,  402,  401,  400,  399,  398,  397,  396,
-      395,  394,  393,  392,  391,  390,  388,  387,  386,  384,
-      383,  382,  381,  380,  379,  378,  377,  376,  373,  372,
-
-      361,  356,  355,  352,  350,  346,  337,  327,  326,  325,
-      323,  318,  315,  313,  312,  311,  308,  307,  306,  305,
-      303,  301,  300,  299,  297,  296,  295,  293,  292,  290,
-      287,  286,  284,  282,  281,  280,  276,  263,  262,  243,
-      240,  239,  234,  231,  226,  222,  221,  220,  219,  216,
-      208,  207,  204,  203,  189,  187,  183,  179,  176,  175,
-      174,  173,  172,  171,  169,  166,  165,  162,  161,  159,
-      156,  155,  154,  153,  151,  149,  148,  146,  144,  143,
-      137,  134,  125,  124,  122,  119,  114,  112,  107,  103,
-       97,   92,   89,   87,   85,   84,   83,   80,   76,   74,
-
-       73,   71,   67,   65,   59,   55,   50,   47,   43,   39,
-       16,   15,   10,    8,    7,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768
+       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
+       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
+       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
+       35,   35,   35,   40,   44,   40,   63,   63,  193,   63,
+      122,  122,  347,   63,  183,   76,   76,   44,   76,  125,
+      125,  348,   76,  350,  195,  132,  132,   44,  180,  184,
+      190,   76,   44,  409,  409,  183,  180,   76,  193,  930,
+      190,  347,  122,  196,  183,  197,  198,   44,  873,  184,
+
+      348,  125,  350,   40,  195,   40,   44,  132,  180,  184,
+      190,   44,  236,  189,  183,  244,  180,  189,  235,   76,
+      190,  122,  258,  196,  872,  197,  198,  278,  184,  871,
+      125,  290,   40,  291,   40,   59,  132,   63,  228,  228,
+      192,  228,  236,  189,  260,  244,   76,  189,  232,  232,
+      192,  232,  258,  192,   59,  235,   59,  278,   59,  249,
+      249,  290,  249,  291,   59,  870,  249,   59,   59,   59,
+      192,   59,   59,   59,  260,  260,  869,   59,  298,  298,
+      192,  298,  192,  868,   59,  235,   59,  867,   59,  319,
+      320,  866,  239,  239,   59,  239,  865,   59,   59,   59,
+
+       59,   59,   59,  864,  240,  240,   59,  240,   59,  239,
+      239,  239,  239,  241,  241,  863,  241,  261,  261,  319,
+      320,  240,  240,  240,  240,  242,  242,  352,  242,  343,
+      241,  241,  241,  241,  354,  239,  305,  305,  305,  305,
+      249,  344,  242,  242,  242,  242,  346,  862,  355,  261,
+      269,  269,  349,  269,  241,  357,  352,  269,  353,  343,
+      346,  356,  353,  354,  239,  242,  269,  358,  861,  349,
+      359,  344,  269,  360,  359,  361,  346,  355,  261,  362,
+      364,  366,  349,  367,  241,  357,  368,  369,  353,  346,
+      356,  371,  353,  372,  371,  242,  368,  358,  349,  374,
+
+      359,  375,  360,  359,  269,  361,  415,  415,  362,  364,
+      366,  400,  367,  400,  614,  614,  368,  369,  402,  860,
+      402,  371,  859,  372,  371,  368,  858,  387,  374,  394,
+      375,  269,  307,  307,  307,  307,  307,  307,  307,  307,
+      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      307,  307,  307,  307,  307,  307,  307,  387,  394,  404,
+      307,  404,  307,  307,  307,  307,  307,  307,  307,  307,
+      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      307,  307,  307,  307,  307,  307,  370,  373,  390,  390,
+      370,  390,  395,  396,  373,  370,  379,  379,  379,  379,
+
+      398,  406,  430,  406,  430,  390,  390,  390,  390,  408,
+      410,  857,  423,  411,  411,  856,  370,  373,  448,  855,
+      370,  395,  854,  396,  373,  370,  376,  425,  376,  428,
+      398,  376,  376,  393,  393,  853,  393,  376,  376,  408,
+      410,  410,  423,  376,  376,  411,  429,  448,  376,  411,
+      393,  393,  393,  393,  852,  376,  376,  425,  376,  428,
+      851,  376,  376,  420,  420,  420,  420,  376,  376,  432,
+      847,  432,  376,  376,  411,  846,  429,  376,  412,  412,
+      792,  412,  412,  412,  412,  412,  412,  412,  412,  412,
+      412,  412,  412,  412,  412,  412,  412,  412,  412,  412,
+
+      412,  412,  412,  412,  412,  412,  412,  412,  412,  412,
+      412,  412,  412,  412,  412,  412,  412,  412,  412,  412,
+      412,  412,  412,  412,  412,  412,  412,  412,  412,  412,
+      412,  412,  791,  412,  412,  412,  412,  412,  412,  412,
+      412,  412,  412,  412,  412,  412,  412,  412,  412,  412,
+      412,  412,  412,  412,  412,  412,  412,  412,  412,  412,
+      412,  412,  413,  413,  445,  446,  441,  433,  434,  435,
+      438,  439,  436,  442,  449,  459,  450,  498,  790,  498,
+      440,  443,  789,  433,  434,  436,  441,  435,  451,  443,
+      439,  788,  438,  442,  445,  446,  413,  413,  414,  414,
+
+      414,  414,  440,  449,  459,  440,  450,  414,  414,  414,
+      414,  414,  414,  433,  434,  436,  441,  435,  451,  443,
+      439,  438,  452,  442,  462,  453,  454,  455,  456,  787,
+      458,  440,  414,  414,  440,  460,  786,  414,  414,  414,
+      414,  414,  414,  444,  463,  464,  465,  467,  444,  444,
+      444,  444,  452,  462,  444,  453,  454,  455,  456,  444,
+      458,  466,  469,  444,  470,  460,  444,  785,  444,  471,
+      784,  444,  472,  463,  473,  464,  465,  467,  444,  444,
+      444,  444,  474,  475,  444,  476,  477,  478,  479,  444,
+      466,  480,  469,  444,  470,  444,  482,  444,  483,  471,
+
+      444,  481,  472,  484,  473,  485,  486,  481,  487,  488,
+      508,  489,  474,  475,  490,  476,  477,  478,  479,  491,
+      492,  480,  493,  494,  783,  495,  482,  483,  497,  782,
+      496,  481,  484,  496,  496,  485,  486,  481,  487,  488,
+      489,  501,  504,  501,  490,  503,  503,  505,  503,  491,
+      492,  523,  493,  494,  495,  506,  499,  499,  497,  499,
+      496,  510,  496,  496,  502,  502,  600,  502,  600,  613,
+      613,  613,  504,  499,  499,  499,  499,  505,  615,  615,
+      523,  502,  502,  502,  502,  506,  601,  601,  780,  601,
+      508,  510,  511,  511,  773,  511,  511,  511,  511,  511,
+
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  514,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  512,  512,  520,  514,
+      525,  527,  516,  516,  532,  526,  528,  770,  521,  522,
+      526,  758,  607,  607,  529,  607,  531,  528,  525,  529,
+
+      525,  693,  532,  693,  744,  527,  530,  609,  520,  531,
+      512,  512,  513,  513,  513,  513,  516,  516,  521,  522,
+      526,  513,  513,  513,  513,  513,  513,  528,  525,  529,
+      525,  535,  532,  530,  527,  733,  539,  533,  545,  531,
+      609,  534,  533,  704,  535,  546,  545,  536,  537,  539,
+      703,  513,  513,  513,  513,  513,  513,  517,  517,  517,
+      517,  534,  530,  536,  537,  538,  517,  517,  517,  517,
+      517,  517,  533,  540,  535,  546,  545,  699,  550,  539,
+      542,  547,  551,  538,  541,  553,  543,  544,  554,  555,
+      556,  534,  557,  536,  537,  540,  517,  517,  517,  517,
+
+      517,  517,  542,  541,  698,  542,  543,  544,  550,  557,
+      547,  551,  558,  538,  553,  557,  560,  554,  559,  555,
+      556,  563,  606,  564,  540,  565,  566,  692,  569,  570,
+      574,  542,  572,  541,  542,  573,  543,  544,  576,  557,
+      577,  578,  558,  579,  581,  557,  560,  559,  580,  582,
+      583,  563,  564,  584,  565,  586,  566,  569,  587,  570,
+      574,  572,  588,  590,  573,  589,  591,  576,  592,  594,
+      577,  578,  593,  579,  581,  595,  596,  580,  582,  583,
+      602,  595,  597,  584,  603,  586,  604,  616,  587,  611,
+      611,  618,  588,  590,  589,  591,  621,  624,  592,  594,
+
+      619,  593,  606,  686,  622,  595,  596,  701,  701,  602,
+      595,  623,  597,  626,  603,  604,  622,  616,  625,  624,
+      618,  621,  628,  611,  611,  612,  612,  612,  612,  623,
+      619,  625,  627,  626,  612,  612,  612,  612,  612,  612,
+      628,  627,  629,  631,  630,  632,  622,  682,  624,  629,
+      621,  630,  631,  634,  633,  774,  632,  774,  634,  623,
+      635,  625,  636,  626,  612,  612,  612,  612,  612,  612,
+      628,  627,  633,  636,  633,  637,  639,  640,  638,  629,
+      637,  630,  631,  643,  635,  641,  632,  642,  634,  639,
+      641,  668,  644,  645,  648,  640,  643,  664,  647,  650,
+
+      655,  653,  633,  636,  633,  638,  648,  642,  658,  654,
+      637,  653,  657,  635,  659,  661,  662,  663,  665,  639,
+      641,  644,  666,  645,  648,  640,  643,  647,  667,  650,
+      655,  653,  669,  670,  638,  671,  648,  642,  654,  673,
+      653,  674,  657,  659,  675,  661,  662,  663,  665,  676,
+      679,  666,  678,  680,  681,  683,  684,  685,  667,  687,
+      688,  669,  670,  689,  671,  690,  691,  694,  695,  673,
+      674,  696,  696,  675,  696,  700,  700,  700,  711,  676,
+      679,  678,  680,  707,  681,  683,  684,  685,  709,  687,
+      688,  710,  689,  702,  702,  690,  691,  694,  695,  708,
+
+      707,  712,  711,  709,  708,  713,  716,  710,  714,  718,
+      721,  715,  720,  712,  717,  716,  719,  722,  727, 1147,
+     1147,  734,  718,  652,  720,  727,  724,  713,  721,  723,
+      707,  711,  714,  709,  708,  715,  717,  710,  725,  722,
+      729,  719,  723,  712,  726,  716,  724,  725,  730,  729,
+      728,  734,  718,  735,  720,  727,  713,  728,  721,  730,
+      738,  714,  726,  737,  715,  717,  739,  740,  722,  741,
+      719,  742,  723,  737,  617,  743,  724,  725,  745,  729,
+      746,  747,  735,  748,  749,  750,  752,  728,  751,  730,
+      738,  754,  726,  737,  756,  760,  739,  740,  741,  761,
+
+      742,  762,  765,  737,  743,  767,  771,  776,  745,  776,
+      746,  747,  778,  748,  749,  750,  752,  751,  772,  795,
+      849,  754,  849,  756,  795,  760,  764,  764,  793,  761,
+      762,  764,  765,  794,  764,  767,  771,  764,  768,  768,
+      796,  778,  764,  768,  797,  809,  768,  799,  772,  768,
+      794,  798,  793,  801,  795,  796,  764,  764,  802,  799,
+      797,  764,  800,  803,  764,  804,  806,  764,  768,  768,
+      807,  764,  803,  768,  809,  798,  768,  801,  805,  768,
+      794,  793,  802,  811,  800,  796,  814,  804,  808,  799,
+      797,  805,  810,  812,  610,  816,  806,  817,  608,  818,
+
+      807,  819,  803,  820,  798,  821,  801,  823,  825,  826,
+      828,  802,  811,  800,  832,  814,  804,  833,  808,  834,
+      837,  805,  810,  812,  816,  836,  828,  817,  818,  838,
+      839,  819,  820,  840,  842,  821,  841,  823,  825,  826,
+      828,  835,  598,  844,  832,  835,  833,  845,  835,  834,
+      837,  848,  875,  843,  836,  828,  843,  874,  835,  838,
+      839,  876,  878,  840,  842,  841,  843,  877,  879,  880,
+      883,  835,  844,  881,  884,  835,  845,  885,  835,  886,
+      848,  874,  875,  843,  888,  889,  843,  835,  890,  571,
+      891,  876,  878,  892,  893,  843,  877,  894,  879,  880,
+
+      883,  895,  881,  897,  884,  898,  899,  885,  900,  886,
+      874,  901,  902,  888,  904,  889,  905,  908,  890,  891,
+      906,  909,  910,  892,  893,  911,  912,  894,  913,  915,
+      895,  914,  916,  897,  916,  898,  899,  918,  900,  918,
+      901,  902,  943,  944,  904,  945,  905,  908,  914,  906,
+      946,  909,  910,  947,  911,  912,  948,  913,  915,  949,
+      950,  914,  951,  568,  952,  953,  954,  552,  955,  956,
+      958,  943,  959,  944,  960,  945,  961,  914,  962,  963,
+      946,  964,  965,  947,  967,  969,  948,  970,  971,  949,
+      950,  972,  951,  952,  953,  973,  954,  955,  975,  956,
+
+      958,  959,  976,  960,  978,  961,  977,  979,  962,  963,
+      977,  964,  965,  967,  969,  993,  970,  994,  971,  995,
+      996,  972,  997,  998,  999,  973, 1001, 1002,  975, 1004,
+     1005,  976, 1006,  978, 1007,  977, 1008,  979, 1009,  977,
+     1010, 1012, 1016, 1017, 1018,  993, 1021,  994,  995, 1022,
+      996,  997,  998,  999, 1023, 1031, 1001, 1002, 1004, 1005,
+     1024, 1025, 1006, 1026, 1007, 1028, 1008, 1029, 1009, 1030,
+     1010, 1012, 1016, 1017, 1018, 1021, 1032, 1033, 1034, 1022,
+     1037,  524, 1039, 1041, 1023, 1031, 1044, 1047, 1048, 1024,
+     1025, 1049, 1026, 1050, 1028, 1051, 1029, 1052, 1030, 1053,
+
+     1054, 1055, 1056, 1058,  515, 1059, 1032, 1033, 1034, 1060,
+     1037, 1039, 1061, 1041, 1063, 1067, 1044, 1047, 1048, 1068,
+     1049, 1069, 1070, 1050, 1072, 1051, 1073, 1052, 1074, 1053,
+     1054, 1055, 1056, 1058, 1059, 1075, 1076, 1077, 1060, 1078,
+     1081, 1083, 1061, 1063, 1084, 1067, 1085,  468, 1086, 1068,
+     1069, 1087, 1070, 1088, 1072, 1090, 1073, 1093, 1074, 1094,
+     1097,  437, 1098, 1099, 1102, 1075, 1076, 1077, 1078, 1081,
+     1103, 1083, 1160, 1084, 1160,  419, 1085, 1086,  392, 1189,
+     1087, 1189, 1088,  377,  351, 1090,  341, 1093, 1094,  339,
+     1097, 1098, 1099,  334, 1102,  301,  300,  299,  296,  285,
+
+     1103, 1107, 1107, 1107, 1107, 1107, 1107, 1107, 1107, 1107,
+     1107, 1107, 1107, 1107, 1107, 1107, 1107, 1107, 1108, 1108,
+     1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108,
+     1108, 1108, 1108, 1108, 1108, 1109, 1109, 1109, 1109, 1109,
+     1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109,
+     1109, 1109, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110,
+     1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1111,
+     1111, 1111, 1111, 1111, 1111, 1111, 1111, 1111, 1111, 1111,
+     1111, 1111, 1111, 1111, 1111, 1111, 1112, 1112, 1112, 1112,
+     1112, 1112, 1112, 1112, 1112, 1112, 1112, 1112, 1112, 1112,
+
+     1112, 1112, 1112, 1113, 1113, 1113, 1113, 1113, 1113, 1113,
+     1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113,
+     1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114,
+     1114, 1114, 1114, 1114, 1114, 1114, 1114, 1115, 1115, 1115,
+     1115, 1115, 1115, 1115, 1115, 1115, 1115, 1115, 1115, 1115,
+     1115, 1115, 1115, 1115, 1116, 1116, 1116, 1116, 1116, 1116,
+     1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116,
+     1116, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117,
+     1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1118, 1118,
+     1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
+
+     1118, 1118, 1118, 1118, 1118, 1119, 1119, 1119, 1119, 1119,
+     1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119,
+     1119, 1119, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
+     1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1121,
+     1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121,
+     1121, 1121, 1121, 1121, 1121, 1121, 1122, 1122, 1122, 1122,
+     1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122,
+     1122, 1122, 1122, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+     1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+     1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124,
+
+     1124, 1124, 1124, 1124, 1124, 1124, 1124, 1125, 1125, 1125,
+     1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125,
+     1125, 1125, 1125, 1125, 1126, 1126,  282, 1126, 1126,  274,
+      273,  272, 1126, 1127, 1127, 1127, 1127, 1127, 1127, 1127,
+     1127, 1127, 1127, 1127, 1127, 1127, 1127, 1127, 1127, 1128,
+     1128,  271, 1128, 1128,  268,  266,  265, 1128, 1129,  256,
+     1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129,
+     1129, 1129, 1129, 1129, 1129, 1130,  255, 1130, 1130, 1130,
+     1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130,
+     1130, 1130, 1131, 1131, 1131,  252, 1131, 1131,  251,  234,
+
+      230, 1131, 1132,  227, 1132, 1132, 1132, 1132, 1132, 1132,
+     1132, 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1133,
+      226, 1133, 1133, 1133, 1133, 1133, 1133, 1133, 1133, 1133,
+     1133, 1133, 1133, 1133, 1133, 1133, 1134, 1134, 1134, 1134,
+     1134, 1134, 1134, 1134, 1134, 1134, 1134, 1134,  222, 1134,
+      208, 1134, 1134, 1135,  207,  206, 1135, 1135, 1135, 1135,
+     1135, 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1135,
+     1136, 1136,  202, 1136, 1136,  175,  174,  172, 1136, 1137,
+      170, 1137, 1137, 1137, 1137, 1137, 1137, 1137, 1137, 1137,
+     1137, 1137, 1137, 1137, 1137, 1137, 1138,  169, 1138, 1138,
+
+     1138, 1138, 1138, 1138, 1138, 1138, 1138, 1138, 1138, 1138,
+      166, 1138, 1138, 1139,  165, 1139,  164,  158, 1139, 1139,
+     1139, 1139, 1139,  155,  154,  153, 1139, 1140,  152, 1140,
+     1140, 1140, 1140, 1140, 1140, 1140, 1140, 1140, 1140, 1140,
+     1140, 1140, 1140, 1140, 1141, 1141,  144, 1141, 1141,  143,
+      139,  136, 1141, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
+     1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
+     1143,  131, 1143,  129, 1143, 1143, 1143, 1143, 1143, 1143,
+     1143, 1143, 1143,  124, 1143, 1143, 1143, 1144,  120, 1144,
+     1144, 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1144,
+
+     1144, 1144, 1144, 1144, 1145,  114, 1145, 1145, 1145, 1145,
+     1145, 1145, 1145, 1145, 1145, 1145, 1145, 1145, 1145, 1145,
+     1145, 1146, 1146,  109,  107, 1146, 1146, 1148,  106, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1149,  103, 1149, 1149, 1149,  101,
+     1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149,
+     1149, 1150, 1150,   99, 1150, 1150,   98,   97,   94, 1150,
+     1151,   91, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+     1151, 1151, 1151, 1151, 1151, 1151, 1151, 1152,   90, 1152,
+     1152, 1152, 1152, 1152, 1152, 1152, 1152, 1152, 1152, 1152,
+
+     1152, 1152, 1152, 1152, 1153, 1153,   88,   86,   84, 1153,
+     1154, 1154,   80,   78,   72, 1154, 1155, 1155, 1155, 1155,
+     1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155,
+     1155, 1155, 1155, 1156, 1156,   71, 1156, 1156,   68,   65,
+       60, 1156, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157,
+     1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1158,
+       57, 1158, 1158, 1158, 1158, 1158, 1158, 1158, 1158, 1158,
+     1158, 1158, 1158,   53, 1158, 1158, 1159,   49, 1159, 1159,
+     1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159,
+     1159, 1159, 1159, 1161, 1161,   16, 1161, 1161,   15,    0,
+
+        0, 1161, 1161, 1162,    0, 1162, 1162, 1162, 1162, 1162,
+     1162, 1162, 1162, 1162, 1162, 1162, 1162, 1162, 1162, 1162,
+     1163,    0, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163,
+     1163, 1163, 1163, 1163, 1163, 1163, 1163, 1164,    0, 1164,
+     1164, 1164, 1164, 1164, 1164, 1164, 1164, 1164, 1164, 1164,
+     1164, 1164, 1164, 1164, 1165,    0, 1165, 1165, 1165, 1165,
+     1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165,
+     1165, 1166,    0, 1166, 1166, 1166, 1166, 1166, 1166, 1166,
+     1166, 1166, 1166, 1166, 1166, 1166, 1166, 1166, 1167, 1167,
+     1167, 1167, 1167, 1167, 1167, 1167, 1167, 1167, 1167, 1167,
+
+        0, 1167,    0, 1167, 1167, 1168, 1168, 1168, 1168, 1168,
+     1168, 1168, 1168, 1168, 1168, 1168, 1168, 1168, 1168, 1168,
+     1168, 1168, 1169,    0,    0, 1169, 1169, 1169, 1169, 1169,
+     1169, 1169, 1169, 1169, 1169, 1169, 1169, 1169, 1169, 1170,
+     1170,    0, 1170, 1170,    0,    0,    0, 1170, 1171,    0,
+     1171,    0,    0, 1171, 1171, 1171, 1171, 1171,    0,    0,
+        0, 1171, 1172,    0, 1172, 1172, 1172, 1172, 1172, 1172,
+     1172, 1172, 1172, 1172, 1172, 1172, 1172, 1172, 1172, 1173,
+     1173,    0, 1173, 1173,    0,    0,    0, 1173, 1174, 1174,
+     1174, 1174, 1174, 1174, 1174, 1174, 1174, 1174, 1174, 1174,
+
+     1174, 1174, 1174, 1174, 1174, 1175,    0, 1175,    0, 1175,
+     1175, 1175, 1175, 1175, 1175, 1175, 1175, 1175,    0, 1175,
+     1175, 1175, 1176,    0, 1176, 1176, 1176, 1176, 1176, 1176,
+     1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1177,
+        0, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177,
+     1177, 1177, 1177, 1177, 1177, 1177, 1178, 1178,    0,    0,
+     1178, 1178, 1179,    0, 1179, 1179, 1179, 1179, 1179, 1179,
+     1179, 1179, 1179, 1179, 1179, 1179, 1179, 1179, 1179, 1180,
+        0, 1180, 1180, 1180,    0, 1180, 1180, 1180, 1180, 1180,
+     1180, 1180, 1180, 1180, 1180, 1180, 1181,    0, 1181, 1181,
+
+     1181, 1181, 1181, 1181, 1181, 1181, 1181, 1181, 1181, 1181,
+     1181, 1181, 1181, 1182,    0, 1182, 1182, 1182, 1182, 1182,
+     1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182,
+     1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183,
+     1183, 1183, 1183, 1183, 1183, 1183, 1183, 1184, 1184,    0,
+     1184, 1184,    0,    0,    0, 1184, 1185, 1185,    0, 1185,
+     1185,    0,    0,    0, 1185, 1186, 1186, 1186, 1186, 1186,
+     1186, 1186, 1186, 1186, 1186, 1186, 1186, 1186, 1186, 1186,
+     1186, 1186, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187,
+     1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1188,
+
+        0, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188,
+     1188, 1188, 1188,    0, 1188, 1188, 1190, 1190,    0, 1190,
+     1190,    0,    0,    0, 1190, 1190, 1191,    0, 1191, 1191,
+     1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191,
+     1191, 1191, 1191, 1192,    0, 1192, 1192, 1192, 1192, 1192,
+     1192, 1192, 1192, 1192, 1192, 1192, 1192, 1192, 1192, 1192,
+     1193,    0, 1193, 1193, 1193, 1193, 1193, 1193, 1193, 1193,
+     1193, 1193, 1193, 1193, 1193, 1193, 1193, 1194, 1194, 1194,
+     1194, 1194, 1194, 1194, 1194, 1194, 1194, 1194, 1194, 1194,
+     1194, 1194, 1194, 1194, 1195, 1195, 1195, 1196, 1196,    0,
+
+     1196, 1196,    0,    0,    0, 1196, 1197,    0, 1197, 1197,
+     1197, 1197, 1197, 1197, 1197, 1197, 1197, 1197, 1197, 1197,
+     1197, 1197, 1197, 1198,    0, 1198, 1198, 1198, 1198, 1198,
+     1198, 1198, 1198, 1198, 1198, 1198, 1198, 1198, 1198, 1198,
+     1199, 1199, 1199, 1199, 1199, 1199, 1199, 1199, 1199, 1199,
+     1199, 1199, 1199, 1199, 1199, 1199, 1199, 1200, 1200, 1200,
+     1200, 1200, 1200, 1200, 1200, 1200, 1200, 1200, 1200, 1200,
+     1200, 1200, 1200, 1200, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106,
+     1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106
     } ;
 
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
+
+static yy_state_type *yy_state_buf=0, *yy_state_ptr=0;
+static char *yy_full_match;
+static int yy_lp;
+#define REJECT \
+{ \
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ \
+yy_cp = (yy_full_match); /* restore poss. backed-over text */ \
+++(yy_lp); \
+goto find_rule; \
+}
+
+static int yy_more_flag = 0;
+static int yy_more_len = 0;
+#define yymore() ((yy_more_flag) = 1)
+#define YY_MORE_ADJ (yy_more_len)
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
 #line 1 "scan.l"
-#define INITIAL 0
-/* scan.l - scanner for flex input */
+/* scan.l - scanner for flex input -*-C-*- */
 #line 4 "scan.l"
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Vern Paxson.
- * 
- * The United States Government has rights in this work pursuant
- * to contract no. DE-AC03-76SF00098 between the United States
- * Department of Energy and the University of California.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
+/*  Copyright (c) 1990 The Regents of the University of California. */
+/*  All rights reserved. */
 
-/* $Header: /home/daffy/u0/vern/flex/RCS/scan.l,v 2.56 95/04/24 12:17:19 vern Exp $ */
-/* $FreeBSD$ */
+/*  This code is derived from software contributed to Berkeley by */
+/*  Vern Paxson. */
+
+/*  The United States Government has rights in this work pursuant */
+/*  to contract no. DE-AC03-76SF00098 between the United States */
+/*  Department of Energy and the University of California. */
+
+/*  This file is part of flex. */
+
+/*  Redistribution and use in source and binary forms, with or without */
+/*  modification, are permitted provided that the following conditions */
+/*  are met: */
+
+/*  1. Redistributions of source code must retain the above copyright */
+/*     notice, this list of conditions and the following disclaimer. */
+/*  2. Redistributions in binary form must reproduce the above copyright */
+/*     notice, this list of conditions and the following disclaimer in the */
+/*     documentation and/or other materials provided with the distribution. */
+
+/*  Neither the name of the University nor the names of its contributors */
+/*  may be used to endorse or promote products derived from this software */
+/*  without specific prior written permission. */
+
+/*  THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR */
+/*  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
+/*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
+/*  PURPOSE. */
 
 #include "flexdef.h"
 #include "parse.h"
+extern bool tablesverify, tablesext;
+extern int trlcontxt; /* Set in  parse.y for each rule. */
+extern const char *escaped_qstart, *escaped_qend;
 
 #define ACTION_ECHO add_action( yytext )
 #define ACTION_IFDEF(def, should_define) \
@@ -1291,6 +1932,17 @@ char *yytext;
 		action_define( def, 1 ); \
 	}
 
+#define ACTION_ECHO_QSTART add_action (escaped_qstart)
+#define ACTION_ECHO_QEND   add_action (escaped_qend)
+
+#define ACTION_M4_IFDEF(def, should_define) \
+    do{ \
+        if ( should_define ) \
+            buf_m4_define( &m4defs_buf, def, NULL);\
+        else \
+            buf_m4_undefine( &m4defs_buf, def);\
+    } while(0)
+
 #define MARK_END_OF_PROLOG mark_prolog();
 
 #define YY_DECL \
@@ -1301,7 +1953,15 @@ char *yytext;
 	return CHAR;
 
 #define RETURNNAME \
+	if(yyleng < MAXLINE) \
+         { \
 	strcpy( nmstr, yytext ); \
+	 } \
+	else \
+	 { \
+	   synerr(_("Input line too long\n")); \
+	   FLEX_EXIT(EXIT_FAILURE);  \
+	 }  \
 	return NAME;
 
 #define PUT_BACK_STRING(str, start) \
@@ -1315,8 +1975,21 @@ char *yytext;
 #define CHECK_YYMORE(str) \
 	if ( all_lower( str ) ) \
 		yymore_used = true;
-#define YY_STACK_USED 1
-#define YY_NO_TOP_STATE 1
+
+#define YY_USER_INIT \
+	if ( getenv("POSIXLY_CORRECT") ) \
+		posix_compat = true;
+
+
+
+
+
+
+
+
+#line 1990 "<stdout>"
+
+#define INITIAL 0
 #define SECT2 1
 #define SECT2PROLOG 2
 #define SECT3 3
@@ -1326,7 +1999,6 @@ char *yytext;
 #define CARETISBOL 7
 #define NUM 8
 #define QUOTE 9
-
 #define FIRSTCCL 10
 #define CCL 11
 #define ACTION 12
@@ -1334,11 +2006,56 @@ char *yytext;
 #define COMMENT 14
 #define ACTION_STRING 15
 #define PERCENT_BRACE_ACTION 16
-
 #define OPTION 17
 #define LINEDIR 18
+#define CODEBLOCK_MATCH_BRACE 19
+#define GROUP_WITH_PARAMS 20
+#define GROUP_MINUS_PARAMS 21
+#define EXTENDED_COMMENT 22
+#define COMMENT_DISCARD 23
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
 
-#line 1342 "scan.c"
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int yylex_destroy (void );
+
+int yyget_debug (void );
+
+void yyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE yyget_extra (void );
+
+void yyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *yyget_in (void );
+
+void yyset_in  (FILE * in_str  );
+
+FILE *yyget_out (void );
+
+void yyset_out  (FILE * out_str  );
+
+yy_size_t yyget_leng (void );
+
+char *yyget_text (void );
+
+int yyget_lineno (void );
+
+void yyset_lineno (int line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1346,79 +2063,53 @@ char *yytext;
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
+extern "C" int yywrap (void );
 #else
-extern int yywrap YY_PROTO(( void ));
+extern int yywrap (void );
 #endif
 #endif
 
 #ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
+    static void yyunput (int c,char *buf_ptr  );
 #endif
-
+    
 #ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
+static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
+static int yy_flex_strlen (yyconst char * );
 #endif
 
 #ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
 
+#ifdef __cplusplus
+static int yyinput (void );
 #else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
+static int input (void );
 #endif
 
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
 #endif
 
+        static int yy_start_stack_ptr = 0;
+        static int yy_start_stack_depth = 0;
+        static int *yy_start_stack = NULL;
+    
+    static void yy_push_state (int new_state );
+    
+    static void yy_pop_state (void );
+    
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
 #define YY_READ_BUF_SIZE 8192
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
-
 #ifndef ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1426,9 +2117,10 @@ YY_MALLOC_DECL
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
-		int c = '*', n; \
+		int c = '*'; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -1438,9 +2130,22 @@ YY_MALLOC_DECL
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(yyin); \
+			} \
+		}\
+\
+
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -1461,12 +2166,18 @@ YY_MALLOC_DECL
 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
 #endif
 
+/* end tables serialization structures and prototypes */
+
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
+#define YY_DECL_IS_OURS 1
+
+extern int yylex (void);
+
+#define YY_DECL int yylex (void)
+#endif /* !YY_DECL */
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
@@ -1482,39 +2193,47 @@ YY_MALLOC_DECL
 
 #define YY_RULE_SETUP \
 	if ( yyleng > 0 ) \
-		yy_current_buffer->yy_at_bol = \
+		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
 				(yytext[yyleng - 1] == '\n'); \
 	YY_USER_ACTION
 
+/** The main scanner function which does all the work.
+ */
 YY_DECL
-	{
+{
 	yy_state_type yy_current_state;
 	char *yy_cp, *yy_bp;
 	int yy_act;
-
-#line 95 "scan.l"
+    
+#line 131 "scan.l"
 
 	static int bracelevel, didadef, indented_code;
 	static int doing_rule_action = false;
 	static int option_sense;
 
 	int doing_codeblock = false;
-	int i;
-	Char nmdef[MAXLINE], myesc();
+	int i, brace_depth=0, brace_start_line=0;
+	Char nmdef[MAXLINE];
 
 
-#line 1507 "scan.c"
+#line 2219 "<stdout>"
 
-	if ( yy_init )
+	if ( !(yy_init) )
 		{
-		yy_init = 0;
+		(yy_init) = 1;
 
 #ifdef YY_USER_INIT
 		YY_USER_INIT;
 #endif
 
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
+        /* Create the reject buffer large enough to save one state per allowed character. */
+        if ( ! (yy_state_buf) )
+            (yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE  );
+            if ( ! (yy_state_buf) )
+                YY_FATAL_ERROR( "out of dynamic memory in yylex()" );
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
 
 		if ( ! yyin )
 			yyin = stdin;
@@ -1522,100 +2241,111 @@ YY_DECL
 		if ( ! yyout )
 			yyout = stdout;
 
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
+		if ( ! YY_CURRENT_BUFFER ) {
+			yyensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				yy_create_buffer(yyin,YY_BUF_SIZE );
+		}
 
-		yy_load_buffer_state();
+		yy_load_buffer_state( );
 		}
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
-		yy_cp = yy_c_buf_p;
+		(yy_more_len) = 0;
+		if ( (yy_more_flag) )
+			{
+			(yy_more_len) = (yy_c_buf_p) - (yytext_ptr);
+			(yy_more_flag) = 0;
+			}
+		yy_cp = (yy_c_buf_p);
 
 		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
+		*yy_cp = (yy_hold_char);
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
 		 * the current run.
 		 */
 		yy_bp = yy_cp;
 
-		yy_current_state = yy_start;
+		yy_current_state = (yy_start);
 		yy_current_state += YY_AT_BOL();
+
+		(yy_state_ptr) = (yy_state_buf);
+		*(yy_state_ptr)++ = yy_current_state;
+
 yy_match:
 		do
 			{
-			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				yy_last_accepting_state = yy_current_state;
-				yy_last_accepting_cpos = yy_cp;
-				}
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 769 )
+				if ( yy_current_state >= 1107 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			*(yy_state_ptr)++ = yy_current_state;
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 2716 );
+		while ( yy_base[yy_current_state] != 3975 );
 
 yy_find_action:
-		yy_act = yy_accept[yy_current_state];
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			yy_act = yy_accept[yy_current_state];
+		yy_current_state = *--(yy_state_ptr);
+		(yy_lp) = yy_accept[yy_current_state];
+goto find_rule; /* avoid `defined but not used' warning */
+find_rule: /* we branch to this label when backing up */
+		for ( ; ; ) /* until we find what rule we matched */
+			{
+			if ( (yy_lp) && (yy_lp) < yy_accept[yy_current_state + 1] )
+				{
+				yy_act = yy_acclist[(yy_lp)];
+					{
+					(yy_full_match) = yy_cp;
+					break;
+					}
+				}
+			--yy_cp;
+			yy_current_state = *--(yy_state_ptr);
+			(yy_lp) = yy_accept[yy_current_state];
 			}
 
 		YY_DO_BEFORE_ACTION;
 
-
 do_action:	/* This label is used only to access EOF actions. */
 
-
 		switch ( yy_act )
 	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yy_hold_char;
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			goto yy_find_action;
-
 
 case 1:
 YY_RULE_SETUP
-#line 106 "scan.l"
+#line 142 "scan.l"
 indented_code = true; BEGIN(CODEBLOCK);
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 107 "scan.l"
+#line 143 "scan.l"
 ACTION_ECHO; yy_push_state( COMMENT );
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 108 "scan.l"
+#line 144 "scan.l"
 yy_push_state( LINEDIR );
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 109 "scan.l"
+#line 145 "scan.l"
 return SCDECL;
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 110 "scan.l"
+#line 146 "scan.l"
 return XSCDECL;
 	YY_BREAK
 case 6:
+/* rule 6 can match eol */
 YY_RULE_SETUP
-#line 111 "scan.l"
+#line 147 "scan.l"
 {
 			++linenum;
 			line_directive_out( (FILE *) 0, 1 );
@@ -1624,13 +2354,30 @@ YY_RULE_SETUP
 			}
 	YY_BREAK
 case 7:
+/* rule 7 can match eol */
 YY_RULE_SETUP
-#line 118 "scan.l"
-/* discard */
+#line 153 "scan.l"
+{
+                brace_start_line = linenum;
+                ++linenum;
+                buf_linedir( &top_buf, infilename?infilename:"<stdin>", linenum);
+                brace_depth = 1;
+                yy_push_state(CODEBLOCK_MATCH_BRACE);
+            }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 120 "scan.l"
+#line 161 "scan.l"
+synerr( _("malformed '%top' directive") );
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 163 "scan.l"
+/* discard */
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+#line 165 "scan.l"
 {
 			sectnum = 2;
 			bracelevel = 0;
@@ -1640,123 +2387,206 @@ YY_RULE_SETUP
 			return SECTEND;
 			}
 	YY_BREAK
-case 9:
+case 11:
+/* rule 11 can match eol */
 YY_RULE_SETUP
-#line 129 "scan.l"
+#line 174 "scan.l"
 yytext_is_array = false; ++linenum;
 	YY_BREAK
-case 10:
+case 12:
+/* rule 12 can match eol */
 YY_RULE_SETUP
-#line 130 "scan.l"
+#line 175 "scan.l"
 yytext_is_array = true; ++linenum;
 	YY_BREAK
-case 11:
+case 13:
 YY_RULE_SETUP
-#line 132 "scan.l"
+#line 177 "scan.l"
 BEGIN(OPTION); return OPTION_OP;
 	YY_BREAK
-case 12:
+case 14:
+/* rule 14 can match eol */
 YY_RULE_SETUP
-#line 134 "scan.l"
+#line 179 "scan.l"
 ++linenum; /* ignore */
 	YY_BREAK
-case 13:
+case 15:
+/* rule 15 can match eol */
 YY_RULE_SETUP
-#line 135 "scan.l"
+#line 180 "scan.l"
 ++linenum;	/* ignore */
 	YY_BREAK
-case 14:
+/* xgettext: no-c-format */
+case 16:
+/* rule 16 can match eol */
 YY_RULE_SETUP
-#line 137 "scan.l"
+#line 183 "scan.l"
 synerr( _( "unrecognized '%' directive" ) );
 	YY_BREAK
-case 15:
+case 17:
 YY_RULE_SETUP
-#line 139 "scan.l"
+#line 185 "scan.l"
 {
+			if(yyleng < MAXLINE)
+        		 {
 			strcpy( nmstr, yytext );
+			 }
+			else
+			 {
+			   synerr( _("Definition name too long\n"));
+			   FLEX_EXIT(EXIT_FAILURE);
+			 }
+
 			didadef = false;
 			BEGIN(PICKUPDEF);
 			}
 	YY_BREAK
-case 16:
+case 18:
 YY_RULE_SETUP
-#line 145 "scan.l"
+#line 200 "scan.l"
 RETURNNAME;
 	YY_BREAK
-case 17:
+case 19:
+/* rule 19 can match eol */
 YY_RULE_SETUP
-#line 146 "scan.l"
+#line 201 "scan.l"
 ++linenum; /* allows blank lines in section 1 */
 	YY_BREAK
-case 18:
+case 20:
+/* rule 20 can match eol */
 YY_RULE_SETUP
-#line 147 "scan.l"
+#line 202 "scan.l"
 ACTION_ECHO; ++linenum; /* maybe end of comment line */
 	YY_BREAK
 
 
-case 19:
+case 21:
 YY_RULE_SETUP
-#line 152 "scan.l"
+#line 207 "scan.l"
 ACTION_ECHO; yy_pop_state();
 	YY_BREAK
-case 20:
+case 22:
 YY_RULE_SETUP
-#line 153 "scan.l"
+#line 208 "scan.l"
 ACTION_ECHO;
 	YY_BREAK
-case 21:
+case 23:
 YY_RULE_SETUP
-#line 154 "scan.l"
+#line 209 "scan.l"
+ACTION_ECHO_QSTART;
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+#line 210 "scan.l"
+ACTION_ECHO_QEND;
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
+#line 211 "scan.l"
 ACTION_ECHO;
 	YY_BREAK
-case 22:
+case 26:
+/* rule 26 can match eol */
 YY_RULE_SETUP
-#line 155 "scan.l"
+#line 212 "scan.l"
 ++linenum; ACTION_ECHO;
 	YY_BREAK
 
 
-case 23:
+/* This is the same as COMMENT, but is discarded rather than output. */
+case 27:
 YY_RULE_SETUP
-#line 159 "scan.l"
+#line 217 "scan.l"
 yy_pop_state();
 	YY_BREAK
-case 24:
+case 28:
+YY_RULE_SETUP
+#line 218 "scan.l"
+;
+	YY_BREAK
+case 29:
+YY_RULE_SETUP
+#line 219 "scan.l"
+;
+	YY_BREAK
+case 30:
+/* rule 30 can match eol */
+YY_RULE_SETUP
+#line 220 "scan.l"
+++linenum;
+	YY_BREAK
+
+
+case 31:
+YY_RULE_SETUP
+#line 224 "scan.l"
+yy_pop_state();
+	YY_BREAK
+case 32:
+YY_RULE_SETUP
+#line 225 "scan.l"
+;
+	YY_BREAK
+case 33:
+/* rule 33 can match eol */
+YY_RULE_SETUP
+#line 226 "scan.l"
+++linenum;        
+	YY_BREAK
+
+
+case 34:
+/* rule 34 can match eol */
+YY_RULE_SETUP
+#line 230 "scan.l"
+yy_pop_state();
+	YY_BREAK
+case 35:
 YY_RULE_SETUP
-#line 160 "scan.l"
+#line 231 "scan.l"
 linenum = myctoi( yytext );
 	YY_BREAK
-case 25:
+case 36:
 YY_RULE_SETUP
-#line 162 "scan.l"
+#line 233 "scan.l"
 {
 			flex_free( (void *) infilename );
 			infilename = copy_string( yytext + 1 );
 			infilename[strlen( infilename ) - 1] = '\0';
 			}
 	YY_BREAK
-case 26:
+case 37:
 YY_RULE_SETUP
-#line 167 "scan.l"
+#line 238 "scan.l"
 /* ignore spurious characters */
 	YY_BREAK
 
 
-case 27:
+case 38:
+/* rule 38 can match eol */
 YY_RULE_SETUP
-#line 171 "scan.l"
+#line 242 "scan.l"
 ++linenum; BEGIN(INITIAL);
 	YY_BREAK
-case 28:
+case 39:
+YY_RULE_SETUP
+#line 244 "scan.l"
+ACTION_ECHO_QSTART;
+	YY_BREAK
+case 40:
+YY_RULE_SETUP
+#line 245 "scan.l"
+ACTION_ECHO_QEND;
+	YY_BREAK
+case 41:
 YY_RULE_SETUP
-#line 173 "scan.l"
+#line 246 "scan.l"
 ACTION_ECHO;
 	YY_BREAK
-case 29:
+case 42:
+/* rule 42 can match eol */
 YY_RULE_SETUP
-#line 175 "scan.l"
+#line 248 "scan.l"
 {
 			++linenum;
 			ACTION_ECHO;
@@ -1766,17 +2596,79 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 30:
+case 43:
 YY_RULE_SETUP
-#line 185 "scan.l"
+#line 257 "scan.l"
+{
+                if( --brace_depth == 0){
+                    /* TODO: Matched. */
+                    yy_pop_state();
+                }else
+                    buf_strnappend(&top_buf, yytext, yyleng);
+            }
+	YY_BREAK
+case 44:
+YY_RULE_SETUP
+#line 265 "scan.l"
+{
+                brace_depth++;
+                buf_strnappend(&top_buf, yytext, yyleng);
+            }
+	YY_BREAK
+case 45:
+/* rule 45 can match eol */
+YY_RULE_SETUP
+#line 270 "scan.l"
+{
+                ++linenum;
+                buf_strnappend(&top_buf, yytext, yyleng);
+            }
+	YY_BREAK
+case 46:
+YY_RULE_SETUP
+#line 275 "scan.l"
+buf_strnappend(&top_buf, escaped_qstart, strlen(escaped_qstart));
+	YY_BREAK
+case 47:
+YY_RULE_SETUP
+#line 276 "scan.l"
+buf_strnappend(&top_buf, escaped_qend, strlen(escaped_qend));
+	YY_BREAK
+case 48:
+YY_RULE_SETUP
+#line 278 "scan.l"
+{
+                buf_strnappend(&top_buf, yytext, yyleng);
+               }
+	YY_BREAK
+case YY_STATE_EOF(CODEBLOCK_MATCH_BRACE):
+#line 282 "scan.l"
+{
+                linenum = brace_start_line;
+                synerr(_("Unmatched '{'"));
+                yyterminate();
+                }
+	YY_BREAK
+
+
+case 49:
+YY_RULE_SETUP
+#line 291 "scan.l"
 /* separates name and definition */
 	YY_BREAK
-case 31:
+case 50:
 YY_RULE_SETUP
-#line 187 "scan.l"
+#line 293 "scan.l"
 {
+ 		        if(yyleng < MAXLINE)
+ 		         {
 			strcpy( (char *) nmdef, yytext );
-
+ 		         }
+ 		        else
+ 		         {
+ 		           format_synerr( _("Definition value for {%s} too long\n"), nmstr);
+ 		           FLEX_EXIT(EXIT_FAILURE);
+			 }
 			/* Skip trailing whitespace. */
 			for ( i = strlen( (char *) nmdef ) - 1;
 			      i >= 0 && (nmdef[i] == ' ' || nmdef[i] == '\t');
@@ -1789,9 +2681,10 @@ YY_RULE_SETUP
 			didadef = true;
 			}
 	YY_BREAK
-case 32:
+case 51:
+/* rule 51 can match eol */
 YY_RULE_SETUP
-#line 202 "scan.l"
+#line 315 "scan.l"
 {
 			if ( ! didadef )
 				synerr( _( "incomplete name definition" ) );
@@ -1801,266 +2694,435 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 33:
+case 52:
+/* rule 52 can match eol */
 YY_RULE_SETUP
-#line 212 "scan.l"
+#line 325 "scan.l"
 ++linenum; BEGIN(INITIAL);
 	YY_BREAK
-case 34:
+case 53:
 YY_RULE_SETUP
-#line 213 "scan.l"
+#line 326 "scan.l"
 option_sense = true;
 	YY_BREAK
-case 35:
+case 54:
 YY_RULE_SETUP
-#line 215 "scan.l"
+#line 328 "scan.l"
 return '=';
 	YY_BREAK
-case 36:
+case 55:
 YY_RULE_SETUP
-#line 217 "scan.l"
+#line 330 "scan.l"
 option_sense = ! option_sense;
 	YY_BREAK
-case 37:
+case 56:
 YY_RULE_SETUP
-#line 219 "scan.l"
+#line 332 "scan.l"
 csize = option_sense ? 128 : 256;
 	YY_BREAK
-case 38:
+case 57:
 YY_RULE_SETUP
-#line 220 "scan.l"
+#line 333 "scan.l"
 csize = option_sense ? 256 : 128;
 	YY_BREAK
-case 39:
+case 58:
 YY_RULE_SETUP
-#line 222 "scan.l"
+#line 335 "scan.l"
 long_align = option_sense;
 	YY_BREAK
-case 40:
+case 59:
 YY_RULE_SETUP
-#line 223 "scan.l"
+#line 336 "scan.l"
 {
-			action_define( "YY_ALWAYS_INTERACTIVE", option_sense );
+			ACTION_M4_IFDEF( "M4""_YY_ALWAYS_INTERACTIVE", option_sense );
+            interactive = option_sense;
 			}
 	YY_BREAK
-case 41:
+case 60:
 YY_RULE_SETUP
-#line 226 "scan.l"
+#line 340 "scan.l"
 yytext_is_array = option_sense;
 	YY_BREAK
-case 42:
+case 61:
 YY_RULE_SETUP
-#line 227 "scan.l"
+#line 341 "scan.l"
+ansi_func_defs = option_sense;
+	YY_BREAK
+case 62:
+YY_RULE_SETUP
+#line 342 "scan.l"
+ansi_func_protos = option_sense;
+	YY_BREAK
+case 63:
+YY_RULE_SETUP
+#line 343 "scan.l"
 backing_up_report = option_sense;
 	YY_BREAK
-case 43:
+case 64:
 YY_RULE_SETUP
-#line 228 "scan.l"
+#line 344 "scan.l"
 interactive = ! option_sense;
 	YY_BREAK
-case 44:
+case 65:
+YY_RULE_SETUP
+#line 345 "scan.l"
+bison_bridge_lval = option_sense;
+	YY_BREAK
+case 66:
+YY_RULE_SETUP
+#line 346 "scan.l"
+{ if((bison_bridge_lloc = option_sense))
+                            bison_bridge_lval = true;
+                     }
+	YY_BREAK
+case 67:
 YY_RULE_SETUP
-#line 229 "scan.l"
+#line 349 "scan.l"
 C_plus_plus = option_sense;
 	YY_BREAK
-case 45:
+case 68:
 YY_RULE_SETUP
-#line 230 "scan.l"
-caseins = ! option_sense;
+#line 350 "scan.l"
+sf_set_case_ins(!option_sense);
 	YY_BREAK
-case 46:
+case 69:
 YY_RULE_SETUP
-#line 231 "scan.l"
-caseins = option_sense;
+#line 351 "scan.l"
+sf_set_case_ins(option_sense);
 	YY_BREAK
-case 47:
+case 70:
 YY_RULE_SETUP
-#line 232 "scan.l"
+#line 352 "scan.l"
 ddebug = option_sense;
 	YY_BREAK
-case 48:
+case 71:
 YY_RULE_SETUP
-#line 233 "scan.l"
+#line 353 "scan.l"
 spprdflt = ! option_sense;
 	YY_BREAK
-case 49:
+case 72:
 YY_RULE_SETUP
-#line 234 "scan.l"
+#line 354 "scan.l"
 useecs = option_sense;
 	YY_BREAK
-case 50:
+case 73:
 YY_RULE_SETUP
-#line 235 "scan.l"
+#line 355 "scan.l"
 {
 			useecs = usemecs = false;
 			use_read = fullspd = true;
 			}
 	YY_BREAK
-case 51:
+case 74:
 YY_RULE_SETUP
-#line 239 "scan.l"
+#line 359 "scan.l"
 {
 			useecs = usemecs = false;
 			use_read = fulltbl = true;
 			}
 	YY_BREAK
-case 52:
+case 75:
 YY_RULE_SETUP
-#line 243 "scan.l"
+#line 363 "scan.l"
 ACTION_IFDEF("YY_NO_INPUT", ! option_sense);
 	YY_BREAK
-case 53:
+case 76:
 YY_RULE_SETUP
-#line 244 "scan.l"
+#line 364 "scan.l"
 interactive = option_sense;
 	YY_BREAK
-case 54:
+case 77:
 YY_RULE_SETUP
-#line 245 "scan.l"
+#line 365 "scan.l"
 lex_compat = option_sense;
 	YY_BREAK
-case 55:
+case 78:
 YY_RULE_SETUP
-#line 246 "scan.l"
+#line 366 "scan.l"
+posix_compat = option_sense;
+	YY_BREAK
+case 79:
+YY_RULE_SETUP
+#line 367 "scan.l"
 {
-			action_define( "YY_MAIN", option_sense );
-			do_yywrap = ! option_sense;
+			ACTION_M4_IFDEF( "M4""_YY_MAIN", option_sense);
+            /* Override yywrap */
+            if( option_sense == true )
+                do_yywrap = false;
 			}
 	YY_BREAK
-case 56:
+case 80:
 YY_RULE_SETUP
-#line 250 "scan.l"
+#line 373 "scan.l"
 usemecs = option_sense;
 	YY_BREAK
-case 57:
+case 81:
 YY_RULE_SETUP
-#line 251 "scan.l"
+#line 374 "scan.l"
 {
-			action_define( "YY_NEVER_INTERACTIVE", option_sense );
+			ACTION_M4_IFDEF( "M4""_YY_NEVER_INTERACTIVE", option_sense );
+            interactive = !option_sense;
 			}
 	YY_BREAK
-case 58:
+case 82:
 YY_RULE_SETUP
-#line 254 "scan.l"
+#line 378 "scan.l"
 performance_report += option_sense ? 1 : -1;
 	YY_BREAK
-case 59:
+case 83:
 YY_RULE_SETUP
-#line 255 "scan.l"
+#line 379 "scan.l"
 yytext_is_array = ! option_sense;
 	YY_BREAK
-case 60:
+case 84:
 YY_RULE_SETUP
-#line 256 "scan.l"
+#line 380 "scan.l"
 use_read = option_sense;
 	YY_BREAK
-case 61:
+case 85:
 YY_RULE_SETUP
-#line 257 "scan.l"
+#line 381 "scan.l"
+reentrant = option_sense;
+	YY_BREAK
+case 86:
+YY_RULE_SETUP
+#line 382 "scan.l"
 reject_really_used = option_sense;
 	YY_BREAK
-case 62:
+case 87:
 YY_RULE_SETUP
-#line 258 "scan.l"
-action_define( "YY_STACK_USED", option_sense );
+#line 383 "scan.l"
+ACTION_M4_IFDEF( "M4""_YY_STACK_USED", option_sense );
 	YY_BREAK
-case 63:
+case 88:
 YY_RULE_SETUP
-#line 259 "scan.l"
+#line 384 "scan.l"
 do_stdinit = option_sense;
 	YY_BREAK
-case 64:
+case 89:
 YY_RULE_SETUP
-#line 260 "scan.l"
+#line 385 "scan.l"
 use_stdout = option_sense;
 	YY_BREAK
-case 65:
+case 90:
 YY_RULE_SETUP
-#line 261 "scan.l"
-ACTION_IFDEF("YY_NO_UNPUT", ! option_sense);
+#line 386 "scan.l"
+ACTION_IFDEF("YY_NO_UNISTD_H", ! option_sense);
 	YY_BREAK
-case 66:
+case 91:
 YY_RULE_SETUP
-#line 262 "scan.l"
+#line 387 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_UNPUT", ! option_sense);
+	YY_BREAK
+case 92:
+YY_RULE_SETUP
+#line 388 "scan.l"
 printstats = option_sense;
 	YY_BREAK
-case 67:
+case 93:
 YY_RULE_SETUP
-#line 263 "scan.l"
+#line 389 "scan.l"
 nowarn = ! option_sense;
 	YY_BREAK
-case 68:
+case 94:
 YY_RULE_SETUP
-#line 264 "scan.l"
-do_yylineno = option_sense;
+#line 390 "scan.l"
+do_yylineno = option_sense; ACTION_M4_IFDEF("M4""_YY_USE_LINENO", option_sense);
 	YY_BREAK
-case 69:
+case 95:
 YY_RULE_SETUP
-#line 265 "scan.l"
+#line 391 "scan.l"
 yymore_really_used = option_sense;
 	YY_BREAK
-case 70:
+case 96:
 YY_RULE_SETUP
-#line 266 "scan.l"
+#line 392 "scan.l"
 do_yywrap = option_sense;
 	YY_BREAK
-case 71:
+case 97:
 YY_RULE_SETUP
-#line 268 "scan.l"
-ACTION_IFDEF("YY_NO_PUSH_STATE", ! option_sense);
+#line 394 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_PUSH_STATE", ! option_sense);
 	YY_BREAK
-case 72:
+case 98:
 YY_RULE_SETUP
-#line 269 "scan.l"
-ACTION_IFDEF("YY_NO_POP_STATE", ! option_sense);
+#line 395 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_POP_STATE", ! option_sense);
 	YY_BREAK
-case 73:
+case 99:
 YY_RULE_SETUP
-#line 270 "scan.l"
-ACTION_IFDEF("YY_NO_TOP_STATE", ! option_sense);
+#line 396 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_TOP_STATE", ! option_sense);
 	YY_BREAK
-case 74:
+case 100:
 YY_RULE_SETUP
-#line 272 "scan.l"
-ACTION_IFDEF("YY_NO_SCAN_BUFFER", ! option_sense);
+#line 398 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_SCAN_BUFFER", ! option_sense);
 	YY_BREAK
-case 75:
+case 101:
 YY_RULE_SETUP
-#line 273 "scan.l"
-ACTION_IFDEF("YY_NO_SCAN_BYTES", ! option_sense);
+#line 399 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_SCAN_BYTES", ! option_sense);
 	YY_BREAK
-case 76:
+case 102:
 YY_RULE_SETUP
-#line 274 "scan.l"
-ACTION_IFDEF("YY_NO_SCAN_STRING", ! option_sense);
+#line 400 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_SCAN_STRING", ! option_sense);
 	YY_BREAK
-case 77:
+case 103:
 YY_RULE_SETUP
-#line 276 "scan.l"
+#line 402 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_FLEX_ALLOC", ! option_sense);
+	YY_BREAK
+case 104:
+YY_RULE_SETUP
+#line 403 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_FLEX_REALLOC", ! option_sense);
+	YY_BREAK
+case 105:
+YY_RULE_SETUP
+#line 404 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_FLEX_FREE", ! option_sense);
+	YY_BREAK
+case 106:
+YY_RULE_SETUP
+#line 406 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_GET_DEBUG", ! option_sense);
+	YY_BREAK
+case 107:
+YY_RULE_SETUP
+#line 407 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_SET_DEBUG", ! option_sense);
+	YY_BREAK
+case 108:
+YY_RULE_SETUP
+#line 408 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_GET_EXTRA", ! option_sense);
+	YY_BREAK
+case 109:
+YY_RULE_SETUP
+#line 409 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_SET_EXTRA", ! option_sense);
+	YY_BREAK
+case 110:
+YY_RULE_SETUP
+#line 410 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_GET_LENG", ! option_sense);
+	YY_BREAK
+case 111:
+YY_RULE_SETUP
+#line 411 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_GET_TEXT", ! option_sense);
+	YY_BREAK
+case 112:
+YY_RULE_SETUP
+#line 412 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_GET_LINENO", ! option_sense);
+	YY_BREAK
+case 113:
+YY_RULE_SETUP
+#line 413 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_SET_LINENO", ! option_sense);
+	YY_BREAK
+case 114:
+YY_RULE_SETUP
+#line 414 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_GET_IN", ! option_sense);
+	YY_BREAK
+case 115:
+YY_RULE_SETUP
+#line 415 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_SET_IN", ! option_sense);
+	YY_BREAK
+case 116:
+YY_RULE_SETUP
+#line 416 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_GET_OUT", ! option_sense);
+	YY_BREAK
+case 117:
+YY_RULE_SETUP
+#line 417 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_SET_OUT", ! option_sense);
+	YY_BREAK
+case 118:
+YY_RULE_SETUP
+#line 418 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_GET_LVAL", ! option_sense);
+	YY_BREAK
+case 119:
+YY_RULE_SETUP
+#line 419 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_SET_LVAL", ! option_sense);
+	YY_BREAK
+case 120:
+YY_RULE_SETUP
+#line 420 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_GET_LLOC", ! option_sense);
+	YY_BREAK
+case 121:
+YY_RULE_SETUP
+#line 421 "scan.l"
+ACTION_M4_IFDEF("M4""_YY_NO_SET_LLOC", ! option_sense);
+	YY_BREAK
+case 122:
+YY_RULE_SETUP
+#line 423 "scan.l"
+return OPT_EXTRA_TYPE;
+	YY_BREAK
+case 123:
+YY_RULE_SETUP
+#line 424 "scan.l"
 return OPT_OUTFILE;
 	YY_BREAK
-case 78:
+case 124:
 YY_RULE_SETUP
-#line 277 "scan.l"
+#line 425 "scan.l"
 return OPT_PREFIX;
 	YY_BREAK
-case 79:
+case 125:
 YY_RULE_SETUP
-#line 278 "scan.l"
+#line 426 "scan.l"
 return OPT_YYCLASS;
 	YY_BREAK
-case 80:
+case 126:
+YY_RULE_SETUP
+#line 427 "scan.l"
+return OPT_HEADER;
+	YY_BREAK
+case 127:
+YY_RULE_SETUP
+#line 428 "scan.l"
+return OPT_TABLES;
+	YY_BREAK
+case 128:
+YY_RULE_SETUP
+#line 429 "scan.l"
+{
+                    tablesverify = option_sense;
+                    if(!tablesext && option_sense)
+                        tablesext = true;
+                    }
+	YY_BREAK
+case 129:
 YY_RULE_SETUP
-#line 280 "scan.l"
+#line 436 "scan.l"
 {
+			if(yyleng-1 < MAXLINE)
+        		 {
 			strcpy( nmstr, yytext + 1 );
+			 }
+			else
+			 {
+			   synerr( _("Option line too long\n"));
+			   FLEX_EXIT(EXIT_FAILURE);
+			 }
 			nmstr[strlen( nmstr ) - 1] = '\0';
 			return NAME;
 			}
 	YY_BREAK
-case 81:
+case 130:
 YY_RULE_SETUP
-#line 286 "scan.l"
+#line 450 "scan.l"
 {
 			format_synerr( _( "unrecognized %%option: %s" ),
 				yytext );
@@ -2068,30 +3130,31 @@ YY_RULE_SETUP
 			}
 	YY_BREAK
 
-case 82:
+case 131:
+/* rule 131 can match eol */
 YY_RULE_SETUP
-#line 293 "scan.l"
+#line 457 "scan.l"
 ++linenum; BEGIN(INITIAL);
 	YY_BREAK
 
-case 83:
+case 132:
 YY_RULE_SETUP
-#line 297 "scan.l"
+#line 461 "scan.l"
 ++bracelevel; yyless( 2 );	/* eat only %{ */
 	YY_BREAK
-case 84:
+case 133:
 YY_RULE_SETUP
-#line 298 "scan.l"
+#line 462 "scan.l"
 --bracelevel; yyless( 2 );	/* eat only %} */
 	YY_BREAK
-case 85:
+case 134:
 YY_RULE_SETUP
-#line 300 "scan.l"
+#line 464 "scan.l"
 ACTION_ECHO;	/* indented code in prolog */
 	YY_BREAK
-case 86:
+case 135:
 YY_RULE_SETUP
-#line 302 "scan.l"
+#line 466 "scan.l"
 {	/* non-indented code */
 			if ( bracelevel <= 0 )
 				{ /* not in %{ ... %} */
@@ -2104,18 +3167,19 @@ YY_RULE_SETUP
 				ACTION_ECHO;
 			}
 	YY_BREAK
-case 87:
+case 136:
 YY_RULE_SETUP
-#line 314 "scan.l"
+#line 478 "scan.l"
 ACTION_ECHO;
 	YY_BREAK
-case 88:
+case 137:
+/* rule 137 can match eol */
 YY_RULE_SETUP
-#line 315 "scan.l"
+#line 479 "scan.l"
 ++linenum; ACTION_ECHO;
 	YY_BREAK
 case YY_STATE_EOF(SECT2PROLOG):
-#line 317 "scan.l"
+#line 481 "scan.l"
 {
 			mark_prolog();
 			sectnum = 0;
@@ -2124,14 +3188,15 @@ case YY_STATE_EOF(SECT2PROLOG):
 	YY_BREAK
 
 
-case 89:
+case 138:
+/* rule 138 can match eol */
 YY_RULE_SETUP
-#line 325 "scan.l"
+#line 489 "scan.l"
 ++linenum; /* allow blank lines in section 2 */
 	YY_BREAK
-case 90:
+case 139:
 YY_RULE_SETUP
-#line 327 "scan.l"
+#line 491 "scan.l"
 {
 			indented_code = false;
 			doing_codeblock = true;
@@ -2139,40 +3204,52 @@ YY_RULE_SETUP
 			BEGIN(PERCENT_BRACE_ACTION);
 			}
 	YY_BREAK
-case 91:
+case 140:
 YY_RULE_SETUP
-#line 334 "scan.l"
-BEGIN(SC); return '<';
+#line 498 "scan.l"
+{
+                        /* Allow "<" to appear in (?x) patterns. */
+                        if (!sf_skip_ws())
+                            BEGIN(SC);
+                        return '<';
+                    }
 	YY_BREAK
-case 92:
+case 141:
 YY_RULE_SETUP
-#line 335 "scan.l"
+#line 504 "scan.l"
 return '^';
 	YY_BREAK
-case 93:
+case 142:
 YY_RULE_SETUP
-#line 336 "scan.l"
+#line 505 "scan.l"
 BEGIN(QUOTE); return '"';
 	YY_BREAK
-case 94:
-*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
-yy_c_buf_p = yy_cp = yy_bp + 1;
+case 143:
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 337 "scan.l"
-BEGIN(NUM); return '{';
+#line 506 "scan.l"
+{
+			BEGIN(NUM);
+			if ( lex_compat || posix_compat )
+				return BEGIN_REPEAT_POSIX;
+			else
+				return BEGIN_REPEAT_FLEX;
+			}
 	YY_BREAK
-case 95:
-*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
-yy_c_buf_p = yy_cp = yy_bp + 1;
+case 144:
+/* rule 144 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 338 "scan.l"
+#line 513 "scan.l"
 return '$';
 	YY_BREAK
-case 96:
+case 145:
 YY_RULE_SETUP
-#line 340 "scan.l"
+#line 515 "scan.l"
 {
 			bracelevel = 1;
 			BEGIN(PERCENT_BRACE_ACTION);
@@ -2185,91 +3262,138 @@ YY_RULE_SETUP
 				}
 			}
 	YY_BREAK
-case 97:
+case 146:
+/* rule 146 can match eol */
 YY_RULE_SETUP
-#line 351 "scan.l"
-continued_action = true; ++linenum; return '\n';
+#line 526 "scan.l"
+{
+                        if (sf_skip_ws()){
+                            /* We're in the middle of a (?x: ) pattern. */
+                            /* Push back everything starting at the "|" */
+                            size_t amt;
+                            amt = strchr (yytext, '|') - yytext;
+                            yyless(amt);
+                        }
+                        else {
+                            continued_action = true;
+                            ++linenum;
+                            return '\n';
+                        }
+                    }
 	YY_BREAK
-case 98:
+case 147:
 YY_RULE_SETUP
-#line 353 "scan.l"
+#line 541 "scan.l"
 {
-			yyless( yyleng - 2 );	/* put back '/', '*' */
-			bracelevel = 0;
-			continued_action = false;
-			BEGIN(ACTION);
+
+                if (sf_skip_ws()){
+                    /* We're in the middle of a (?x: ) pattern. */
+                    yy_push_state(COMMENT_DISCARD);
+                }
+                else{
+                    yyless( yyleng - 2 );	/* put back '/', '*' */
+                    bracelevel = 0;
+                    continued_action = false;
+                    BEGIN(ACTION);
+                }
 			}
 	YY_BREAK
-case 99:
+case 148:
 YY_RULE_SETUP
-#line 360 "scan.l"
-/* allow indented rules */
+#line 555 "scan.l"
+/* allow indented rules */ ;
 	YY_BREAK
-case 100:
+case 149:
 YY_RULE_SETUP
-#line 362 "scan.l"
+#line 557 "scan.l"
 {
-			/* This rule is separate from the one below because
-			 * otherwise we get variable trailing context, so
-			 * we can't build the scanner using -{f,F}.
-			 */
-			bracelevel = 0;
-			continued_action = false;
-			BEGIN(ACTION);
-
-			if ( in_rule )
-				{
-				doing_rule_action = true;
-				in_rule = false;
-				return '\n';
-				}
+            if (sf_skip_ws()){
+                /* We're in the middle of a (?x: ) pattern. */
+            }
+            else{
+                /* This rule is separate from the one below because
+                 * otherwise we get variable trailing context, so
+                 * we can't build the scanner using -{f,F}.
+                 */
+                bracelevel = 0;
+                continued_action = false;
+                BEGIN(ACTION);
+
+                if ( in_rule )
+                    {
+                    doing_rule_action = true;
+                    in_rule = false;
+                    return '\n';
+                    }
+            }
 			}
 	YY_BREAK
-case 101:
+case 150:
+/* rule 150 can match eol */
 YY_RULE_SETUP
-#line 379 "scan.l"
+#line 579 "scan.l"
 {
-			bracelevel = 0;
-			continued_action = false;
-			BEGIN(ACTION);
-			unput( '\n' );	/* so <ACTION> sees it */
-
-			if ( in_rule )
-				{
-				doing_rule_action = true;
-				in_rule = false;
-				return '\n';
-				}
+            if (sf_skip_ws()){
+                /* We're in the middle of a (?x: ) pattern. */
+                ++linenum;
+            }
+            else{
+                bracelevel = 0;
+                continued_action = false;
+                BEGIN(ACTION);
+                unput( '\n' );	/* so <ACTION> sees it */
+
+                if ( in_rule )
+                    {
+                    doing_rule_action = true;
+                    in_rule = false;
+                    return '\n';
+                    }
+            }
 			}
 	YY_BREAK
-case 102:
-#line 394 "scan.l"
-case 103:
+case 151:
+#line 600 "scan.l"
+case 152:
 YY_RULE_SETUP
-#line 394 "scan.l"
+#line 600 "scan.l"
 return EOF_OP;
 	YY_BREAK
-case 104:
+case 153:
 YY_RULE_SETUP
-#line 396 "scan.l"
+#line 602 "scan.l"
 {
 			sectnum = 3;
 			BEGIN(SECT3);
+			outn("/* Begin user sect3 */");
 			yyterminate(); /* to stop the parser */
 			}
 	YY_BREAK
-case 105:
+case 154:
 YY_RULE_SETUP
-#line 402 "scan.l"
+#line 609 "scan.l"
 {
 			int cclval;
 
+			if(yyleng < MAXLINE)
+        		 {
 			strcpy( nmstr, yytext );
+			 }
+			else
+			 {
+			   synerr( _("Input line too long\n"));
+			   FLEX_EXIT(EXIT_FAILURE);
+			 }
 
 			/* Check to see if we've already encountered this
 			 * ccl.
 			 */
-			if ( (cclval = ccllookup( (Char *) nmstr )) != 0 )
+			if (0 /* <--- This "0" effectively disables the reuse of a
+                   * character class (purely based on its source text).
+                   * The reason it was disabled is so yacc/bison can parse
+                   * ccl operations, such as ccl difference and union.
+                   */
+                &&  (cclval = ccllookup( (Char *) nmstr )) != 0 )
 				{
 				if ( input() != ']' )
 					synerr( _( "bad character class" ) );
@@ -2295,15 +3419,41 @@ YY_RULE_SETUP
 				}
 			}
 	YY_BREAK
-case 106:
+case 155:
 YY_RULE_SETUP
-#line 436 "scan.l"
+#line 655 "scan.l"
+return CCL_OP_DIFF;
+	YY_BREAK
+case 156:
+YY_RULE_SETUP
+#line 656 "scan.l"
+return CCL_OP_UNION;
+	YY_BREAK
+/* Check for :space: at the end of the rule so we don't
+     * wrap the expanded regex in '(' ')' -- breaking trailing
+     * context.
+     */
+case 157:
+/* rule 157 can match eol */
+YY_RULE_SETUP
+#line 663 "scan.l"
 {
 			Char *nmdefptr;
-			Char *ndlookup();
+            int end_is_ws, end_ch;
+
+            end_ch = yytext[yyleng-1];
+            end_is_ws = end_ch != '}' ? 1 : 0;
 
+ 			if(yyleng-1 < MAXLINE)
+         		 {
 			strcpy( nmstr, yytext + 1 );
-			nmstr[yyleng - 2] = '\0';  /* chop trailing brace */
+ 			 }
+ 			else
+ 			 {
+ 			   synerr( _("Input line too long\n"));
+ 			   FLEX_EXIT(EXIT_FAILURE);
+ 			 }
+nmstr[yyleng - 2 - end_is_ws] = '\0';  /* chop trailing brace */
 
 			if ( (nmdefptr = ndlookup( nmstr )) == 0 )
 				format_synerr(
@@ -2313,9 +3463,12 @@ YY_RULE_SETUP
 			else
 				{ /* push back name surrounded by ()'s */
 				int len = strlen( (char *) nmdefptr );
+                if (end_is_ws)
+                    unput(end_ch);
 
 				if ( lex_compat || nmdefptr[0] == '^' ||
-				     (len > 0 && nmdefptr[len - 1] == '$') )
+				     (len > 0 && nmdefptr[len - 1] == '$')
+                     || (end_is_ws && trlcontxt && !sf_skip_ws()))
 					{ /* don't use ()'s after all */
 					PUT_BACK_STRING((char *) nmdefptr, 0);
 
@@ -2332,69 +3485,126 @@ YY_RULE_SETUP
 				}
 			}
 	YY_BREAK
-case 107:
+case 158:
+YY_RULE_SETUP
+#line 711 "scan.l"
+{
+                    if (sf_skip_ws())
+                        yy_push_state(COMMENT_DISCARD);
+                    else{
+                        /* Push back the "*" and return "/" as usual. */
+                        yyless(1);
+                        return '/';
+                    }
+                }
+	YY_BREAK
+case 159:
 YY_RULE_SETUP
-#line 470 "scan.l"
+#line 721 "scan.l"
+{
+                    if (lex_compat || posix_compat){
+                        /* Push back the "?#" and treat it like a normal parens. */
+                        yyless(1);
+                        sf_push(); 
+                        return '(';
+                    }
+                    else
+                        yy_push_state(EXTENDED_COMMENT);
+                }
+	YY_BREAK
+case 160:
+YY_RULE_SETUP
+#line 731 "scan.l"
+{
+                    sf_push();
+                    if (lex_compat || posix_compat)
+                        /* Push back the "?" and treat it like a normal parens. */
+                        yyless(1);
+                    else
+                        BEGIN(GROUP_WITH_PARAMS);
+                    return '(';
+                }
+	YY_BREAK
+case 161:
+YY_RULE_SETUP
+#line 740 "scan.l"
+sf_push(); return '(';
+	YY_BREAK
+case 162:
+YY_RULE_SETUP
+#line 741 "scan.l"
+sf_pop(); return ')';
+	YY_BREAK
+case 163:
+YY_RULE_SETUP
+#line 743 "scan.l"
 return (unsigned char) yytext[0];
 	YY_BREAK
-case 108:
+case 164:
 YY_RULE_SETUP
-#line 471 "scan.l"
+#line 744 "scan.l"
 RETURNCHAR;
 	YY_BREAK
 
 
-case 109:
+case 165:
+/* rule 165 can match eol */
+YY_RULE_SETUP
+#line 749 "scan.l"
+++linenum;	/* Allow blank lines & continuations */
+	YY_BREAK
+case 166:
 YY_RULE_SETUP
-#line 476 "scan.l"
+#line 750 "scan.l"
 return (unsigned char) yytext[0];
 	YY_BREAK
-case 110:
+case 167:
 YY_RULE_SETUP
-#line 477 "scan.l"
+#line 751 "scan.l"
 BEGIN(SECT2); return '>';
 	YY_BREAK
-case 111:
-*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
-yy_c_buf_p = yy_cp = yy_bp + 1;
+case 168:
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 478 "scan.l"
+#line 752 "scan.l"
 BEGIN(CARETISBOL); return '>';
 	YY_BREAK
-case 112:
+case 169:
 YY_RULE_SETUP
-#line 479 "scan.l"
+#line 753 "scan.l"
 RETURNNAME;
 	YY_BREAK
-case 113:
+case 170:
 YY_RULE_SETUP
-#line 480 "scan.l"
+#line 754 "scan.l"
 {
 			format_synerr( _( "bad <start condition>: %s" ),
 				yytext );
 			}
 	YY_BREAK
 
-case 114:
+case 171:
 YY_RULE_SETUP
-#line 486 "scan.l"
+#line 760 "scan.l"
 BEGIN(SECT2); return '^';
 	YY_BREAK
 
-case 115:
+case 172:
 YY_RULE_SETUP
-#line 490 "scan.l"
+#line 764 "scan.l"
 RETURNCHAR;
 	YY_BREAK
-case 116:
+case 173:
 YY_RULE_SETUP
-#line 491 "scan.l"
+#line 765 "scan.l"
 BEGIN(SECT2); return '"';
 	YY_BREAK
-case 117:
+case 174:
+/* rule 174 can match eol */
 YY_RULE_SETUP
-#line 493 "scan.l"
+#line 767 "scan.l"
 {
 			synerr( _( "missing quote" ) );
 			BEGIN(SECT2);
@@ -2404,50 +3614,100 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 118:
-*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
-yy_c_buf_p = yy_cp = yy_bp + 1;
+case 175:
+YY_RULE_SETUP
+#line 776 "scan.l"
+BEGIN(SECT2);
+	YY_BREAK
+case 176:
+YY_RULE_SETUP
+#line 777 "scan.l"
+BEGIN(GROUP_MINUS_PARAMS);
+	YY_BREAK
+case 177:
+YY_RULE_SETUP
+#line 778 "scan.l"
+sf_set_case_ins(1);
+	YY_BREAK
+case 178:
+YY_RULE_SETUP
+#line 779 "scan.l"
+sf_set_dot_all(1);
+	YY_BREAK
+case 179:
+YY_RULE_SETUP
+#line 780 "scan.l"
+sf_set_skip_ws(1);
+	YY_BREAK
+
+
+case 180:
+YY_RULE_SETUP
+#line 783 "scan.l"
+BEGIN(SECT2);
+	YY_BREAK
+case 181:
+YY_RULE_SETUP
+#line 784 "scan.l"
+sf_set_case_ins(0);
+	YY_BREAK
+case 182:
+YY_RULE_SETUP
+#line 785 "scan.l"
+sf_set_dot_all(0);
+	YY_BREAK
+case 183:
+YY_RULE_SETUP
+#line 786 "scan.l"
+sf_set_skip_ws(0);
+	YY_BREAK
+
+
+case 184:
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 503 "scan.l"
+#line 790 "scan.l"
 BEGIN(CCL); return '^';
 	YY_BREAK
-case 119:
-*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
-yy_c_buf_p = yy_cp = yy_bp + 1;
+case 185:
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 504 "scan.l"
+#line 791 "scan.l"
 return '^';
 	YY_BREAK
-case 120:
+case 186:
 YY_RULE_SETUP
-#line 505 "scan.l"
+#line 792 "scan.l"
 BEGIN(CCL); RETURNCHAR;
 	YY_BREAK
 
 
-case 121:
-*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
-yy_c_buf_p = yy_cp = yy_bp + 1;
+case 187:
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 509 "scan.l"
+#line 796 "scan.l"
 return '-';
 	YY_BREAK
-case 122:
+case 188:
 YY_RULE_SETUP
-#line 510 "scan.l"
+#line 797 "scan.l"
 RETURNCHAR;
 	YY_BREAK
-case 123:
+case 189:
 YY_RULE_SETUP
-#line 511 "scan.l"
+#line 798 "scan.l"
 BEGIN(SECT2); return ']';
 	YY_BREAK
-case 124:
+case 190:
+/* rule 190 can match eol */
 YY_RULE_SETUP
-#line 512 "scan.l"
+#line 799 "scan.l"
 {
 			synerr( _( "bad character class" ) );
 			BEGIN(SECT2);
@@ -2456,69 +3716,129 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 125:
+case 191:
 YY_RULE_SETUP
-#line 520 "scan.l"
+#line 807 "scan.l"
 BEGIN(CCL); return CCE_ALNUM;
 	YY_BREAK
-case 126:
+case 192:
 YY_RULE_SETUP
-#line 521 "scan.l"
+#line 808 "scan.l"
 BEGIN(CCL); return CCE_ALPHA;
 	YY_BREAK
-case 127:
+case 193:
 YY_RULE_SETUP
-#line 522 "scan.l"
+#line 809 "scan.l"
 BEGIN(CCL); return CCE_BLANK;
 	YY_BREAK
-case 128:
+case 194:
 YY_RULE_SETUP
-#line 523 "scan.l"
+#line 810 "scan.l"
 BEGIN(CCL); return CCE_CNTRL;
 	YY_BREAK
-case 129:
+case 195:
 YY_RULE_SETUP
-#line 524 "scan.l"
+#line 811 "scan.l"
 BEGIN(CCL); return CCE_DIGIT;
 	YY_BREAK
-case 130:
+case 196:
 YY_RULE_SETUP
-#line 525 "scan.l"
+#line 812 "scan.l"
 BEGIN(CCL); return CCE_GRAPH;
 	YY_BREAK
-case 131:
+case 197:
 YY_RULE_SETUP
-#line 526 "scan.l"
+#line 813 "scan.l"
 BEGIN(CCL); return CCE_LOWER;
 	YY_BREAK
-case 132:
+case 198:
 YY_RULE_SETUP
-#line 527 "scan.l"
+#line 814 "scan.l"
 BEGIN(CCL); return CCE_PRINT;
 	YY_BREAK
-case 133:
+case 199:
 YY_RULE_SETUP
-#line 528 "scan.l"
+#line 815 "scan.l"
 BEGIN(CCL); return CCE_PUNCT;
 	YY_BREAK
-case 134:
+case 200:
 YY_RULE_SETUP
-#line 529 "scan.l"
+#line 816 "scan.l"
 BEGIN(CCL); return CCE_SPACE;
 	YY_BREAK
-case 135:
+case 201:
 YY_RULE_SETUP
-#line 530 "scan.l"
+#line 817 "scan.l"
 BEGIN(CCL); return CCE_UPPER;
 	YY_BREAK
-case 136:
+case 202:
 YY_RULE_SETUP
-#line 531 "scan.l"
+#line 818 "scan.l"
 BEGIN(CCL); return CCE_XDIGIT;
 	YY_BREAK
-case 137:
+case 203:
+YY_RULE_SETUP
+#line 820 "scan.l"
+BEGIN(CCL); return CCE_NEG_ALNUM;
+	YY_BREAK
+case 204:
+YY_RULE_SETUP
+#line 821 "scan.l"
+BEGIN(CCL); return CCE_NEG_ALPHA;
+	YY_BREAK
+case 205:
+YY_RULE_SETUP
+#line 822 "scan.l"
+BEGIN(CCL); return CCE_NEG_BLANK;
+	YY_BREAK
+case 206:
+YY_RULE_SETUP
+#line 823 "scan.l"
+BEGIN(CCL); return CCE_NEG_CNTRL;
+	YY_BREAK
+case 207:
+YY_RULE_SETUP
+#line 824 "scan.l"
+BEGIN(CCL); return CCE_NEG_DIGIT;
+	YY_BREAK
+case 208:
+YY_RULE_SETUP
+#line 825 "scan.l"
+BEGIN(CCL); return CCE_NEG_GRAPH;
+	YY_BREAK
+case 209:
+YY_RULE_SETUP
+#line 826 "scan.l"
+BEGIN(CCL); return CCE_NEG_LOWER;
+	YY_BREAK
+case 210:
+YY_RULE_SETUP
+#line 827 "scan.l"
+BEGIN(CCL); return CCE_NEG_PRINT;
+	YY_BREAK
+case 211:
+YY_RULE_SETUP
+#line 828 "scan.l"
+BEGIN(CCL); return CCE_NEG_PUNCT;
+	YY_BREAK
+case 212:
+YY_RULE_SETUP
+#line 829 "scan.l"
+BEGIN(CCL); return CCE_NEG_SPACE;
+	YY_BREAK
+case 213:
+YY_RULE_SETUP
+#line 830 "scan.l"
+BEGIN(CCL); return CCE_NEG_UPPER;
+	YY_BREAK
+case 214:
+YY_RULE_SETUP
+#line 831 "scan.l"
+BEGIN(CCL); return CCE_NEG_XDIGIT;
+	YY_BREAK
+case 215:
 YY_RULE_SETUP
-#line 532 "scan.l"
+#line 832 "scan.l"
 {
 			format_synerr(
 				_( "bad character class expression: %s" ),
@@ -2528,36 +3848,43 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 138:
+case 216:
 YY_RULE_SETUP
-#line 541 "scan.l"
+#line 841 "scan.l"
 {
 			yylval = myctoi( yytext );
 			return NUMBER;
 			}
 	YY_BREAK
-case 139:
+case 217:
 YY_RULE_SETUP
-#line 546 "scan.l"
+#line 846 "scan.l"
 return ',';
 	YY_BREAK
-case 140:
+case 218:
 YY_RULE_SETUP
-#line 547 "scan.l"
-BEGIN(SECT2); return '}';
+#line 847 "scan.l"
+{
+			BEGIN(SECT2);
+			if ( lex_compat || posix_compat )
+				return END_REPEAT_POSIX;
+			else
+				return END_REPEAT_FLEX;
+			}
 	YY_BREAK
-case 141:
+case 219:
 YY_RULE_SETUP
-#line 549 "scan.l"
+#line 855 "scan.l"
 {
 			synerr( _( "bad character inside {}'s" ) );
 			BEGIN(SECT2);
 			return '}';
 			}
 	YY_BREAK
-case 142:
+case 220:
+/* rule 220 can match eol */
 YY_RULE_SETUP
-#line 555 "scan.l"
+#line 861 "scan.l"
 {
 			synerr( _( "missing }" ) );
 			BEGIN(SECT2);
@@ -2567,42 +3894,53 @@ YY_RULE_SETUP
 	YY_BREAK
 
 
-case 143:
+case 221:
 YY_RULE_SETUP
-#line 565 "scan.l"
+#line 871 "scan.l"
 bracelevel = 0;
 	YY_BREAK
-case 144:
+case 222:
 YY_RULE_SETUP
-#line 567 "scan.l"
+#line 873 "scan.l"
 ACTION_ECHO; yy_push_state( COMMENT );
 	YY_BREAK
 
-case 145:
+case 223:
 YY_RULE_SETUP
-#line 570 "scan.l"
+#line 876 "scan.l"
 {
 			ACTION_ECHO;
 			CHECK_REJECT(yytext);
 			}
 	YY_BREAK
-case 146:
+case 224:
 YY_RULE_SETUP
-#line 574 "scan.l"
+#line 880 "scan.l"
 {
 			ACTION_ECHO;
 			CHECK_YYMORE(yytext);
 			}
 	YY_BREAK
 
-case 147:
+case 225:
+YY_RULE_SETUP
+#line 886 "scan.l"
+ACTION_ECHO_QSTART;
+	YY_BREAK
+case 226:
 YY_RULE_SETUP
-#line 580 "scan.l"
+#line 887 "scan.l"
+ACTION_ECHO_QEND;
+	YY_BREAK
+case 227:
+YY_RULE_SETUP
+#line 888 "scan.l"
 ACTION_ECHO;
 	YY_BREAK
-case 148:
+case 228:
+/* rule 228 can match eol */
 YY_RULE_SETUP
-#line 581 "scan.l"
+#line 889 "scan.l"
 {
 			++linenum;
 			ACTION_ECHO;
@@ -2620,39 +3958,55 @@ YY_RULE_SETUP
 
 /* Reject and YYmore() are checked for above, in PERCENT_BRACE_ACTION */
 
-case 149:
+case 229:
 YY_RULE_SETUP
-#line 599 "scan.l"
+#line 907 "scan.l"
 ACTION_ECHO; ++bracelevel;
 	YY_BREAK
-case 150:
+case 230:
 YY_RULE_SETUP
-#line 600 "scan.l"
+#line 908 "scan.l"
 ACTION_ECHO; --bracelevel;
 	YY_BREAK
-case 151:
+case 231:
+YY_RULE_SETUP
+#line 909 "scan.l"
+ACTION_ECHO_QSTART;
+	YY_BREAK
+case 232:
 YY_RULE_SETUP
-#line 601 "scan.l"
+#line 910 "scan.l"
+ACTION_ECHO_QEND;
+	YY_BREAK
+case 233:
+YY_RULE_SETUP
+#line 911 "scan.l"
 ACTION_ECHO;
 	YY_BREAK
-case 152:
+case 234:
 YY_RULE_SETUP
-#line 602 "scan.l"
+#line 912 "scan.l"
 ACTION_ECHO;
 	YY_BREAK
-case 153:
+case 235:
 YY_RULE_SETUP
-#line 603 "scan.l"
+#line 913 "scan.l"
+ACTION_ECHO;
+	YY_BREAK
+case 236:
+YY_RULE_SETUP
+#line 914 "scan.l"
 ACTION_ECHO; /* character constant */
 	YY_BREAK
-case 154:
+case 237:
 YY_RULE_SETUP
-#line 604 "scan.l"
+#line 915 "scan.l"
 ACTION_ECHO; BEGIN(ACTION_STRING);
 	YY_BREAK
-case 155:
+case 238:
+/* rule 238 can match eol */
 YY_RULE_SETUP
-#line 605 "scan.l"
+#line 916 "scan.l"
 {
 			++linenum;
 			ACTION_ECHO;
@@ -2666,51 +4020,62 @@ YY_RULE_SETUP
 				}
 			}
 	YY_BREAK
-case 156:
+case 239:
 YY_RULE_SETUP
-#line 617 "scan.l"
+#line 928 "scan.l"
 ACTION_ECHO;
 	YY_BREAK
 
 
-case 157:
+case 240:
 YY_RULE_SETUP
-#line 621 "scan.l"
+#line 932 "scan.l"
 ACTION_ECHO;
 	YY_BREAK
-case 158:
+case 241:
 YY_RULE_SETUP
-#line 622 "scan.l"
+#line 933 "scan.l"
 ACTION_ECHO;
 	YY_BREAK
-case 159:
+case 242:
+/* rule 242 can match eol */
 YY_RULE_SETUP
-#line 623 "scan.l"
-++linenum; ACTION_ECHO;
+#line 934 "scan.l"
+++linenum; ACTION_ECHO; BEGIN(ACTION);
 	YY_BREAK
-case 160:
+case 243:
 YY_RULE_SETUP
-#line 624 "scan.l"
+#line 935 "scan.l"
 ACTION_ECHO; BEGIN(ACTION);
 	YY_BREAK
-case 161:
+case 244:
 YY_RULE_SETUP
-#line 625 "scan.l"
+#line 936 "scan.l"
 ACTION_ECHO;
 	YY_BREAK
 
 case YY_STATE_EOF(COMMENT):
+case YY_STATE_EOF(COMMENT_DISCARD):
 case YY_STATE_EOF(ACTION):
 case YY_STATE_EOF(ACTION_STRING):
-#line 628 "scan.l"
+#line 939 "scan.l"
 {
 			synerr( _( "EOF encountered inside an action" ) );
 			yyterminate();
 			}
 	YY_BREAK
-case 162:
+case YY_STATE_EOF(EXTENDED_COMMENT):
+case YY_STATE_EOF(GROUP_WITH_PARAMS):
+case YY_STATE_EOF(GROUP_MINUS_PARAMS):
+#line 944 "scan.l"
+{
+			synerr( _( "EOF encountered inside pattern" ) );
+			yyterminate();
+			}
+	YY_BREAK
+case 245:
 YY_RULE_SETUP
-#line 634 "scan.l"
+#line 949 "scan.l"
 {
 			yylval = myesc( (Char *) yytext );
 
@@ -2721,66 +4086,84 @@ YY_RULE_SETUP
 			}
 	YY_BREAK
 
-case 163:
+case 246:
+YY_RULE_SETUP
+#line 960 "scan.l"
+fwrite (escaped_qstart, 1, strlen(escaped_qstart), yyout);
+	YY_BREAK
+case 247:
+YY_RULE_SETUP
+#line 961 "scan.l"
+fwrite (escaped_qend, 1, strlen(escaped_qend), yyout);
+	YY_BREAK
+case 248:
+/* rule 248 can match eol */
 YY_RULE_SETUP
-#line 645 "scan.l"
+#line 962 "scan.l"
+ECHO;
+	YY_BREAK
+case 249:
+/* rule 249 can match eol */
+YY_RULE_SETUP
+#line 963 "scan.l"
 ECHO;
 	YY_BREAK
 case YY_STATE_EOF(SECT3):
-#line 646 "scan.l"
+#line 964 "scan.l"
 sectnum = 0; yyterminate();
 	YY_BREAK
 
-case 164:
+case 250:
+/* rule 250 can match eol */
 YY_RULE_SETUP
-#line 649 "scan.l"
+#line 967 "scan.l"
 format_synerr( _( "bad character: %s" ), yytext );
 	YY_BREAK
-case 165:
+case 251:
 YY_RULE_SETUP
-#line 651 "scan.l"
+#line 969 "scan.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2745 "scan.c"
-case YY_STATE_EOF(INITIAL):
-case YY_STATE_EOF(SECT2):
-case YY_STATE_EOF(CODEBLOCK):
-case YY_STATE_EOF(PICKUPDEF):
-case YY_STATE_EOF(SC):
-case YY_STATE_EOF(CARETISBOL):
-case YY_STATE_EOF(NUM):
-case YY_STATE_EOF(QUOTE):
-case YY_STATE_EOF(FIRSTCCL):
-case YY_STATE_EOF(CCL):
-case YY_STATE_EOF(RECOVER):
-case YY_STATE_EOF(PERCENT_BRACE_ACTION):
-case YY_STATE_EOF(OPTION):
-case YY_STATE_EOF(LINEDIR):
-	yyterminate();
+#line 4127 "<stdout>"
+			case YY_STATE_EOF(INITIAL):
+			case YY_STATE_EOF(SECT2):
+			case YY_STATE_EOF(CODEBLOCK):
+			case YY_STATE_EOF(PICKUPDEF):
+			case YY_STATE_EOF(SC):
+			case YY_STATE_EOF(CARETISBOL):
+			case YY_STATE_EOF(NUM):
+			case YY_STATE_EOF(QUOTE):
+			case YY_STATE_EOF(FIRSTCCL):
+			case YY_STATE_EOF(CCL):
+			case YY_STATE_EOF(RECOVER):
+			case YY_STATE_EOF(PERCENT_BRACE_ACTION):
+			case YY_STATE_EOF(OPTION):
+			case YY_STATE_EOF(LINEDIR):
+				yyterminate();
 
 	case YY_END_OF_BUFFER:
 		{
 		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
 
 		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
+		*yy_cp = (yy_hold_char);
 		YY_RESTORE_YY_MORE_OFFSET
 
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
 			 * just pointed yyin at a new source and called
 			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
+			 * consistency between YY_CURRENT_BUFFER and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -2790,13 +4173,13 @@ case YY_STATE_EOF(LINEDIR):
 		 * end-of-buffer state).  Contrast this with the test
 		 * in input().
 		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			{ /* This was really a NUL. */
 			yy_state_type yy_next_state;
 
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
 
-			yy_current_state = yy_get_previous_state();
+			yy_current_state = yy_get_previous_state(  );
 
 			/* Okay, we're now positioned to make the NUL
 			 * transition.  We couldn't have
@@ -2809,30 +4192,30 @@ case YY_STATE_EOF(LINEDIR):
 
 			yy_next_state = yy_try_NUL_trans( yy_current_state );
 
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 
 			if ( yy_next_state )
 				{
 				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
+				yy_cp = ++(yy_c_buf_p);
 				yy_current_state = yy_next_state;
 				goto yy_match;
 				}
 
 			else
 				{
-				yy_cp = yy_c_buf_p;
+				yy_cp = (yy_c_buf_p);
 				goto yy_find_action;
 				}
 			}
 
-		else switch ( yy_get_next_buffer() )
+		else switch ( yy_get_next_buffer(  ) )
 			{
 			case EOB_ACT_END_OF_FILE:
 				{
-				yy_did_buffer_switch_on_eof = 0;
+				(yy_did_buffer_switch_on_eof) = 0;
 
-				if ( yywrap() )
+				if ( yywrap( ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
@@ -2843,7 +4226,7 @@ case YY_STATE_EOF(LINEDIR):
 					 * YY_NULL, it'll still work - another
 					 * YY_NULL will get returned.
 					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
 
 					yy_act = YY_STATE_EOF(YY_START);
 					goto do_action;
@@ -2851,30 +4234,30 @@ case YY_STATE_EOF(LINEDIR):
 
 				else
 					{
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 					}
 				break;
 				}
 
 			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_match;
 
 			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_find_action;
 			}
 		break;
@@ -2885,8 +4268,7 @@ case YY_STATE_EOF(LINEDIR):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-	} /* end of yylex */
-
+} /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -2895,25 +4277,20 @@ case YY_STATE_EOF(LINEDIR):
  *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *	EOB_ACT_END_OF_FILE - end of file
  */
-
-#ifdef YY_USE_PROTOS
-static int yy_get_next_buffer(void)
-#else
-static int yy_get_next_buffer()
-#endif
-	{
-	char *dest = yy_current_buffer->yy_ch_buf;
-	char *source = yytext_ptr;
+static int yy_get_next_buffer (void)
+{
+    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = (yytext_ptr);
 	int number_to_move, i;
 	int ret_val;
 
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
 		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
 			{
 			/* We matched a single character, the EOB, so
 			 * treat this as a final EOF.
@@ -2933,86 +4310,52 @@ static int yy_get_next_buffer()
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
 
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
 		/* don't do the read, it's not guaranteed to return an EOF,
 		 * just force an EOF
 		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
 
 	else
 		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
+
 			YY_FATAL_ERROR(
 "input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
-
-			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
 
-			num_to_read = yy_current_buffer->yy_buf_size -
-						number_to_move - 1;
-#endif
 			}
 
 		if ( num_to_read > YY_READ_BUF_SIZE )
 			num_to_read = YY_READ_BUF_SIZE;
 
 		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
 
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	if ( yy_n_chars == 0 )
+	if ( (yy_n_chars) == 0 )
 		{
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
+			yyrestart(yyin  );
 			}
 
 		else
 			{
 			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -3020,162 +4363,143 @@ static int yy_get_next_buffer()
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
 
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
 
-	return ret_val;
-	}
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
 
+	return ret_val;
+}
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_get_previous_state(void)
-#else
-static yy_state_type yy_get_previous_state()
-#endif
-	{
+    static yy_state_type yy_get_previous_state (void)
+{
 	yy_state_type yy_current_state;
 	char *yy_cp;
-
-	yy_current_state = yy_start;
+    
+	yy_current_state = (yy_start);
 	yy_current_state += YY_AT_BOL();
 
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+	(yy_state_ptr) = (yy_state_buf);
+	*(yy_state_ptr)++ = yy_current_state;
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
 		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			yy_last_accepting_state = yy_current_state;
-			yy_last_accepting_cpos = yy_cp;
-			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 769 )
+			if ( yy_current_state >= 1107 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		*(yy_state_ptr)++ = yy_current_state;
 		}
 
 	return yy_current_state;
-	}
-
+}
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
  *	next_state = yy_try_NUL_trans( current_state );
  */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
 	int yy_is_jam;
-	char *yy_cp = yy_c_buf_p;
-
+    
 	YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		yy_last_accepting_state = yy_current_state;
-		yy_last_accepting_cpos = yy_cp;
-		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 769 )
+		if ( yy_current_state >= 1107 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 768);
-
-	return yy_is_jam ? 0 : yy_current_state;
-	}
+	yy_is_jam = (yy_current_state == 1106);
+	if ( ! yy_is_jam )
+		*(yy_state_ptr)++ = yy_current_state;
 
+		return yy_is_jam ? 0 : yy_current_state;
+}
 
 #ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-char *yy_bp;
-#endif
-	{
-	char *yy_cp = yy_c_buf_p;
+    static void yyunput (int c, char * yy_bp )
+{
+	char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
 
 	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
+	*yy_cp = (yy_hold_char);
 
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		int number_to_move = yy_n_chars + 2;
-		char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
+		yy_size_t number_to_move = (yy_n_chars) + 2;
+		char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
-		while ( source > yy_current_buffer->yy_ch_buf )
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
 
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
 		}
 
 	*--yy_cp = (char) c;
 
-
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
 #endif	/* ifndef YY_NO_UNPUT */
 
-
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
-static int yyinput()
+    static int yyinput (void)
 #else
-#ifdef YY_USE_PROTOS
-static int input(void)
-#else
-static int input()
-#endif
+    static int input  (void)
 #endif
-	{
-	int c;
 
-	*yy_c_buf_p = yy_hold_char;
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
 
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
 		{
 		/* yy_c_buf_p now points to the character we want to return.
 		 * If this occurs *before* the EOB characters, then it's a
 		 * valid NUL; if not, then we've hit the end of the buffer.
 		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
+			*(yy_c_buf_p) = '\0';
 
 		else
 			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
 
-			switch ( yy_get_next_buffer() )
+			switch ( yy_get_next_buffer(  ) )
 				{
 				case EOB_ACT_LAST_MATCH:
 					/* This happens because yy_g_n_b()
@@ -3189,16 +4513,16 @@ static int input()
 					 */
 
 					/* Reset buffer status. */
-					yyrestart( yyin );
+					yyrestart(yyin );
 
-					/* fall through */
+					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap() )
+					if ( yywrap( ) )
 						return EOF;
 
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 #ifdef __cplusplus
 					return yyinput();
@@ -3208,92 +4532,94 @@ static int input()
 					}
 
 				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
+					(yy_c_buf_p) = (yytext_ptr) + offset;
 					break;
 				}
 			}
 		}
 
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve yytext */
+	(yy_hold_char) = *++(yy_c_buf_p);
 
-	yy_current_buffer->yy_at_bol = (c == '\n');
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
 
 	return c;
-	}
+}
 #endif	/* ifndef YY_NO_INPUT */
 
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void yyrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        yyensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            yy_create_buffer(yyin,YY_BUF_SIZE );
 	}
 
+	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	yy_load_buffer_state( );
+}
 
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		yypop_buffer_state();
+	 *		yypush_buffer_state(new_buffer);
+     */
+	yyensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
-	if ( yy_current_buffer )
+	if ( YY_CURRENT_BUFFER )
 		{
 		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	yy_load_buffer_state( );
 
 	/* We don't actually know whether we did this switch during
 	 * EOF (yywrap()) processing, but the only time this flag
 	 * is looked at is after yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
+	(yy_did_buffer_switch_on_eof) = 1;
+}
 
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
+static void yy_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+{
 	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+    
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
@@ -3302,80 +4628,71 @@ int size;
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
+	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
 	if ( ! b->yy_ch_buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer( b, file );
+	yy_init_buffer(b,file );
 
 	return b;
-	}
-
+}
 
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ * 
+ */
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
 	if ( ! b )
 		return;
 
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
+		yyfree((void *) b->yy_ch_buf  );
 
-	yy_flex_free( (void *) b );
-	}
-
-
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
+	yyfree((void *) b  );
+}
 
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a yyrestart() or at EOF.
+ */
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
-	{
-	yy_flush_buffer( b );
+{
+	int oerrno = errno;
+    
+	yy_flush_buffer(b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-
-	{
-	if ( ! b )
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -3392,29 +4709,125 @@ YY_BUFFER_STATE b;
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
+	if ( b == YY_CURRENT_BUFFER )
+		yy_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	yyensure_buffer_stack();
+
+	/* This block is copied from yy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from yy_switch_to_buffer. */
+	yy_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void yypop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	yy_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		yy_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
 	}
+}
 
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (void)
+{
+	yy_size_t num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
 
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-	{
-	YY_BUFFER_STATE b;
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
 
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
 		return 0;
 
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
@@ -3428,56 +4841,51 @@ yy_size_t size;
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer( b );
+	yy_switch_to_buffer(b  );
 
 	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len );
-	}
-#endif
+}
 
-
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-	{
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
+{
+    
+	return yy_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+{
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	int i;
-
+	yy_size_t i;
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
+	n = _yybytes_len + 2;
+	buf = (char *) yyalloc(n  );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
 
-	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = yy_scan_buffer( buf, n );
+	b = yy_scan_buffer(buf,n );
 	if ( ! b )
 		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
@@ -3487,86 +4895,49 @@ int len;
 	b->yy_is_our_buffer = 1;
 
 	return b;
-	}
-#endif
+}
 
-
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
+    static void yy_push_state (int  new_state )
+{
+    	if ( (yy_start_stack_ptr) >= (yy_start_stack_depth) )
 		{
 		yy_size_t new_size;
 
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
+		(yy_start_stack_depth) += YY_START_STACK_INCR;
+		new_size = (yy_start_stack_depth) * sizeof( int );
 
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
+		if ( ! (yy_start_stack) )
+			(yy_start_stack) = (int *) yyalloc(new_size  );
 
 		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
+			(yy_start_stack) = (int *) yyrealloc((void *) (yy_start_stack),new_size  );
 
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
+		if ( ! (yy_start_stack) )
+			YY_FATAL_ERROR( "out of memory expanding start-condition stack" );
 		}
 
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
+	(yy_start_stack)[(yy_start_stack_ptr)++] = YY_START;
 
 	BEGIN(new_state);
-	}
-#endif
-
+}
 
-#ifndef YY_NO_POP_STATE
-#ifdef YY_USE_PROTOS
-static void yy_pop_state(void)
-#else
-static void yy_pop_state()
-#endif
-	{
-	if ( --yy_start_stack_ptr < 0 )
+    static void yy_pop_state  (void)
+{
+    	if ( --(yy_start_stack_ptr) < 0 )
 		YY_FATAL_ERROR( "start-condition stack underflow" );
 
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-#ifdef YY_USE_PROTOS
-static int yy_top_state(void)
-#else
-static int yy_top_state()
-#endif
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
+	BEGIN((yy_start_stack)[(yy_start_stack_ptr)]);
+}
 
 #ifndef YY_EXIT_FAILURE
 #define YY_EXIT_FAILURE 2
 #endif
 
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
-	}
-
-
+}
 
 /* Redefine yyless() so it works in section 3 code. */
 
@@ -3575,68 +4946,193 @@ char msg[];
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		yytext[yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = yytext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		yyleng = yyless_macro_arg; \
 		} \
 	while ( 0 )
 
+/* Accessor  methods (get/set functions) to struct members. */
 
-/* Internal utility routines. */
+/** Get the current line number.
+ * 
+ */
+int yyget_lineno  (void)
+{
+        
+    return yylineno;
+}
 
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
+/** Get the input stream.
+ * 
+ */
+FILE *yyget_in  (void)
+{
+        return yyin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *yyget_out  (void)
+{
+        return yyout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+yy_size_t yyget_leng  (void)
+{
+        return yyleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *yyget_text  (void)
+{
+        return yytext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void yyset_lineno (int  line_number )
+{
+    
+    yylineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE *  in_str )
+{
+        yyin = in_str ;
+}
+
+void yyset_out (FILE *  out_str )
+{
+        yyout = out_str ;
+}
+
+int yyget_debug  (void)
+{
+        return yy_flex_debug;
+}
+
+void yyset_debug (int  bdebug )
+{
+        yy_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from yylex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+    (yy_start_stack_ptr) = 0;
+    (yy_start_stack_depth) = 0;
+    (yy_start_stack) =  NULL;
+
+    (yy_state_buf) = 0;
+    (yy_state_ptr) = 0;
+    (yy_full_match) = 0;
+    (yy_lp) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    yyin = stdin;
+    yyout = stdout;
 #else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
 #endif
-	{
+
+    /* For future reference: Set errno on error, since we are called by
+     * yylex_init()
+     */
+    return 0;
+}
+
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		yy_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		yypop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	yyfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Destroy the start condition stack. */
+        yyfree((yy_start_stack)  );
+        (yy_start_stack) = NULL;
+
+    yyfree ( (yy_state_buf) );
+    (yy_state_buf)  = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * yylex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
 	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-	}
+}
 #endif
 
 #ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
+static int yy_flex_strlen (yyconst char * s )
+{
 	int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-	}
+}
 #endif
 
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
+void *yyalloc (yy_size_t  size )
+{
 	return (void *) malloc( size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
+void *yyrealloc  (void * ptr, yy_size_t  size )
+{
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -3645,26 +5141,17 @@ yy_size_t size;
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
+void yyfree (void * ptr )
+{
+	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 969 "scan.l"
 
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
-#endif
-#line 651 "scan.l"
 
 
 
@@ -3726,3 +5213,4 @@ void *ptr;
 	if ( ptr )
 		free( ptr );
 	}
+
diff --git a/usr.bin/lex/initskel.c b/usr.bin/lex/initskel.c
new file mode 100644
index 0000000..8b756a3
--- /dev/null
+++ b/usr.bin/lex/initskel.c
@@ -0,0 +1,3738 @@
+/* $FreeBSD$ */
+/* File created from flex.skl via mkskel.sh */
+
+#include "flexdef.h"
+
+const char *skel[] = {
+  "%# -*-C-*- vi: set ft=c:",
+  "%# This file is processed in several stages.",
+  "%# Here are the stages, as best as I can describe:",
+  "%#",
+  "%#   1. flex.skl is processed through GNU m4 during the",
+  "%#      pre-compilation stage of flex. Only macros starting",
+  "%#      with `m4_' are processed, and quoting is normal.",
+  "%#",
+  "%#   2. The preprocessed skeleton is translated verbatim into a",
+  "%#      C array, saved as \"skel.c\" and compiled into the flex binary.",
+  "%#",
+  "%#   3. At runtime, the skeleton is generated and filtered (again)",
+  "%#      through m4. Macros beginning with `m4_' will be processed.",
+  "%#      The quoting is \"[[\" and \"]]\" so we don't interfere with",
+  "%#      user code.",
+  "%# ",
+  "%# All generate macros for the m4 stage contain the text \"m4\" or \"M4\"",
+  "%# in them. This is to distinguish them from CPP macros.",
+  "%# The exception to this rule is YY_G, which is an m4 macro, ",
+  "%# but it needs to be remain short because it is used everywhere.",
+  "%#",
+  "/* A lexical scanner generated by flex */",
+  "",
+  "%#  Macros for preproc stage.",
+  "",
+  "",
+  "%# Macros for runtime processing stage.",
+  "m4_changecom",
+  "m4_changequote",
+  "m4_changequote([[, ]])",
+  "",
+  "%# ",
+  "%# Lines in this skeleton starting with a \"%\" character are \"control lines\"",
+  "%# and affect the generation of the scanner. The possible control codes are",
+  "%# listed and processed in misc.c.",
+  "%#",
+  "%#   %#  -  A comment. The current line is omitted from the generated scanner.",
+  "%#   %if-c++-only  -  The following lines are printed for C++ scanners ONLY.",
+  "%#   %if-c-only    -  The following lines are NOT printed for C++ scanners.",
+  "%#   %if-c-or-c++  -  The following lines are printed in BOTH C and C++ scanners.",
+  "%#   %if-reentrant     - Print for reentrant scanners.(push)",
+  "%#   %if-not-reentrant - Print for non-reentrant scanners. (push)",
+  "%#   %if-bison-bridge  - Print for bison-bridge. (push)",
+  "%#   %if-not-bison-bridge  - Print for non-bison-bridge. (push)",
+  "%#   %endif        - pop from the previous if code.",
+  "%#   %%  -  A stop-point, where code is inserted by flex.",
+  "%#          Each stop-point is numbered here and also in the code generator.",
+  "%#          (See gen.c, etc. for details.)",
+  "%#   %not-for-header  -  Begin code that should NOT appear in a \".h\" file.",
+  "%#   %ok-for-header   -  %c and %e are used for building a header file.",
+  "%#   %if-tables-serialization",
+  "%#",
+  "%#   All control-lines EXCEPT comment lines (\"%#\") will be inserted into",
+  "%#   the generated scanner as a C-style comment. This is to aid those who",
+  "%#   edit the skeleton.",
+  "%#",
+  "",
+  "%not-for-header",
+  "%if-c-only",
+  "%if-not-reentrant",
+  "m4_ifelse(M4_YY_PREFIX,yy,,",
+  "#define yy_create_buffer M4_YY_PREFIX[[_create_buffer]]",
+  "#define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]]",
+  "#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]]",
+  "#define yy_init_buffer M4_YY_PREFIX[[_init_buffer]]",
+  "#define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]]",
+  "#define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]]",
+  "#define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]]",
+  "#define yyin M4_YY_PREFIX[[in]]",
+  "#define yyleng M4_YY_PREFIX[[leng]]",
+  "#define yylex M4_YY_PREFIX[[lex]]",
+  "#define yylineno M4_YY_PREFIX[[lineno]]",
+  "#define yyout M4_YY_PREFIX[[out]]",
+  "#define yyrestart M4_YY_PREFIX[[restart]]",
+  "#define yytext M4_YY_PREFIX[[text]]",
+  "#define yywrap M4_YY_PREFIX[[wrap]]",
+  "#define yyalloc M4_YY_PREFIX[[alloc]]",
+  "#define yyrealloc M4_YY_PREFIX[[realloc]]",
+  "#define yyfree M4_YY_PREFIX[[free]]",
+  ")",
+  "%endif",
+  "%endif",
+  "%ok-for-header",
+  "",
+  "#define FLEX_SCANNER",
+  "#define YY_FLEX_MAJOR_VERSION 2",
+  "#define YY_FLEX_MINOR_VERSION 5",
+  "#define YY_FLEX_SUBMINOR_VERSION 37",
+  "#if YY_FLEX_SUBMINOR_VERSION > 0",
+  "#define FLEX_BETA",
+  "#endif",
+  "",
+  "%# Some negated symbols",
+  "m4_ifdef( [[M4_YY_IN_HEADER]], , [[m4_define([[M4_YY_NOT_IN_HEADER]], [[]])]])",
+  "m4_ifdef( [[M4_YY_REENTRANT]], , [[m4_define([[M4_YY_NOT_REENTRANT]], [[]])]])",
+  "",
+  "%# This is the m4 way to say \"(stack_used || is_reentrant)",
+  "m4_ifdef( [[M4_YY_STACK_USED]], [[m4_define([[M4_YY_HAS_START_STACK_VARS]])]])",
+  "m4_ifdef( [[M4_YY_REENTRANT]],  [[m4_define([[M4_YY_HAS_START_STACK_VARS]])]])",
+  "",
+  "%# Prefixes.",
+  "%# The complexity here is necessary so that m4 preserves",
+  "%# the argument lists to each C function.",
+  "",
+  "",
+  "m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define([[M4_YY_PREFIX]], [[yy]])]])",
+  "",
+  "",
+  "",
+  "%if-c++-only",
+  "    /* The c++ scanner is a mess. The FlexLexer.h header file relies on the",
+  "     * following macro. This is required in order to pass the c++-multiple-scanners",
+  "     * test in the regression suite. We get reports that it breaks inheritance.",
+  "     * We will address this in a future release of flex, or omit the C++ scanner",
+  "     * altogether.",
+  "     */",
+  "    #define yyFlexLexer M4_YY_PREFIX[[FlexLexer]]",
+  "%endif",
+  "",
+  "%if-c-only",
+  "    m4_define(yy[[_create_buffer]], [[M4_YY_PREFIX[[_create_buffer]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[_delete_buffer]], [[M4_YY_PREFIX[[_delete_buffer]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[_scan_buffer]], [[M4_YY_PREFIX[[_scan_buffer]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[_scan_string]], [[M4_YY_PREFIX[[_scan_string]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[_scan_bytes]], [[M4_YY_PREFIX[[_scan_bytes]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[_init_buffer]], [[M4_YY_PREFIX[[_init_buffer]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[_flush_buffer]], [[M4_YY_PREFIX[[_flush_buffer]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[_load_buffer_state]], [[M4_YY_PREFIX[[_load_buffer_state]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[_switch_to_buffer]], [[M4_YY_PREFIX[[_switch_to_buffer]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[push_buffer_state]], [[M4_YY_PREFIX[[push_buffer_state]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[pop_buffer_state]], [[M4_YY_PREFIX[[pop_buffer_state]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[ensure_buffer_stack]], [[M4_YY_PREFIX[[ensure_buffer_stack]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[lex]], [[M4_YY_PREFIX[[lex]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[restart]], [[M4_YY_PREFIX[[restart]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[lex_init]], [[M4_YY_PREFIX[[lex_init]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[lex_init_extra]], [[M4_YY_PREFIX[[lex_init_extra]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[lex_destroy]], [[M4_YY_PREFIX[[lex_destroy]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[get_debug]], [[M4_YY_PREFIX[[get_debug]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[set_debug]], [[M4_YY_PREFIX[[set_debug]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[get_extra]], [[M4_YY_PREFIX[[get_extra]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[set_extra]], [[M4_YY_PREFIX[[set_extra]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[get_in]], [[M4_YY_PREFIX[[get_in]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[set_in]], [[M4_YY_PREFIX[[set_in]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[get_out]], [[M4_YY_PREFIX[[get_out]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[set_out]], [[M4_YY_PREFIX[[set_out]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[get_leng]], [[M4_YY_PREFIX[[get_leng]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[get_text]], [[M4_YY_PREFIX[[get_text]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[get_lineno]], [[M4_YY_PREFIX[[get_lineno]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[set_lineno]], [[M4_YY_PREFIX[[set_lineno]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_ifdef( [[M4_YY_REENTRANT]],",
+  "    [[",
+  "        m4_define(yy[[get_column]], [[M4_YY_PREFIX[[get_column]]m4_ifelse($#,0,,[[($@)]])]])",
+  "        m4_define(yy[[set_column]], [[M4_YY_PREFIX[[set_column]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    ]])",
+  "    m4_define(yy[[wrap]], [[M4_YY_PREFIX[[wrap]]m4_ifelse($#,0,,[[($@)]])]])",
+  "%endif",
+  "",
+  "m4_ifdef( [[M4_YY_BISON_LVAL]],",
+  "[[",
+  "    m4_define(yy[[get_lval]], [[M4_YY_PREFIX[[get_lval]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[set_lval]], [[M4_YY_PREFIX[[set_lval]]m4_ifelse($#,0,,[[($@)]])]])",
+  "]])",
+  "",
+  "m4_ifdef( [[<M4_YY_BISON_LLOC>]],",
+  "[[",
+  "    m4_define(yy[[get_lloc]], [[M4_YY_PREFIX[[get_lloc]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[set_lloc]], [[M4_YY_PREFIX[[set_lloc]]m4_ifelse($#,0,,[[($@)]])]])",
+  "]])",
+  "",
+  "",
+  "    m4_define(yy[[alloc]], [[M4_YY_PREFIX[[alloc]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[realloc]], [[M4_YY_PREFIX[[realloc]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[free]], [[M4_YY_PREFIX[[free]]m4_ifelse($#,0,,[[($@)]])]])",
+  "",
+  "%if-c-only",
+  "m4_ifdef( [[M4_YY_NOT_REENTRANT]],",
+  "[[",
+  "    m4_define(yy[[text]], [[M4_YY_PREFIX[[text]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[leng]], [[M4_YY_PREFIX[[leng]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[in]], [[M4_YY_PREFIX[[in]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[out]], [[M4_YY_PREFIX[[out]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[_flex_debug]], [[M4_YY_PREFIX[[_flex_debug]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[lineno]], [[M4_YY_PREFIX[[lineno]]m4_ifelse($#,0,,[[($@)]])]])",
+  "]])",
+  "%endif",
+  "",
+  "",
+  "m4_ifdef( [[M4_YY_TABLES_EXTERNAL]],",
+  "[[",
+  "    m4_define(yy[[tables_fload]], [[M4_YY_PREFIX[[tables_fload]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[tables_destroy]], [[M4_YY_PREFIX[[tables_destroy]]m4_ifelse($#,0,,[[($@)]])]])",
+  "    m4_define(yy[[TABLES_NAME]], [[M4_YY_PREFIX[[TABLES_NAME]]m4_ifelse($#,0,,[[($@)]])]])",
+  "]])",
+  "",
+  "/* First, we deal with  platform-specific or compiler-specific issues. */",
+  "",
+  "#if defined(__FreeBSD__)",
+  "#ifndef __STDC_LIMIT_MACROS",
+  "#define	__STDC_LIMIT_MACROS",
+  "#endif",
+  "#include <sys/cdefs.h>",
+  "#include <stdint.h>",
+  "#else",
+  "#define	__dead2",
+  "#endif",
+  "",
+  "/* begin standard C headers. */",
+  "%if-c-only",
+  "#include <stdio.h>",
+  "#include <string.h>",
+  "#include <errno.h>",
+  "#include <stdlib.h>",
+  "%endif",
+  "",
+  "%if-tables-serialization",
+  "#include <sys/types.h>",
+  "#include <netinet/in.h>",
+  "%endif",
+  "/* end standard C headers. */",
+  "",
+  "%if-c-or-c++",
+  "/* flex integer type definitions */",
+  "",
+  "#ifndef FLEXINT_H",
+  "#define FLEXINT_H",
+  "",
+  "/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */",
+  "",
+  "#if defined(__FreeBSD__) || \\",
+  "    (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)",
+  "",
+  "/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,",
+  " * if you want the limit (max/min) macros for int types. ",
+  " */",
+  "#ifndef __STDC_LIMIT_MACROS",
+  "#define __STDC_LIMIT_MACROS 1",
+  "#endif",
+  "",
+  "#include <inttypes.h>",
+  "typedef int8_t flex_int8_t;",
+  "typedef uint8_t flex_uint8_t;",
+  "typedef int16_t flex_int16_t;",
+  "typedef uint16_t flex_uint16_t;",
+  "typedef int32_t flex_int32_t;",
+  "typedef uint32_t flex_uint32_t;",
+  "#else",
+  "typedef signed char flex_int8_t;",
+  "typedef short int flex_int16_t;",
+  "typedef int flex_int32_t;",
+  "typedef unsigned char flex_uint8_t; ",
+  "typedef unsigned short int flex_uint16_t;",
+  "typedef unsigned int flex_uint32_t;",
+  "",
+  "/* Limits of integral types. */",
+  "#ifndef INT8_MIN",
+  "#define INT8_MIN               (-128)",
+  "#endif",
+  "#ifndef INT16_MIN",
+  "#define INT16_MIN              (-32767-1)",
+  "#endif",
+  "#ifndef INT32_MIN",
+  "#define INT32_MIN              (-2147483647-1)",
+  "#endif",
+  "#ifndef INT8_MAX",
+  "#define INT8_MAX               (127)",
+  "#endif",
+  "#ifndef INT16_MAX",
+  "#define INT16_MAX              (32767)",
+  "#endif",
+  "#ifndef INT32_MAX",
+  "#define INT32_MAX              (2147483647)",
+  "#endif",
+  "#ifndef UINT8_MAX",
+  "#define UINT8_MAX              (255U)",
+  "#endif",
+  "#ifndef UINT16_MAX",
+  "#define UINT16_MAX             (65535U)",
+  "#endif",
+  "#ifndef UINT32_MAX",
+  "#define UINT32_MAX             (4294967295U)",
+  "#endif",
+  "",
+  "#endif /* ! C99 */",
+  "",
+  "#endif /* ! FLEXINT_H */",
+  "",
+  "%endif",
+  "",
+  "%if-c++-only",
+  "/* begin standard C++ headers. */",
+  "#include <iostream> ",
+  "#include <errno.h>",
+  "#include <cstdlib>",
+  "#include <cstdio>",
+  "#include <cstring>",
+  "/* end standard C++ headers. */",
+  "%endif",
+  "",
+  "#ifdef __cplusplus",
+  "",
+  "/* The \"const\" storage-class-modifier is valid. */",
+  "#define YY_USE_CONST",
+  "",
+  "#else	/* ! __cplusplus */",
+  "",
+  "/* C99 requires __STDC__ to be defined as 1. */",
+  "#if defined (__STDC__)",
+  "",
+  "#define YY_USE_CONST",
+  "",
+  "#endif	/* defined (__STDC__) */",
+  "#endif	/* ! __cplusplus */",
+  "",
+  "#ifdef YY_USE_CONST",
+  "#define yyconst const",
+  "#else",
+  "#define yyconst",
+  "#endif",
+  "",
+  "%# For compilers that can not handle prototypes.",
+  "%# e.g.,",
+  "%# The function prototype",
+  "%#    int foo(int x, char* y);",
+  "%# ",
+  "%# ...should be written as",
+  "%#    int foo M4_YY_PARAMS(int x, char* y);",
+  "%# ",
+  "%# ...which could possibly generate",
+  "%#    int foo ();",
+  "%# ",
+  "m4_ifdef( [[M4_YY_NO_ANSI_FUNC_PROTOS]],",
+  "[[",
+  "    m4_define( [[M4_YY_PARAMS]], [[()]])",
+  "]],",
+  "[[",
+  "    m4_define( [[M4_YY_PARAMS]], [[($*)]])",
+  "]])",
+  "",
+  "%not-for-header",
+  "/* Returned upon end-of-file. */",
+  "#define YY_NULL 0",
+  "%ok-for-header",
+  "",
+  "%not-for-header",
+  "/* Promotes a possibly negative, possibly signed char to an unsigned",
+  " * integer for use as an array index.  If the signed char is negative,",
+  " * we want to instead treat it as an 8-bit unsigned char, hence the",
+  " * double cast.",
+  " */",
+  "#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)",
+  "%ok-for-header",
+  "",
+  "",
+  "",
+  "%if-reentrant",
+  "",
+  "/* An opaque pointer. */",
+  "#ifndef YY_TYPEDEF_YY_SCANNER_T",
+  "#define YY_TYPEDEF_YY_SCANNER_T",
+  "typedef void* yyscan_t;",
+  "#endif",
+  "",
+  "%# Declare yyguts variable",
+  "m4_define( [[M4_YY_DECL_GUTS_VAR]], [[struct yyguts_t * yyg = (struct yyguts_t*)yyscanner]])",
+  "%# Perform a noop access on yyguts to prevent unused variable complains",
+  "m4_define( [[M4_YY_NOOP_GUTS_VAR]], [[(void)yyg]])",
+  "%# For use wherever a Global is accessed or assigned.",
+  "m4_define( [[YY_G]], [[yyg->$1]])",
+  "",
+  "%# For use in function prototypes to append the additional argument.",
+  "m4_define( [[M4_YY_PROTO_LAST_ARG]],  [[, yyscan_t yyscanner]])",
+  "m4_define( [[M4_YY_PROTO_ONLY_ARG]],  [[yyscan_t yyscanner]])",
+  "",
+  "%# For use in function definitions to append the additional argument.",
+  "m4_ifdef( [[M4_YY_NO_ANSI_FUNC_DEFS]],",
+  "[[",
+  "    m4_define( [[M4_YY_DEF_LAST_ARG]], [[, yyscanner]])",
+  "    m4_define( [[M4_YY_DEF_ONLY_ARG]], [[yyscanner]])",
+  "]],",
+  "[[",
+  "    m4_define( [[M4_YY_DEF_LAST_ARG]],  [[, yyscan_t yyscanner]])",
+  "    m4_define( [[M4_YY_DEF_ONLY_ARG]],  [[yyscan_t yyscanner]])",
+  "]])",
+  "m4_define( [[M4_YY_DECL_LAST_ARG]],  [[yyscan_t yyscanner;]])",
+  "",
+  "%# For use in function calls to pass the additional argument.",
+  "m4_define( [[M4_YY_CALL_LAST_ARG]], [[, yyscanner]])",
+  "m4_define( [[M4_YY_CALL_ONLY_ARG]], [[yyscanner]])",
+  "",
+  "%# For use in function documentation to adjust for additional argument.",
+  "m4_define( [[M4_YY_DOC_PARAM]], [[@param yyscanner The scanner object.]])",
+  "",
+  "/* For convenience, these vars (plus the bison vars far below)",
+  "   are macros in the reentrant scanner. */",
+  "#define yyin YY_G(yyin_r)",
+  "#define yyout YY_G(yyout_r)",
+  "#define yyextra YY_G(yyextra_r)",
+  "#define yyleng YY_G(yyleng_r)",
+  "#define yytext YY_G(yytext_r)",
+  "#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)",
+  "#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)",
+  "#define yy_flex_debug YY_G(yy_flex_debug_r)",
+  "",
+  "m4_define( [[M4_YY_INCR_LINENO]],",
+  "[[   ",
+  "    do{ yylineno++;",
+  "        yycolumn=0;",
+  "    }while(0)",
+  "]])",
+  "",
+  "%endif",
+  "",
+  "",
+  "",
+  "%if-not-reentrant",
+  "",
+  "m4_define( [[M4_YY_INCR_LINENO]],",
+  "[[   ",
+  "    yylineno++;",
+  "]])",
+  "",
+  "%# Define these macros to be no-ops.",
+  "m4_define( [[M4_YY_DECL_GUTS_VAR]], [[m4_dnl]])",
+  "m4_define( [[M4_YY_NOOP_GUTS_VAR]], [[m4_dnl]])",
+  "m4_define( [[YY_G]], [[($1)]])",
+  "m4_define( [[M4_YY_PROTO_LAST_ARG]])",
+  "m4_define( [[M4_YY_PROTO_ONLY_ARG]],  [[void]])",
+  "m4_define( [[M4_YY_DEF_LAST_ARG]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_ANSI_FUNC_DEFS]],",
+  "[[",
+  "    m4_define( [[M4_YY_DEF_ONLY_ARG]])",
+  "]],",
+  "[[",
+  "    m4_define( [[M4_YY_DEF_ONLY_ARG]],  [[void]])",
+  "]])",
+  "m4_define([[M4_YY_DECL_LAST_ARG]])",
+  "m4_define([[M4_YY_CALL_LAST_ARG]])",
+  "m4_define([[M4_YY_CALL_ONLY_ARG]])",
+  "m4_define( [[M4_YY_DOC_PARAM]], [[]])",
+  "",
+  "%endif",
+  "",
+  "",
+  "m4_ifdef( [[M4_YY_NO_ANSI_FUNC_DEFS]],",
+  "[[",
+  "%# For compilers that need traditional function definitions.",
+  "%# e.g.,",
+  "%# The function prototype taking 2 arguments",
+  "%#    int foo (int x, char* y)",
+  "%#",
+  "%# ...should be written as",
+  "%#    int foo YYFARGS2(int,x, char*,y)",
+  "%#",
+  "%# ...which could possibly generate",
+  "%#    int foo (x,y,yyscanner)",
+  "%#        int x;",
+  "%#        char * y;",
+  "%#        yyscan_t yyscanner;",
+  "%#",
+  "%# Generate traditional function defs",
+  "    m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) [[\\]]",
+  "        M4_YY_DECL_LAST_ARG]])",
+  "    m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) [[\\]]",
+  "        $1 $2; [[\\]]",
+  "        M4_YY_DECL_LAST_ARG]])",
+  "    m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) [[\\]]",
+  "        $1 $2; [[\\]]",
+  "        $3 $4; [[\\]]",
+  "        M4_YY_DECL_LAST_ARG]])",
+  "    m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) [[\\]]",
+  "        $1 $2; [[\\]]",
+  "        $3 $4; [[\\]]",
+  "        $5 $6; [[\\]]",
+  "        M4_YY_DECL_LAST_ARG]])",
+  "]],",
+  "[[",
+  "%# Generate C99 function defs.",
+  "    m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG)]])",
+  "    m4_define( [[YYFARGS1]], [[($1 $2 M4_YY_DEF_LAST_ARG)]])",
+  "    m4_define( [[YYFARGS2]], [[($1 $2, $3 $4 M4_YY_DEF_LAST_ARG)]])",
+  "    m4_define( [[YYFARGS3]], [[($1 $2, $3 $4, $5 $6 M4_YY_DEF_LAST_ARG)]])",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* Enter a start condition.  This macro really ought to take a parameter,",
+  " * but we do it the disgusting crufty way forced on us by the ()-less",
+  " * definition of BEGIN.",
+  " */",
+  "#define BEGIN YY_G(yy_start) = 1 + 2 *",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* Translate the current start state into a value that can be later handed",
+  " * to BEGIN to return to the state.  The YYSTATE alias is for lex",
+  " * compatibility.",
+  " */",
+  "#define YY_START ((YY_G(yy_start) - 1) / 2)",
+  "#define YYSTATE YY_START",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* Action number for EOF rule of a given start state. */",
+  "#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* Special action meaning \"start processing a new file\". */",
+  "#define YY_NEW_FILE yyrestart( yyin M4_YY_CALL_LAST_ARG )",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "#define YY_END_OF_BUFFER_CHAR 0",
+  "]])",
+  "",
+  "/* Size of default input buffer. */",
+  "#ifndef YY_BUF_SIZE",
+  "#define YY_BUF_SIZE 16384",
+  "#endif",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* The state buf must be large enough to hold one state per character in the main buffer.",
+  " */",
+  "#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))",
+  "]])",
+  "",
+  "",
+  "#ifndef YY_TYPEDEF_YY_BUFFER_STATE",
+  "#define YY_TYPEDEF_YY_BUFFER_STATE",
+  "typedef struct yy_buffer_state *YY_BUFFER_STATE;",
+  "#endif",
+  "",
+  "#ifndef YY_TYPEDEF_YY_SIZE_T",
+  "#define YY_TYPEDEF_YY_SIZE_T",
+  "typedef size_t yy_size_t;",
+  "#endif",
+  "",
+  "%if-not-reentrant",
+  "extern yy_size_t yyleng;",
+  "%endif",
+  "",
+  "%if-c-only",
+  "%if-not-reentrant",
+  "extern FILE *yyin, *yyout;",
+  "%endif",
+  "%endif",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "#define EOB_ACT_CONTINUE_SCAN 0",
+  "#define EOB_ACT_END_OF_FILE 1",
+  "#define EOB_ACT_LAST_MATCH 2",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "    m4_ifdef( [[M4_YY_USE_LINENO]],",
+  "    [[",
+  "    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires",
+  "     *       access to the local variable yy_act. Since yyless() is a macro, it would break",
+  "     *       existing scanners that call yyless() from OUTSIDE yylex. ",
+  "     *       One obvious solution it to make yy_act a global. I tried that, and saw",
+  "     *       a 5% performance hit in a non-yylineno scanner, because yy_act is",
+  "     *       normally declared as a register variable-- so it is not worth it.",
+  "     */",
+  "    #define  YY_LESS_LINENO(n) \\",
+  "            do { \\",
+  "                int yyl;\\",
+  "                for ( yyl = n; yyl < yyleng; ++yyl )\\",
+  "                    if ( yytext[yyl] == '\\n' )\\",
+  "                        --yylineno;\\",
+  "            }while(0)",
+  "    ]],",
+  "    [[",
+  "    #define YY_LESS_LINENO(n)",
+  "    ]])",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* Return all but the first \"n\" matched characters back to the input stream. */",
+  "#define yyless(n) \\",
+  "	do \\",
+  "		{ \\",
+  "		/* Undo effects of setting up yytext. */ \\",
+  "        int yyless_macro_arg = (n); \\",
+  "        YY_LESS_LINENO(yyless_macro_arg);\\",
+  "		*yy_cp = YY_G(yy_hold_char); \\",
+  "		YY_RESTORE_YY_MORE_OFFSET \\",
+  "		YY_G(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \\",
+  "		YY_DO_BEFORE_ACTION; /* set up yytext again */ \\",
+  "		} \\",
+  "	while ( 0 )",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "#define unput(c) yyunput( c, YY_G(yytext_ptr) M4_YY_CALL_LAST_ARG )",
+  "]])",
+  "",
+  "#ifndef YY_STRUCT_YY_BUFFER_STATE",
+  "#define YY_STRUCT_YY_BUFFER_STATE",
+  "struct yy_buffer_state",
+  "	{",
+  "%if-c-only",
+  "	FILE *yy_input_file;",
+  "%endif",
+  "",
+  "%if-c++-only",
+  "	std::istream* yy_input_file;",
+  "%endif",
+  "",
+  "",
+  "	char *yy_ch_buf;		/* input buffer */",
+  "	char *yy_buf_pos;		/* current position in input buffer */",
+  "",
+  "	/* Size of input buffer in bytes, not including room for EOB",
+  "	 * characters.",
+  "	 */",
+  "	yy_size_t yy_buf_size;",
+  "",
+  "	/* Number of characters read into yy_ch_buf, not including EOB",
+  "	 * characters.",
+  "	 */",
+  "	yy_size_t yy_n_chars;",
+  "",
+  "	/* Whether we \"own\" the buffer - i.e., we know we created it,",
+  "	 * and can realloc() it to grow it, and should free() it to",
+  "	 * delete it.",
+  "	 */",
+  "	int yy_is_our_buffer;",
+  "",
+  "	/* Whether this is an \"interactive\" input source; if so, and",
+  "	 * if we're using stdio for input, then we want to use getc()",
+  "	 * instead of fread(), to make sure we stop fetching input after",
+  "	 * each newline.",
+  "	 */",
+  "	int yy_is_interactive;",
+  "",
+  "	/* Whether we're considered to be at the beginning of a line.",
+  "	 * If so, '^' rules will be active on the next match, otherwise",
+  "	 * not.",
+  "	 */",
+  "	int yy_at_bol;",
+  "",
+  "    int yy_bs_lineno; /**< The line count. */",
+  "    int yy_bs_column; /**< The column count. */",
+  "    ",
+  "",
+  "	/* Whether to try to fill the input buffer when we reach the",
+  "	 * end of it.",
+  "	 */",
+  "	int yy_fill_buffer;",
+  "",
+  "	int yy_buffer_status;",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "#define YY_BUFFER_NEW 0",
+  "#define YY_BUFFER_NORMAL 1",
+  "	/* When an EOF's been seen but there's still some text to process",
+  "	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we",
+  "	 * shouldn't try reading from the input source any more.  We might",
+  "	 * still have a bunch of tokens to match, though, because of",
+  "	 * possible backing-up.",
+  "	 *",
+  "	 * When we actually see the EOF, we change the status to \"new\"",
+  "	 * (via yyrestart()), so that the user can continue scanning by",
+  "	 * just pointing yyin at a new input file.",
+  "	 */",
+  "#define YY_BUFFER_EOF_PENDING 2",
+  "]])",
+  "	};",
+  "#endif /* !YY_STRUCT_YY_BUFFER_STATE */",
+  "",
+  "%if-c-only Standard (non-C++) definition",
+  "%not-for-header",
+  "%if-not-reentrant",
+  "",
+  "/* Stack of input buffers. */",
+  "static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */",
+  "static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */",
+  "static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */",
+  "%endif",
+  "%ok-for-header",
+  "%endif",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* We provide macros for accessing buffer states in case in the",
+  " * future we want to put the buffer states in a more general",
+  " * \"scanner state\".",
+  " *",
+  " * Returns the top of the stack, or NULL.",
+  " */",
+  "#define YY_CURRENT_BUFFER ( YY_G(yy_buffer_stack) \\",
+  "                          ? YY_G(yy_buffer_stack)[YY_G(yy_buffer_stack_top)] \\",
+  "                          : NULL)",
+  "#define yy_current_buffer YY_CURRENT_BUFFER",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* Same as previous macro, but useful when we know that the buffer stack is not",
+  " * NULL or when we need an lvalue. For internal use only.",
+  " */",
+  "#define YY_CURRENT_BUFFER_LVALUE YY_G(yy_buffer_stack)[YY_G(yy_buffer_stack_top)]",
+  "]])",
+  "",
+  "%if-c-only Standard (non-C++) definition",
+  "",
+  "%if-not-reentrant",
+  "%not-for-header",
+  "/* yy_hold_char holds the character lost when yytext is formed. */",
+  "static char yy_hold_char;",
+  "static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */",
+  "yy_size_t yyleng;",
+  "",
+  "/* Points to current character in buffer. */",
+  "static char *yy_c_buf_p = (char *) 0;",
+  "static int yy_init = 0;		/* whether we need to initialize */",
+  "static int yy_start = 0;	/* start state number */",
+  "",
+  "/* Flag which is used to allow yywrap()'s to do buffer switches",
+  " * instead of setting up a fresh yyin.  A bit of a hack ...",
+  " */",
+  "static int yy_did_buffer_switch_on_eof;",
+  "%ok-for-header",
+  "%endif",
+  "",
+  "void yyrestart M4_YY_PARAMS( FILE *input_file M4_YY_PROTO_LAST_ARG );",
+  "void yy_switch_to_buffer M4_YY_PARAMS( YY_BUFFER_STATE new_buffer M4_YY_PROTO_LAST_ARG );",
+  "YY_BUFFER_STATE yy_create_buffer M4_YY_PARAMS( FILE *file, int size M4_YY_PROTO_LAST_ARG );",
+  "void yy_delete_buffer M4_YY_PARAMS( YY_BUFFER_STATE b M4_YY_PROTO_LAST_ARG );",
+  "void yy_flush_buffer M4_YY_PARAMS( YY_BUFFER_STATE b M4_YY_PROTO_LAST_ARG );",
+  "void yypush_buffer_state M4_YY_PARAMS( YY_BUFFER_STATE new_buffer M4_YY_PROTO_LAST_ARG );",
+  "void yypop_buffer_state M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "static void yyensure_buffer_stack M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "static void yy_load_buffer_state M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "static void yy_init_buffer M4_YY_PARAMS( YY_BUFFER_STATE b, FILE *file M4_YY_PROTO_LAST_ARG );",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER M4_YY_CALL_LAST_ARG)",
+  "]])",
+  "",
+  "YY_BUFFER_STATE yy_scan_buffer M4_YY_PARAMS( char *base, yy_size_t size M4_YY_PROTO_LAST_ARG );",
+  "YY_BUFFER_STATE yy_scan_string M4_YY_PARAMS( yyconst char *yy_str M4_YY_PROTO_LAST_ARG );",
+  "YY_BUFFER_STATE yy_scan_bytes M4_YY_PARAMS( yyconst char *bytes, yy_size_t len M4_YY_PROTO_LAST_ARG );",
+  "",
+  "%endif",
+  "",
+  "void *yyalloc M4_YY_PARAMS( yy_size_t M4_YY_PROTO_LAST_ARG );",
+  "void *yyrealloc M4_YY_PARAMS( void *, yy_size_t M4_YY_PROTO_LAST_ARG );",
+  "void yyfree M4_YY_PARAMS( void * M4_YY_PROTO_LAST_ARG );",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "#define yy_new_buffer yy_create_buffer",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "#define yy_set_interactive(is_interactive) \\",
+  "	{ \\",
+  "	if ( ! YY_CURRENT_BUFFER ){ \\",
+  "        yyensure_buffer_stack (M4_YY_CALL_ONLY_ARG); \\",
+  "		YY_CURRENT_BUFFER_LVALUE =    \\",
+  "            yy_create_buffer( yyin, YY_BUF_SIZE M4_YY_CALL_LAST_ARG); \\",
+  "	} \\",
+  "	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \\",
+  "	}",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "#define yy_set_bol(at_bol) \\",
+  "	{ \\",
+  "	if ( ! YY_CURRENT_BUFFER ){\\",
+  "        yyensure_buffer_stack (M4_YY_CALL_ONLY_ARG); \\",
+  "		YY_CURRENT_BUFFER_LVALUE =    \\",
+  "            yy_create_buffer( yyin, YY_BUF_SIZE M4_YY_CALL_LAST_ARG); \\",
+  "	} \\",
+  "	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \\",
+  "	}",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)",
+  "]])",
+  "",
+  "%% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "%% [1.5] DFA",
+  "]])",
+  "",
+  "%if-c-only Standard (non-C++) definition",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "static yy_state_type yy_get_previous_state M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "static yy_state_type yy_try_NUL_trans M4_YY_PARAMS( yy_state_type current_state  M4_YY_PROTO_LAST_ARG);",
+  "static int yy_get_next_buffer M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "static void yy_fatal_error M4_YY_PARAMS( yyconst char msg[] M4_YY_PROTO_LAST_ARG ) __dead2;",
+  "]])",
+  "",
+  "%endif",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* Done after the current pattern has been matched and before the",
+  " * corresponding action - sets up yytext.",
+  " */",
+  "#define YY_DO_BEFORE_ACTION \\",
+  "	YY_G(yytext_ptr) = yy_bp; \\",
+  "%% [2.0] code to fiddle yytext and yyleng for yymore() goes here \\",
+  "	YY_G(yy_hold_char) = *yy_cp; \\",
+  "	*yy_cp = '\\0'; \\",
+  "%% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \\",
+  "	YY_G(yy_c_buf_p) = yy_cp;",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "%% [4.0] data tables for the DFA and the user's section 1 definitions go here",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_IN_HEADER]], [[#ifdef YY_HEADER_EXPORT_START_CONDITIONS]])",
+  "M4_YY_SC_DEFS",
+  "m4_ifdef( [[M4_YY_IN_HEADER]], [[#endif]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_UNISTD_H]],,",
+  "[[",
+  "#ifndef YY_NO_UNISTD_H",
+  "/* Special case for \"unistd.h\", since it is non-ANSI. We include it way",
+  " * down here because we want the user's section 1 to have been scanned first.",
+  " * The user has a chance to override it with an option.",
+  " */",
+  "%if-c-only",
+  "#include <unistd.h>",
+  "%endif",
+  "%if-c++-only",
+  "#include <unistd.h>",
+  "%endif",
+  "#endif",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_EXTRA_TYPE_DEFS]],",
+  "[[",
+  "#define YY_EXTRA_TYPE M4_EXTRA_TYPE_DEFS",
+  "]],",
+  "[[",
+  "#ifndef YY_EXTRA_TYPE",
+  "#define YY_EXTRA_TYPE void *",
+  "#endif",
+  "]]",
+  ")",
+  "",
+  "%if-c-only Reentrant structure and macros (non-C++).",
+  "%if-reentrant",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* Holds the entire state of the reentrant scanner. */",
+  "struct yyguts_t",
+  "    {",
+  "",
+  "    /* User-defined. Not touched by flex. */",
+  "    YY_EXTRA_TYPE yyextra_r;",
+  "",
+  "    /* The rest are the same as the globals declared in the non-reentrant scanner. */",
+  "    FILE *yyin_r, *yyout_r;",
+  "    size_t yy_buffer_stack_top; /**< index of top of stack. */",
+  "    size_t yy_buffer_stack_max; /**< capacity of stack. */",
+  "    YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */",
+  "    char yy_hold_char;",
+  "    yy_size_t yy_n_chars;",
+  "    yy_size_t yyleng_r;",
+  "    char *yy_c_buf_p;",
+  "    int yy_init;",
+  "    int yy_start;",
+  "    int yy_did_buffer_switch_on_eof;",
+  "    int yy_start_stack_ptr;",
+  "    int yy_start_stack_depth;",
+  "    int *yy_start_stack;",
+  "    yy_state_type yy_last_accepting_state;",
+  "    char* yy_last_accepting_cpos;",
+  "",
+  "    int yylineno_r;",
+  "    int yy_flex_debug_r;",
+  "",
+  "m4_ifdef( [[M4_YY_USES_REJECT]],",
+  "[[",
+  "    yy_state_type *yy_state_buf;",
+  "    yy_state_type *yy_state_ptr;",
+  "    char *yy_full_match;",
+  "    int yy_lp;",
+  "",
+  "    /* These are only needed for trailing context rules,",
+  "     * but there's no conditional variable for that yet. */",
+  "    int yy_looking_for_trail_begin;",
+  "    int yy_full_lp;",
+  "    int *yy_full_state;",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_TEXT_IS_ARRAY]],",
+  "[[",
+  "    char yytext_r[YYLMAX];",
+  "    char *yytext_ptr;",
+  "    int yy_more_offset;",
+  "    int yy_prev_more_offset;",
+  "]],",
+  "[[",
+  "    char *yytext_r;",
+  "    int yy_more_flag;",
+  "    int yy_more_len;",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_BISON_LVAL]],",
+  "[[",
+  "    YYSTYPE * yylval_r;",
+  "]])",
+  "",
+  "m4_ifdef( [[<M4_YY_BISON_LLOC>]],",
+  "[[",
+  "    YYLTYPE * yylloc_r;",
+  "]])",
+  "",
+  "    }; /* end struct yyguts_t */",
+  "]])",
+  "",
+  "",
+  "%if-c-only",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "static int yy_init_globals M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "]])",
+  "%endif",
+  "",
+  "%if-reentrant",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "    m4_ifdef( [[M4_YY_BISON_LVAL]],",
+  "    [[",
+  "    /* This must go here because YYSTYPE and YYLTYPE are included",
+  "     * from bison output in section 1.*/",
+  "    #    define yylval YY_G(yylval_r)",
+  "    ]])",
+  "",
+  "    m4_ifdef( [[<M4_YY_BISON_LLOC>]],",
+  "    [[",
+  "    #    define yylloc YY_G(yylloc_r)",
+  "    ]])",
+  "]])",
+  "",
+  "int yylex_init M4_YY_PARAMS(yyscan_t* scanner);",
+  "",
+  "int yylex_init_extra M4_YY_PARAMS( YY_EXTRA_TYPE user_defined, yyscan_t* scanner);",
+  "",
+  "%endif",
+  "",
+  "%endif End reentrant structures and macros.",
+  "",
+  "/* Accessor methods to globals.",
+  "   These are made visible to non-reentrant scanners for convenience. */",
+  "",
+  "m4_ifdef( [[M4_YY_NO_DESTROY]],,",
+  "[[",
+  "int yylex_destroy M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_GET_DEBUG]],,",
+  "[[",
+  "int yyget_debug M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_SET_DEBUG]],,",
+  "[[",
+  "void yyset_debug M4_YY_PARAMS( int debug_flag M4_YY_PROTO_LAST_ARG );",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_GET_EXTRA]],,",
+  "[[",
+  "YY_EXTRA_TYPE yyget_extra M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_SET_EXTRA]],,",
+  "[[",
+  "void yyset_extra M4_YY_PARAMS( YY_EXTRA_TYPE user_defined M4_YY_PROTO_LAST_ARG );",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_GET_IN]],,",
+  "[[",
+  "FILE *yyget_in M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_SET_IN]],,",
+  "[[",
+  "void yyset_in  M4_YY_PARAMS( FILE * in_str M4_YY_PROTO_LAST_ARG );",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_GET_OUT]],,",
+  "[[",
+  "FILE *yyget_out M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_SET_OUT]],,",
+  "[[",
+  "void yyset_out  M4_YY_PARAMS( FILE * out_str M4_YY_PROTO_LAST_ARG );",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_GET_LENG]],,",
+  "[[",
+  "yy_size_t yyget_leng M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_GET_TEXT]],,",
+  "[[",
+  "char *yyget_text M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_GET_LINENO]],,",
+  "[[",
+  "int yyget_lineno M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_SET_LINENO]],,",
+  "[[",
+  "void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_REENTRANT]],",
+  "[[",
+  "m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,",
+  "[[",
+  "int yyget_column  M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "]])",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_REENTRANT]],",
+  "[[",
+  "m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,",
+  "[[",
+  "void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );",
+  "]])",
+  "]])",
+  "",
+  "%if-bison-bridge",
+  "m4_ifdef( [[M4_YY_NO_GET_LVAL]],,",
+  "[[",
+  "YYSTYPE * yyget_lval M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "]])",
+  "",
+  "void yyset_lval M4_YY_PARAMS( YYSTYPE * yylval_param M4_YY_PROTO_LAST_ARG );",
+  "",
+  "m4_ifdef( [[<M4_YY_BISON_LLOC>]],",
+  "[[",
+  "    m4_ifdef( [[M4_YY_NO_GET_LLOC]],,",
+  "    [[",
+  "       YYLTYPE *yyget_lloc M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "    ]])",
+  "",
+  "    m4_ifdef( [[M4_YY_NO_SET_LLOC]],,",
+  "    [[",
+  "        void yyset_lloc M4_YY_PARAMS( YYLTYPE * yylloc_param M4_YY_PROTO_LAST_ARG );",
+  "    ]])",
+  "]])",
+  "%endif",
+  "",
+  "/* Macros after this point can all be overridden by user definitions in",
+  " * section 1.",
+  " */",
+  "",
+  "#ifndef YY_SKIP_YYWRAP",
+  "#ifdef __cplusplus",
+  "extern \"C\" int yywrap M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "#else",
+  "extern int yywrap M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "#endif",
+  "#endif",
+  "",
+  "%not-for-header",
+  "    m4_ifdef( [[M4_YY_NO_UNPUT]],,",
+  "    [[",
+  "#ifndef YY_NO_UNPUT",
+  "    static void yyunput M4_YY_PARAMS( int c, char *buf_ptr  M4_YY_PROTO_LAST_ARG);",
+  "#endif",
+  "    ]])",
+  "%ok-for-header",
+  "%endif",
+  "",
+  "#ifndef yytext_ptr",
+  "static void yy_flex_strncpy M4_YY_PARAMS( char *, yyconst char *, int M4_YY_PROTO_LAST_ARG);",
+  "#endif",
+  "",
+  "#ifdef YY_NEED_STRLEN",
+  "static int yy_flex_strlen M4_YY_PARAMS( yyconst char * M4_YY_PROTO_LAST_ARG);",
+  "#endif",
+  "",
+  "#ifndef YY_NO_INPUT",
+  "%if-c-only Standard (non-C++) definition",
+  "%not-for-header",
+  "#ifdef __cplusplus",
+  "static int yyinput M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "#else",
+  "static int input M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "#endif",
+  "%ok-for-header",
+  "%endif",
+  "#endif",
+  "",
+  "",
+  "%if-c-only",
+  "%# TODO: This is messy.",
+  "m4_ifdef( [[M4_YY_STACK_USED]],",
+  "[[",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_REENTRANT]],",
+  "[[",
+  "    m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "    [[",
+  "        static int yy_start_stack_ptr = 0;",
+  "        static int yy_start_stack_depth = 0;",
+  "        static int *yy_start_stack = NULL;",
+  "    ]])",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "    m4_ifdef( [[M4_YY_NO_PUSH_STATE]],,",
+  "    [[",
+  "    static void yy_push_state M4_YY_PARAMS( int new_state M4_YY_PROTO_LAST_ARG);",
+  "    ]])",
+  "    m4_ifdef( [[M4_YY_NO_POP_STATE]],,",
+  "    [[",
+  "    static void yy_pop_state M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "    ]])",
+  "    m4_ifdef( [[M4_YY_NO_TOP_STATE]],,",
+  "    [[",
+  "    static int yy_top_state M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+  "    ]])",
+  "]])",
+  "",
+  "]],",
+  "[[",
+  "m4_define( [[M4_YY_NO_PUSH_STATE]])",
+  "m4_define( [[M4_YY_NO_POP_STATE]])",
+  "m4_define( [[M4_YY_NO_TOP_STATE]])",
+  "]])",
+  "%endif",
+  "",
+  "/* Amount of stuff to slurp up with each read. */",
+  "#ifndef YY_READ_BUF_SIZE",
+  "#define YY_READ_BUF_SIZE 8192",
+  "#endif",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* Copy whatever the last rule matched to the standard output. */",
+  "#ifndef ECHO",
+  "%if-c-only Standard (non-C++) definition",
+  "/* This used to be an fputs(), but since the string might contain NUL's,",
+  " * we now use fwrite().",
+  " */",
+  "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",
+  "%endif",
+  "%if-c++-only C++ definition",
+  "#define ECHO LexerOutput( yytext, yyleng )",
+  "%endif",
+  "#endif",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* Gets input and stuffs it into \"buf\".  number of characters read, or YY_NULL,",
+  " * is returned in \"result\".",
+  " */",
+  "#ifndef YY_INPUT",
+  "#define YY_INPUT(buf,result,max_size) \\",
+  "%% [5.0] fread()/read() definition of YY_INPUT goes here unless we're doing C++ \\",
+  "\\",
+  "%if-c++-only C++ definition \\",
+  "	if ( (result = LexerInput( (char *) buf, max_size )) < 0 ) \\",
+  "		YY_FATAL_ERROR( \"input in flex scanner failed\" );",
+  "%endif",
+  "",
+  "#endif",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* No semi-colon after return; correct usage is to write \"yyterminate();\" -",
+  " * we don't want an extra ';' after the \"return\" because that will cause",
+  " * some compilers to complain about unreachable statements.",
+  " */",
+  "#ifndef yyterminate",
+  "#define yyterminate() return YY_NULL",
+  "#endif",
+  "]])",
+  "",
+  "/* Number of entries by which start-condition stack grows. */",
+  "#ifndef YY_START_STACK_INCR",
+  "#define YY_START_STACK_INCR 25",
+  "#endif",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* Report a fatal error. */",
+  "#ifndef YY_FATAL_ERROR",
+  "%if-c-only",
+  "#define YY_FATAL_ERROR(msg) yy_fatal_error( msg M4_YY_CALL_LAST_ARG)",
+  "%endif",
+  "%if-c++-only",
+  "#define YY_FATAL_ERROR(msg) LexerError( msg )",
+  "%endif",
+  "#endif",
+  "]])",
+  "",
+  "%if-tables-serialization structures and prototypes",
+  "#ifdef FLEX_SCANNER",
+  "/*",
+  "dnl  tables_shared.h - tables serialization header",
+  "dnl",
+  "dnl  Copyright (c) 1990 The Regents of the University of California.",
+  "dnl  All rights reserved.",
+  "dnl",
+  "dnl  This code is derived from software contributed to Berkeley by",
+  "dnl  Vern Paxson.",
+  "dnl",
+  "dnl  The United States Government has rights in this work pursuant",
+  "dnl  to contract no. DE-AC03-76SF00098 between the United States",
+  "dnl  Department of Energy and the University of California.",
+  "dnl",
+  "dnl  This file is part of flex.",
+  "dnl",
+  "dnl  Redistribution and use in source and binary forms, with or without",
+  "dnl  modification, are permitted provided that the following conditions",
+  "dnl  are met:",
+  "dnl",
+  "dnl  1. Redistributions of source code must retain the above copyright",
+  "dnl     notice, this list of conditions and the following disclaimer.",
+  "dnl  2. Redistributions in binary form must reproduce the above copyright",
+  "dnl     notice, this list of conditions and the following disclaimer in the",
+  "dnl     documentation and/or other materials provided with the distribution.",
+  "dnl",
+  "dnl  Neither the name of the University nor the names of its contributors",
+  "dnl  may be used to endorse or promote products derived from this software",
+  "dnl  without specific prior written permission.",
+  "dnl",
+  "dnl  THIS SOFTWARE IS PROVIDED `AS IS' AND WITHOUT ANY EXPRESS OR",
+  "dnl  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED",
+  "dnl  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR",
+  "dnl  PURPOSE.",
+  "",
+  "dnl",
+  "dnl  This file is meant to be included in both the skeleton and the actual",
+  "dnl  flex code (hence the name \"_shared\").",
+  "*/",
+  "#ifndef yyskel_static",
+  "#define yyskel_static static",
+  "#endif",
+  "#else",
+  "#ifndef yyskel_static",
+  "#define yyskel_static",
+  "#endif",
+  "#endif",
+  "",
+  "/* Structures and prototypes for serializing flex tables.  The",
+  " * binary format is documented in the manual.",
+  " *",
+  " * Design considerations:",
+  " *",
+  " *  -  The format allows many tables per file.",
+  " *  -  The tables can be streamed.",
+  " *  -  All data is stored in network byte order.",
+  " *  -  We do not hinder future unicode support.",
+  " *  -  We can lookup tables by name.",
+  " */",
+  "",
+  "/** Magic number for serialized format. */",
+  "#ifndef YYTBL_MAGIC",
+  "#define YYTBL_MAGIC 0xF13C57B1",
+  "#endif",
+  "",
+  "/** Calculate (0-7) = number bytes needed to pad n to next 64-bit boundary. */",
+  "#ifndef yypad64",
+  "#define yypad64(n) ((8-((n)%8))%8)",
+  "#endif",
+  "",
+  "",
+  "#ifndef YYTABLES_TYPES",
+  "#define YYTABLES_TYPES",
+  "/** Possible values for td_id field. Each one corresponds to a",
+  " *  scanner table of the same name.",
+  " */",
+  "enum yytbl_id {",
+  "	YYTD_ID_ACCEPT = 0x01,		/**< 1-dim ints */",
+  "	YYTD_ID_BASE = 0x02,		/**< 1-dim ints */",
+  "	YYTD_ID_CHK = 0x03,		/**< 1-dim ints */",
+  "	YYTD_ID_DEF = 0x04,		/**< 1-dim ints */",
+  "	YYTD_ID_EC = 0x05,		/**< 1-dim ints */",
+  "	YYTD_ID_META = 0x06,		/**< 1-dim ints */",
+  "	YYTD_ID_NUL_TRANS = 0x07,	/**< 1-dim ints, maybe indices */",
+  "	YYTD_ID_NXT = 0x08,		/**< may be 2 dimensional ints */",
+  "	YYTD_ID_RULE_CAN_MATCH_EOL = 0x09, /**< 1-dim ints */",
+  "	YYTD_ID_START_STATE_LIST = 0x0A,	/**< 1-dim indices into trans tbl  */",
+  "	YYTD_ID_TRANSITION = 0x0B,	/**< structs */",
+  "	YYTD_ID_ACCLIST = 0x0C		/**< 1-dim ints */",
+  "};",
+  "",
+  "/** bit flags for t_flags field of struct yytbl_data */",
+  "enum yytbl_flags {",
+  "	/* These first three are mutually exclusive */",
+  "	YYTD_DATA8 = 0x01,   /**< data is an array of type flex_int8_t */",
+  "	YYTD_DATA16 = 0x02,  /**< data is an array of type flex_int16_t */",
+  "	YYTD_DATA32 = 0x04,  /**< data is an array of type flex_int32_t */",
+  "",
+  "	/* These two are mutually exclusive. */",
+  "	YYTD_PTRANS = 0x08,  /**< data is a list of indexes of entries",
+  "                                 into the expanded yy_transition",
+  "                                 array. See notes in manual. */",
+  "	YYTD_STRUCT = 0x10  /**< data consists of yy_trans_info structs */",
+  "};",
+  "",
+  "/* The serialized tables header. */",
+  "struct yytbl_hdr {",
+  "	flex_uint32_t th_magic;  /**< Must be 0xF13C57B1 (comes from \"Flex Table\") */",
+  "	flex_uint32_t th_hsize;  /**< Size of this header in bytes. */",
+  "	flex_uint32_t th_ssize;  /**< Size of this dataset, in bytes, including header. */",
+  "	flex_uint16_t th_flags;  /**< Currently unused, must be 0 */",
+  "	char   *th_version; /**< Flex version string. NUL terminated. */",
+  "	char   *th_name;    /**< The name of this table set. NUL terminated. */",
+  "};",
+  "",
+  "/** A single serialized table */",
+  "struct yytbl_data {",
+  "	flex_uint16_t td_id;      /**< enum yytbl_id table identifier */",
+  "	flex_uint16_t td_flags;   /**< how to interpret this data */",
+  "	flex_uint32_t td_hilen;   /**< num elements in highest dimension array */",
+  "	flex_uint32_t td_lolen;   /**< num elements in lowest dimension array */",
+  "	void   *td_data;     /**< table data */",
+  "};",
+  "#endif",
+  "",
+  "/** Extract corresponding data size_t from td_flags */",
+  "#ifndef YYTDFLAGS2BYTES",
+  "#define YYTDFLAGS2BYTES(td_flags)\\",
+  "        (((td_flags) & YYTD_DATA8)\\",
+  "            ? sizeof(flex_int8_t)\\",
+  "            :(((td_flags) & YYTD_DATA16)\\",
+  "                ? sizeof(flex_int16_t)\\",
+  "                :sizeof(flex_int32_t)))",
+  "#endif",
+  "",
+  "#ifdef FLEX_SCANNER",
+  "%not-for-header",
+  "#endif",
+  "yyskel_static flex_int32_t yytbl_calc_total_len (const struct yytbl_data *tbl);",
+  "#ifdef FLEX_SCANNER",
+  "%ok-for-header",
+  "#endif",
+  "",
+  "/* vim:set noexpandtab cindent tabstop=8 softtabstop=0 shiftwidth=8 textwidth=0: */",
+  "",
+  "",
+  "/* Load the DFA tables from the given stream.  */",
+  "int yytables_fload M4_YY_PARAMS(FILE * fp M4_YY_PROTO_LAST_ARG);",
+  "",
+  "/* Unload the tables from memory. */",
+  "int yytables_destroy M4_YY_PARAMS(M4_YY_PROTO_ONLY_ARG);",
+  "%not-for-header",
+  "",
+  "/** Describes a mapping from a serialized table id to its deserialized state in",
+  " * this scanner.  This is the bridge between our \"generic\" deserialization code",
+  " * and the specifics of this scanner. ",
+  " */",
+  "struct yytbl_dmap {",
+  "	enum yytbl_id dm_id;/**< table identifier */",
+  "	void  **dm_arr;		/**< address of pointer to store the deserialized table. */",
+  "	size_t  dm_sz;		/**< local sizeof() each element in table. */",
+  "};",
+  "",
+  "/** A {0,0,0}-terminated list of structs, forming the map */",
+  "static struct yytbl_dmap yydmap[] =",
+  "{",
+  "%tables-yydmap generated elements",
+  "    {0,0,0}",
+  "};",
+  "",
+  "/** A tables-reader object to maintain some state in the read. */",
+  "struct yytbl_reader {",
+  "    FILE * fp; /**< input stream */",
+  "    flex_uint32_t bread; /**< bytes read since beginning of current tableset */",
+  "};",
+  "",
+  "%endif",
+  "/* end tables serialization structures and prototypes */",
+  "",
+  "%ok-for-header",
+  "",
+  "/* Default declaration of generated scanner - a define so the user can",
+  " * easily add parameters.",
+  " */",
+  "#ifndef YY_DECL",
+  "#define YY_DECL_IS_OURS 1",
+  "%if-c-only Standard (non-C++) definition",
+  "",
+  "",
+  "m4_define( [[M4_YY_LEX_PROTO]], [[M4_YY_PARAMS(M4_YY_PROTO_ONLY_ARG)]])",
+  "m4_define( [[M4_YY_LEX_DECLARATION]], [[YYFARGS0(void)]])",
+  "",
+  "m4_ifdef( [[M4_YY_BISON_LVAL]],",
+  "[[",
+  "    m4_dnl  The bison pure parser is used. Redefine yylex to",
+  "    m4_dnl  accept the lval parameter.",
+  "",
+  "    m4_define( [[M4_YY_LEX_PROTO]], [[\\]]",
+  "               [[M4_YY_PARAMS(YYSTYPE * yylval_param M4_YY_PROTO_LAST_ARG)]])",
+  "    m4_define( [[M4_YY_LEX_DECLARATION]], [[\\]]",
+  "               [[YYFARGS1(YYSTYPE *,yylval_param)]])",
+  "]])",
+  "",
+  "m4_ifdef( [[<M4_YY_BISON_LLOC>]],",
+  "[[",
+  "    m4_dnl  Locations are used. yylex should also accept the ylloc parameter.",
+  "",
+  "    m4_define( [[M4_YY_LEX_PROTO]], [[\\]]",
+  "               [[M4_YY_PARAMS(YYSTYPE * yylval_param, YYLTYPE * yylloc_param M4_YY_PROTO_LAST_ARG)]])",
+  "    m4_define( [[M4_YY_LEX_DECLARATION]], [[\\]]",
+  "               [[YYFARGS2(YYSTYPE *,yylval_param, YYLTYPE *,yylloc_param)]])",
+  "]])",
+  "",
+  "extern int yylex M4_YY_LEX_PROTO;",
+  "",
+  "#define YY_DECL int yylex M4_YY_LEX_DECLARATION",
+  "%endif",
+  "%if-c++-only C++ definition",
+  "#define YY_DECL int yyFlexLexer::yylex()",
+  "%endif",
+  "#endif /* !YY_DECL */",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* Code executed at the beginning of each rule, after yytext and yyleng",
+  " * have been set up.",
+  " */",
+  "#ifndef YY_USER_ACTION",
+  "#define YY_USER_ACTION",
+  "#endif",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* Code executed at the end of each rule. */",
+  "#ifndef YY_BREAK",
+  "#define YY_BREAK break;",
+  "#endif",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "%% [6.0] YY_RULE_SETUP definition goes here",
+  "]])",
+  "",
+  "%not-for-header",
+  "/** The main scanner function which does all the work.",
+  " */",
+  "YY_DECL",
+  "{",
+  "	yy_state_type yy_current_state;",
+  "	char *yy_cp, *yy_bp;",
+  "	int yy_act;",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_REENTRANT]],",
+  "[[",
+  "    m4_ifdef( [[M4_YY_BISON_LVAL]],",
+  "    [[",
+  "        YYSTYPE * yylval;",
+  "    ]])",
+  "    m4_ifdef( [[<M4_YY_BISON_LLOC>]],",
+  "    [[",
+  "        YYLTYPE * yylloc;",
+  "    ]])",
+  "]])",
+  "",
+  "%% [7.0] user's declarations go here",
+  "",
+  "m4_ifdef( [[M4_YY_BISON_LVAL]],",
+  "[[",
+  "    yylval = yylval_param;",
+  "]])",
+  "",
+  "m4_ifdef( [[<M4_YY_BISON_LLOC>]],",
+  "[[",
+  "    yylloc = yylloc_param;",
+  "]])",
+  "",
+  "	if ( !YY_G(yy_init) )",
+  "		{",
+  "		YY_G(yy_init) = 1;",
+  "",
+  "#ifdef YY_USER_INIT",
+  "		YY_USER_INIT;",
+  "#endif",
+  "",
+  "m4_ifdef( [[M4_YY_USES_REJECT]],",
+  "[[",
+  "        /* Create the reject buffer large enough to save one state per allowed character. */",
+  "        if ( ! YY_G(yy_state_buf) )",
+  "            YY_G(yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE  M4_YY_CALL_LAST_ARG);",
+  "            if ( ! YY_G(yy_state_buf) )",
+  "                YY_FATAL_ERROR( \"out of dynamic memory in yylex()\" );",
+  "]])",
+  "",
+  "		if ( ! YY_G(yy_start) )",
+  "			YY_G(yy_start) = 1;	/* first start state */",
+  "",
+  "		if ( ! yyin )",
+  "%if-c-only",
+  "			yyin = stdin;",
+  "%endif",
+  "%if-c++-only",
+  "			yyin = & std::cin;",
+  "%endif",
+  "",
+  "		if ( ! yyout )",
+  "%if-c-only",
+  "			yyout = stdout;",
+  "%endif",
+  "%if-c++-only",
+  "			yyout = & std::cout;",
+  "%endif",
+  "",
+  "		if ( ! YY_CURRENT_BUFFER ) {",
+  "			yyensure_buffer_stack (M4_YY_CALL_ONLY_ARG);",
+  "			YY_CURRENT_BUFFER_LVALUE =",
+  "				yy_create_buffer( yyin, YY_BUF_SIZE M4_YY_CALL_LAST_ARG);",
+  "		}",
+  "",
+  "		yy_load_buffer_state( M4_YY_CALL_ONLY_ARG );",
+  "		}",
+  "",
+  "	while ( 1 )		/* loops until end-of-file is reached */",
+  "		{",
+  "%% [8.0] yymore()-related code goes here",
+  "		yy_cp = YY_G(yy_c_buf_p);",
+  "",
+  "		/* Support of yytext. */",
+  "		*yy_cp = YY_G(yy_hold_char);",
+  "",
+  "		/* yy_bp points to the position in yy_ch_buf of the start of",
+  "		 * the current run.",
+  "		 */",
+  "		yy_bp = yy_cp;",
+  "",
+  "%% [9.0] code to set up and find next match goes here",
+  "",
+  "yy_find_action:",
+  "%% [10.0] code to find the action number goes here",
+  "",
+  "		YY_DO_BEFORE_ACTION;",
+  "",
+  "%% [11.0] code for yylineno update goes here",
+  "",
+  "do_action:	/* This label is used only to access EOF actions. */",
+  "",
+  "%% [12.0] debug code goes here",
+  "",
+  "		switch ( yy_act )",
+  "	{ /* beginning of action switch */",
+  "%% [13.0] actions go here",
+  "",
+  "	case YY_END_OF_BUFFER:",
+  "		{",
+  "		/* Amount of text matched not including the EOB char. */",
+  "		int yy_amount_of_matched_text = (int) (yy_cp - YY_G(yytext_ptr)) - 1;",
+  "",
+  "		/* Undo the effects of YY_DO_BEFORE_ACTION. */",
+  "		*yy_cp = YY_G(yy_hold_char);",
+  "		YY_RESTORE_YY_MORE_OFFSET",
+  "",
+  "		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )",
+  "			{",
+  "			/* We're scanning a new file or input source.  It's",
+  "			 * possible that this happened because the user",
+  "			 * just pointed yyin at a new source and called",
+  "			 * yylex().  If so, then we have to assure",
+  "			 * consistency between YY_CURRENT_BUFFER and our",
+  "			 * globals.  Here is the right place to do so, because",
+  "			 * this is the first action (other than possibly a",
+  "			 * back-up) that will match for the new input source.",
+  "			 */",
+  "			YY_G(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;",
+  "			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;",
+  "			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;",
+  "			}",
+  "",
+  "		/* Note that here we test for yy_c_buf_p \"<=\" to the position",
+  "		 * of the first EOB in the buffer, since yy_c_buf_p will",
+  "		 * already have been incremented past the NUL character",
+  "		 * (since all states make transitions on EOB to the",
+  "		 * end-of-buffer state).  Contrast this with the test",
+  "		 * in input().",
+  "		 */",
+  "		if ( YY_G(yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[YY_G(yy_n_chars)] )",
+  "			{ /* This was really a NUL. */",
+  "			yy_state_type yy_next_state;",
+  "",
+  "			YY_G(yy_c_buf_p) = YY_G(yytext_ptr) + yy_amount_of_matched_text;",
+  "",
+  "			yy_current_state = yy_get_previous_state( M4_YY_CALL_ONLY_ARG );",
+  "",
+  "			/* Okay, we're now positioned to make the NUL",
+  "			 * transition.  We couldn't have",
+  "			 * yy_get_previous_state() go ahead and do it",
+  "			 * for us because it doesn't know how to deal",
+  "			 * with the possibility of jamming (and we don't",
+  "			 * want to build jamming into it because then it",
+  "			 * will run more slowly).",
+  "			 */",
+  "",
+  "			yy_next_state = yy_try_NUL_trans( yy_current_state M4_YY_CALL_LAST_ARG);",
+  "",
+  "			yy_bp = YY_G(yytext_ptr) + YY_MORE_ADJ;",
+  "",
+  "			if ( yy_next_state )",
+  "				{",
+  "				/* Consume the NUL. */",
+  "				yy_cp = ++YY_G(yy_c_buf_p);",
+  "				yy_current_state = yy_next_state;",
+  "				goto yy_match;",
+  "				}",
+  "",
+  "			else",
+  "				{",
+  "%% [14.0] code to do back-up for compressed tables and set up yy_cp goes here",
+  "				goto yy_find_action;",
+  "				}",
+  "			}",
+  "",
+  "		else switch ( yy_get_next_buffer( M4_YY_CALL_ONLY_ARG ) )",
+  "			{",
+  "			case EOB_ACT_END_OF_FILE:",
+  "				{",
+  "				YY_G(yy_did_buffer_switch_on_eof) = 0;",
+  "",
+  "				if ( yywrap( M4_YY_CALL_ONLY_ARG ) )",
+  "					{",
+  "					/* Note: because we've taken care in",
+  "					 * yy_get_next_buffer() to have set up",
+  "					 * yytext, we can now set up",
+  "					 * yy_c_buf_p so that if some total",
+  "					 * hoser (like flex itself) wants to",
+  "					 * call the scanner after we return the",
+  "					 * YY_NULL, it'll still work - another",
+  "					 * YY_NULL will get returned.",
+  "					 */",
+  "					YY_G(yy_c_buf_p) = YY_G(yytext_ptr) + YY_MORE_ADJ;",
+  "",
+  "					yy_act = YY_STATE_EOF(YY_START);",
+  "					goto do_action;",
+  "					}",
+  "",
+  "				else",
+  "					{",
+  "					if ( ! YY_G(yy_did_buffer_switch_on_eof) )",
+  "						YY_NEW_FILE;",
+  "					}",
+  "				break;",
+  "				}",
+  "",
+  "			case EOB_ACT_CONTINUE_SCAN:",
+  "				YY_G(yy_c_buf_p) =",
+  "					YY_G(yytext_ptr) + yy_amount_of_matched_text;",
+  "",
+  "				yy_current_state = yy_get_previous_state( M4_YY_CALL_ONLY_ARG );",
+  "",
+  "				yy_cp = YY_G(yy_c_buf_p);",
+  "				yy_bp = YY_G(yytext_ptr) + YY_MORE_ADJ;",
+  "				goto yy_match;",
+  "",
+  "			case EOB_ACT_LAST_MATCH:",
+  "				YY_G(yy_c_buf_p) =",
+  "				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[YY_G(yy_n_chars)];",
+  "",
+  "				yy_current_state = yy_get_previous_state( M4_YY_CALL_ONLY_ARG );",
+  "",
+  "				yy_cp = YY_G(yy_c_buf_p);",
+  "				yy_bp = YY_G(yytext_ptr) + YY_MORE_ADJ;",
+  "				goto yy_find_action;",
+  "			}",
+  "		break;",
+  "		}",
+  "",
+  "	default:",
+  "		YY_FATAL_ERROR(",
+  "			\"fatal flex scanner internal error--no action found\" );",
+  "	} /* end of action switch */",
+  "		} /* end of scanning one token */",
+  "} /* end of yylex */",
+  "%ok-for-header",
+  "",
+  "%if-c++-only",
+  "%not-for-header",
+  "/* The contents of this function are C++ specific, so the YY_G macro is not used.",
+  " */",
+  "yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout )",
+  "{",
+  "	yyin = arg_yyin;",
+  "	yyout = arg_yyout;",
+  "	yy_c_buf_p = 0;",
+  "	yy_init = 0;",
+  "	yy_start = 0;",
+  "	yy_flex_debug = 0;",
+  "	yylineno = 1;	// this will only get updated if %option yylineno",
+  "",
+  "	yy_did_buffer_switch_on_eof = 0;",
+  "",
+  "	yy_looking_for_trail_begin = 0;",
+  "	yy_more_flag = 0;",
+  "	yy_more_len = 0;",
+  "	yy_more_offset = yy_prev_more_offset = 0;",
+  "",
+  "	yy_start_stack_ptr = yy_start_stack_depth = 0;",
+  "	yy_start_stack = NULL;",
+  "",
+  "	yy_buffer_stack = 0;",
+  "	yy_buffer_stack_top = 0;",
+  "	yy_buffer_stack_max = 0;",
+  "",
+  "",
+  "m4_ifdef( [[M4_YY_USES_REJECT]],",
+  "[[",
+  "	yy_state_buf = new yy_state_type[YY_STATE_BUF_SIZE];",
+  "]],",
+  "[[",
+  "	yy_state_buf = 0;",
+  "]])",
+  "}",
+  "",
+  "/* The contents of this function are C++ specific, so the YY_G macro is not used.",
+  " */",
+  "yyFlexLexer::~yyFlexLexer()",
+  "{",
+  "	delete [] yy_state_buf;",
+  "	yyfree( yy_start_stack M4_YY_CALL_LAST_ARG );",
+  "	yy_delete_buffer( YY_CURRENT_BUFFER M4_YY_CALL_LAST_ARG);",
+  "	yyfree( yy_buffer_stack M4_YY_CALL_LAST_ARG );",
+  "}",
+  "",
+  "/* The contents of this function are C++ specific, so the YY_G macro is not used.",
+  " */",
+  "void yyFlexLexer::switch_streams( std::istream* new_in, std::ostream* new_out )",
+  "{",
+  "	if ( new_in )",
+  "		{",
+  "		yy_delete_buffer( YY_CURRENT_BUFFER M4_YY_CALL_LAST_ARG);",
+  "		yy_switch_to_buffer( yy_create_buffer( new_in, YY_BUF_SIZE  M4_YY_CALL_LAST_ARG) M4_YY_CALL_LAST_ARG);",
+  "		}",
+  "",
+  "	if ( new_out )",
+  "		yyout = new_out;",
+  "}",
+  "",
+  "#ifdef YY_INTERACTIVE",
+  "int yyFlexLexer::LexerInput( char* buf, int /* max_size */ )",
+  "#else",
+  "int yyFlexLexer::LexerInput( char* buf, int max_size )",
+  "#endif",
+  "{",
+  "	if ( yyin->eof() || yyin->fail() )",
+  "		return 0;",
+  "",
+  "#ifdef YY_INTERACTIVE",
+  "	yyin->get( buf[0] );",
+  "",
+  "	if ( yyin->eof() )",
+  "		return 0;",
+  "",
+  "	if ( yyin->bad() )",
+  "		return -1;",
+  "",
+  "	return 1;",
+  "",
+  "#else",
+  "	(void) yyin->read( buf, max_size );",
+  "",
+  "	if ( yyin->bad() )",
+  "		return -1;",
+  "	else",
+  "		return yyin->gcount();",
+  "#endif",
+  "}",
+  "",
+  "void yyFlexLexer::LexerOutput( const char* buf, int size )",
+  "{",
+  "	(void) yyout->write( buf, size );",
+  "}",
+  "%ok-for-header",
+  "%endif",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/* yy_get_next_buffer - try to read in a new buffer",
+  " *",
+  " * Returns a code representing an action:",
+  " *	EOB_ACT_LAST_MATCH -",
+  " *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position",
+  " *	EOB_ACT_END_OF_FILE - end of file",
+  " */",
+  "%if-c-only",
+  "static int yy_get_next_buffer YYFARGS0(void)",
+  "%endif",
+  "%if-c++-only",
+  "int yyFlexLexer::yy_get_next_buffer()",
+  "%endif",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;",
+  "	char *source = YY_G(yytext_ptr);",
+  "	int number_to_move, i;",
+  "	int ret_val;",
+  "",
+  "	if ( YY_G(yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[YY_G(yy_n_chars) + 1] )",
+  "		YY_FATAL_ERROR(",
+  "		\"fatal flex scanner internal error--end of buffer missed\" );",
+  "",
+  "	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )",
+  "		{ /* Don't try to fill the buffer, so this is an EOF. */",
+  "		if ( YY_G(yy_c_buf_p) - YY_G(yytext_ptr) - YY_MORE_ADJ == 1 )",
+  "			{",
+  "			/* We matched a single character, the EOB, so",
+  "			 * treat this as a final EOF.",
+  "			 */",
+  "			return EOB_ACT_END_OF_FILE;",
+  "			}",
+  "",
+  "		else",
+  "			{",
+  "			/* We matched some text prior to the EOB, first",
+  "			 * process it.",
+  "			 */",
+  "			return EOB_ACT_LAST_MATCH;",
+  "			}",
+  "		}",
+  "",
+  "	/* Try to read more data. */",
+  "",
+  "	/* First move last chars to start of buffer. */",
+  "	number_to_move = (int) (YY_G(yy_c_buf_p) - YY_G(yytext_ptr)) - 1;",
+  "",
+  "	for ( i = 0; i < number_to_move; ++i )",
+  "		*(dest++) = *(source++);",
+  "",
+  "	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )",
+  "		/* don't do the read, it's not guaranteed to return an EOF,",
+  "		 * just force an EOF",
+  "		 */",
+  "		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = YY_G(yy_n_chars) = 0;",
+  "",
+  "	else",
+  "		{",
+  "			yy_size_t num_to_read =",
+  "			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;",
+  "",
+  "		while ( num_to_read <= 0 )",
+  "			{ /* Not enough room in the buffer - grow it. */",
+  "m4_ifdef( [[M4_YY_USES_REJECT]],",
+  "[[",
+  "			YY_FATAL_ERROR(",
+  "\"input buffer overflow, can't enlarge buffer because scanner uses REJECT\" );",
+  "]],",
+  "[[",
+  "			/* just a shorter name for the current buffer */",
+  "			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;",
+  "",
+  "			int yy_c_buf_p_offset =",
+  "				(int) (YY_G(yy_c_buf_p) - b->yy_ch_buf);",
+  "",
+  "			if ( b->yy_is_our_buffer )",
+  "				{",
+  "				yy_size_t new_size = b->yy_buf_size * 2;",
+  "",
+  "				if ( new_size <= 0 )",
+  "					b->yy_buf_size += b->yy_buf_size / 8;",
+  "				else",
+  "					b->yy_buf_size *= 2;",
+  "",
+  "				b->yy_ch_buf = (char *)",
+  "					/* Include room in for 2 EOB chars. */",
+  "					yyrealloc( (void *) b->yy_ch_buf,",
+  "							 b->yy_buf_size + 2 M4_YY_CALL_LAST_ARG );",
+  "				}",
+  "			else",
+  "				/* Can't grow it, we don't own it. */",
+  "				b->yy_ch_buf = 0;",
+  "",
+  "			if ( ! b->yy_ch_buf )",
+  "				YY_FATAL_ERROR(",
+  "				\"fatal error - scanner input buffer overflow\" );",
+  "",
+  "			YY_G(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];",
+  "",
+  "			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -",
+  "						number_to_move - 1;",
+  "]])",
+  "			}",
+  "",
+  "		if ( num_to_read > YY_READ_BUF_SIZE )",
+  "			num_to_read = YY_READ_BUF_SIZE;",
+  "",
+  "		/* Read in more data. */",
+  "		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),",
+  "			YY_G(yy_n_chars), num_to_read );",
+  "",
+  "		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = YY_G(yy_n_chars);",
+  "		}",
+  "",
+  "	if ( YY_G(yy_n_chars) == 0 )",
+  "		{",
+  "		if ( number_to_move == YY_MORE_ADJ )",
+  "			{",
+  "			ret_val = EOB_ACT_END_OF_FILE;",
+  "			yyrestart( yyin  M4_YY_CALL_LAST_ARG);",
+  "			}",
+  "",
+  "		else",
+  "			{",
+  "			ret_val = EOB_ACT_LAST_MATCH;",
+  "			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =",
+  "				YY_BUFFER_EOF_PENDING;",
+  "			}",
+  "		}",
+  "",
+  "	else",
+  "		ret_val = EOB_ACT_CONTINUE_SCAN;",
+  "",
+  "	if ((yy_size_t) (YY_G(yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {",
+  "		/* Extend the array by 50%, plus the number we really need. */",
+  "		yy_size_t new_size = YY_G(yy_n_chars) + number_to_move + (YY_G(yy_n_chars) >> 1);",
+  "		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(",
+  "			(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, new_size M4_YY_CALL_LAST_ARG );",
+  "		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )",
+  "			YY_FATAL_ERROR( \"out of dynamic memory in yy_get_next_buffer()\" );",
+  "	}",
+  "",
+  "	YY_G(yy_n_chars) += number_to_move;",
+  "	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[YY_G(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;",
+  "	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[YY_G(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;",
+  "",
+  "	YY_G(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];",
+  "",
+  "	return ret_val;",
+  "}",
+  "]])",
+  "",
+  "/* yy_get_previous_state - get the state just before the EOB char was reached */",
+  "",
+  "%if-c-only",
+  "%not-for-header",
+  "    static yy_state_type yy_get_previous_state YYFARGS0(void)",
+  "%endif",
+  "%if-c++-only",
+  "    yy_state_type yyFlexLexer::yy_get_previous_state()",
+  "%endif",
+  "{",
+  "	yy_state_type yy_current_state;",
+  "	char *yy_cp;",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "",
+  "%% [15.0] code to get the start state into yy_current_state goes here",
+  "",
+  "	for ( yy_cp = YY_G(yytext_ptr) + YY_MORE_ADJ; yy_cp < YY_G(yy_c_buf_p); ++yy_cp )",
+  "		{",
+  "%% [16.0] code to find the next state goes here",
+  "		}",
+  "",
+  "	return yy_current_state;",
+  "}",
+  "",
+  "",
+  "/* yy_try_NUL_trans - try to make a transition on the NUL character",
+  " *",
+  " * synopsis",
+  " *	next_state = yy_try_NUL_trans( current_state );",
+  " */",
+  "%if-c-only",
+  "    static yy_state_type yy_try_NUL_trans  YYFARGS1( yy_state_type, yy_current_state)",
+  "%endif",
+  "%if-c++-only",
+  "    yy_state_type yyFlexLexer::yy_try_NUL_trans( yy_state_type yy_current_state )",
+  "%endif",
+  "{",
+  "	int yy_is_jam;",
+  "    M4_YY_DECL_GUTS_VAR(); /* This var may be unused depending upon options. */",
+  "%% [17.0] code to find the next state, and perhaps do backing up, goes here",
+  "",
+  "	M4_YY_NOOP_GUTS_VAR();",
+  "	return yy_is_jam ? 0 : yy_current_state;",
+  "}",
+  "",
+  "",
+  "%if-c-only",
+  "m4_ifdef( [[M4_YY_NO_UNPUT]],,",
+  "[[",
+  "#ifndef YY_NO_UNPUT",
+  "    static void yyunput YYFARGS2( int,c, char *,yy_bp)",
+  "%endif",
+  "%if-c++-only",
+  "#ifndef YY_NO_UNPUT",
+  "    void yyFlexLexer::yyunput( int c, char* yy_bp)",
+  "%endif",
+  "{",
+  "	char *yy_cp;",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "",
+  "    yy_cp = YY_G(yy_c_buf_p);",
+  "",
+  "	/* undo effects of setting up yytext */",
+  "	*yy_cp = YY_G(yy_hold_char);",
+  "",
+  "	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )",
+  "		{ /* need to shift things up to make room */",
+  "		/* +2 for EOB chars. */",
+  "		yy_size_t number_to_move = YY_G(yy_n_chars) + 2;",
+  "		char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[",
+  "					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];",
+  "		char *source =",
+  "				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];",
+  "",
+  "		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )",
+  "			*--dest = *--source;",
+  "",
+  "		yy_cp += (int) (dest - source);",
+  "		yy_bp += (int) (dest - source);",
+  "		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =",
+  "			YY_G(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;",
+  "",
+  "		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )",
+  "			YY_FATAL_ERROR( \"flex scanner push-back overflow\" );",
+  "		}",
+  "",
+  "	*--yy_cp = (char) c;",
+  "",
+  "%% [18.0] update yylineno here",
+  "m4_ifdef( [[M4_YY_USE_LINENO]],",
+  "[[",
+  "    if ( c == '\\n' ){",
+  "        --yylineno;",
+  "    }",
+  "]])",
+  "",
+  "	YY_G(yytext_ptr) = yy_bp;",
+  "	YY_G(yy_hold_char) = *yy_cp;",
+  "	YY_G(yy_c_buf_p) = yy_cp;",
+  "}",
+  "#endif	/* ifndef YY_NO_UNPUT */",
+  "%if-c-only",
+  "]])",
+  "%endif",
+  "",
+  "%if-c-only",
+  "#ifndef YY_NO_INPUT",
+  "#ifdef __cplusplus",
+  "    static int yyinput YYFARGS0(void)",
+  "#else",
+  "    static int input  YYFARGS0(void)",
+  "#endif",
+  "",
+  "%endif",
+  "%if-c++-only",
+  "    int yyFlexLexer::yyinput()",
+  "%endif",
+  "{",
+  "	int c;",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "",
+  "	*YY_G(yy_c_buf_p) = YY_G(yy_hold_char);",
+  "",
+  "	if ( *YY_G(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )",
+  "		{",
+  "		/* yy_c_buf_p now points to the character we want to return.",
+  "		 * If this occurs *before* the EOB characters, then it's a",
+  "		 * valid NUL; if not, then we've hit the end of the buffer.",
+  "		 */",
+  "		if ( YY_G(yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[YY_G(yy_n_chars)] )",
+  "			/* This was really a NUL. */",
+  "			*YY_G(yy_c_buf_p) = '\\0';",
+  "",
+  "		else",
+  "			{ /* need more input */",
+  "			yy_size_t offset = YY_G(yy_c_buf_p) - YY_G(yytext_ptr);",
+  "			++YY_G(yy_c_buf_p);",
+  "",
+  "			switch ( yy_get_next_buffer( M4_YY_CALL_ONLY_ARG ) )",
+  "				{",
+  "				case EOB_ACT_LAST_MATCH:",
+  "					/* This happens because yy_g_n_b()",
+  "					 * sees that we've accumulated a",
+  "					 * token and flags that we need to",
+  "					 * try matching the token before",
+  "					 * proceeding.  But for input(),",
+  "					 * there's no matching to consider.",
+  "					 * So convert the EOB_ACT_LAST_MATCH",
+  "					 * to EOB_ACT_END_OF_FILE.",
+  "					 */",
+  "",
+  "					/* Reset buffer status. */",
+  "					yyrestart( yyin M4_YY_CALL_LAST_ARG);",
+  "",
+  "					/*FALLTHROUGH*/",
+  "",
+  "				case EOB_ACT_END_OF_FILE:",
+  "					{",
+  "					if ( yywrap( M4_YY_CALL_ONLY_ARG ) )",
+  "						return EOF;",
+  "",
+  "					if ( ! YY_G(yy_did_buffer_switch_on_eof) )",
+  "						YY_NEW_FILE;",
+  "#ifdef __cplusplus",
+  "					return yyinput(M4_YY_CALL_ONLY_ARG);",
+  "#else",
+  "					return input(M4_YY_CALL_ONLY_ARG);",
+  "#endif",
+  "					}",
+  "",
+  "				case EOB_ACT_CONTINUE_SCAN:",
+  "					YY_G(yy_c_buf_p) = YY_G(yytext_ptr) + offset;",
+  "					break;",
+  "				}",
+  "			}",
+  "		}",
+  "",
+  "	c = *(unsigned char *) YY_G(yy_c_buf_p);	/* cast for 8-bit char's */",
+  "	*YY_G(yy_c_buf_p) = '\\0';	/* preserve yytext */",
+  "	YY_G(yy_hold_char) = *++YY_G(yy_c_buf_p);",
+  "",
+  "%% [19.0] update BOL and yylineno",
+  "",
+  "	return c;",
+  "}",
+  "%if-c-only",
+  "#endif	/* ifndef YY_NO_INPUT */",
+  "%endif",
+  "",
+  "/** Immediately switch to a different input stream.",
+  " * @param input_file A readable stream.",
+  " * M4_YY_DOC_PARAM",
+  " * @note This function does not reset the start condition to @c INITIAL .",
+  " */",
+  "%if-c-only",
+  "    void yyrestart  YYFARGS1( FILE *,input_file)",
+  "%endif",
+  "%if-c++-only",
+  "    void yyFlexLexer::yyrestart( std::istream* input_file )",
+  "%endif",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "",
+  "	if ( ! YY_CURRENT_BUFFER ){",
+  "        yyensure_buffer_stack (M4_YY_CALL_ONLY_ARG);",
+  "		YY_CURRENT_BUFFER_LVALUE =",
+  "            yy_create_buffer( yyin, YY_BUF_SIZE M4_YY_CALL_LAST_ARG);",
+  "	}",
+  "",
+  "	yy_init_buffer( YY_CURRENT_BUFFER, input_file M4_YY_CALL_LAST_ARG);",
+  "	yy_load_buffer_state( M4_YY_CALL_ONLY_ARG );",
+  "}",
+  "",
+  "/** Switch to a different input buffer.",
+  " * @param new_buffer The new input buffer.",
+  " * M4_YY_DOC_PARAM",
+  " */",
+  "%if-c-only",
+  "    void yy_switch_to_buffer  YYFARGS1( YY_BUFFER_STATE ,new_buffer)",
+  "%endif",
+  "%if-c++-only",
+  "    void yyFlexLexer::yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )",
+  "%endif",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "",
+  "	/* TODO. We should be able to replace this entire function body",
+  "	 * with",
+  "	 *		yypop_buffer_state();",
+  "	 *		yypush_buffer_state(new_buffer);",
+  "     */",
+  "	yyensure_buffer_stack (M4_YY_CALL_ONLY_ARG);",
+  "	if ( YY_CURRENT_BUFFER == new_buffer )",
+  "		return;",
+  "",
+  "	if ( YY_CURRENT_BUFFER )",
+  "		{",
+  "		/* Flush out information for old buffer. */",
+  "		*YY_G(yy_c_buf_p) = YY_G(yy_hold_char);",
+  "		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = YY_G(yy_c_buf_p);",
+  "		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = YY_G(yy_n_chars);",
+  "		}",
+  "",
+  "	YY_CURRENT_BUFFER_LVALUE = new_buffer;",
+  "	yy_load_buffer_state( M4_YY_CALL_ONLY_ARG );",
+  "",
+  "	/* We don't actually know whether we did this switch during",
+  "	 * EOF (yywrap()) processing, but the only time this flag",
+  "	 * is looked at is after yywrap() is called, so it's safe",
+  "	 * to go ahead and always set it.",
+  "	 */",
+  "	YY_G(yy_did_buffer_switch_on_eof) = 1;",
+  "}",
+  "",
+  "",
+  "%if-c-only",
+  "static void yy_load_buffer_state  YYFARGS0(void)",
+  "%endif",
+  "%if-c++-only",
+  "    void yyFlexLexer::yy_load_buffer_state()",
+  "%endif",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "	YY_G(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;",
+  "	YY_G(yytext_ptr) = YY_G(yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;",
+  "	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;",
+  "	YY_G(yy_hold_char) = *YY_G(yy_c_buf_p);",
+  "}",
+  "",
+  "/** Allocate and initialize an input buffer state.",
+  " * @param file A readable stream.",
+  " * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.",
+  " * M4_YY_DOC_PARAM",
+  " * @return the allocated buffer state.",
+  " */",
+  "%if-c-only",
+  "    YY_BUFFER_STATE yy_create_buffer  YYFARGS2( FILE *,file, int ,size)",
+  "%endif",
+  "%if-c++-only",
+  "    YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, int size )",
+  "%endif",
+  "{",
+  "	YY_BUFFER_STATE b;",
+  "    m4_dnl M4_YY_DECL_GUTS_VAR();",
+  "",
+  "	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) M4_YY_CALL_LAST_ARG );",
+  "	if ( ! b )",
+  "		YY_FATAL_ERROR( \"out of dynamic memory in yy_create_buffer()\" );",
+  "",
+  "	b->yy_buf_size = size;",
+  "",
+  "	/* yy_ch_buf has to be 2 characters longer than the size given because",
+  "	 * we need to put in 2 end-of-buffer characters.",
+  "	 */",
+  "	b->yy_ch_buf = (char *) yyalloc( b->yy_buf_size + 2 M4_YY_CALL_LAST_ARG );",
+  "	if ( ! b->yy_ch_buf )",
+  "		YY_FATAL_ERROR( \"out of dynamic memory in yy_create_buffer()\" );",
+  "",
+  "	b->yy_is_our_buffer = 1;",
+  "",
+  "	yy_init_buffer( b, file M4_YY_CALL_LAST_ARG);",
+  "",
+  "	return b;",
+  "}",
+  "",
+  "/** Destroy the buffer.",
+  " * @param b a buffer created with yy_create_buffer()",
+  " * M4_YY_DOC_PARAM",
+  " */",
+  "%if-c-only",
+  "    void yy_delete_buffer YYFARGS1( YY_BUFFER_STATE ,b)",
+  "%endif",
+  "%if-c++-only",
+  "    void yyFlexLexer::yy_delete_buffer( YY_BUFFER_STATE b )",
+  "%endif",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "",
+  "	if ( ! b )",
+  "		return;",
+  "",
+  "	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */",
+  "		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;",
+  "",
+  "	if ( b->yy_is_our_buffer )",
+  "		yyfree( (void *) b->yy_ch_buf M4_YY_CALL_LAST_ARG );",
+  "",
+  "	yyfree( (void *) b M4_YY_CALL_LAST_ARG );",
+  "}",
+  "",
+  "",
+  "/* Initializes or reinitializes a buffer.",
+  " * This function is sometimes called more than once on the same buffer,",
+  " * such as during a yyrestart() or at EOF.",
+  " */",
+  "%if-c-only",
+  "    static void yy_init_buffer  YYFARGS2( YY_BUFFER_STATE ,b, FILE *,file)",
+  "%endif",
+  "%if-c++-only",
+  "    void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, std::istream* file )",
+  "%endif",
+  "",
+  "{",
+  "	int oerrno = errno;",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "",
+  "	yy_flush_buffer( b M4_YY_CALL_LAST_ARG);",
+  "",
+  "	b->yy_input_file = file;",
+  "	b->yy_fill_buffer = 1;",
+  "",
+  "    /* If b is the current buffer, then yy_init_buffer was _probably_",
+  "     * called from yyrestart() or through yy_get_next_buffer.",
+  "     * In that case, we don't want to reset the lineno or column.",
+  "     */",
+  "    if (b != YY_CURRENT_BUFFER){",
+  "        b->yy_bs_lineno = 1;",
+  "        b->yy_bs_column = 0;",
+  "    }",
+  "",
+  "%if-c-only",
+  "m4_ifdef( [[M4_YY_ALWAYS_INTERACTIVE]],",
+  "[[",
+  "	b->yy_is_interactive = 1;",
+  "]],",
+  "[[",
+  "    m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]],",
+  "    [[",
+  "        b->yy_is_interactive = 0;",
+  "    ]],",
+  "    [[",
+  "        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;",
+  "    ]])",
+  "]])",
+  "%endif",
+  "%if-c++-only",
+  "	b->yy_is_interactive = 0;",
+  "%endif",
+  "	errno = oerrno;",
+  "}",
+  "",
+  "/** Discard all buffered characters. On the next scan, YY_INPUT will be called.",
+  " * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.",
+  " * M4_YY_DOC_PARAM",
+  " */",
+  "%if-c-only",
+  "    void yy_flush_buffer YYFARGS1( YY_BUFFER_STATE ,b)",
+  "%endif",
+  "%if-c++-only",
+  "    void yyFlexLexer::yy_flush_buffer( YY_BUFFER_STATE b )",
+  "%endif",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "	if ( ! b )",
+  "		return;",
+  "",
+  "	b->yy_n_chars = 0;",
+  "",
+  "	/* We always need two end-of-buffer characters.  The first causes",
+  "	 * a transition to the end-of-buffer state.  The second causes",
+  "	 * a jam in that state.",
+  "	 */",
+  "	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;",
+  "	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;",
+  "",
+  "	b->yy_buf_pos = &b->yy_ch_buf[0];",
+  "",
+  "	b->yy_at_bol = 1;",
+  "	b->yy_buffer_status = YY_BUFFER_NEW;",
+  "",
+  "	if ( b == YY_CURRENT_BUFFER )",
+  "		yy_load_buffer_state( M4_YY_CALL_ONLY_ARG );",
+  "}",
+  "",
+  "%if-c-or-c++",
+  "/** Pushes the new state onto the stack. The new state becomes",
+  " *  the current state. This function will allocate the stack",
+  " *  if necessary.",
+  " *  @param new_buffer The new state.",
+  " *  M4_YY_DOC_PARAM",
+  " */",
+  "%if-c-only",
+  "void yypush_buffer_state YYFARGS1(YY_BUFFER_STATE,new_buffer)",
+  "%endif",
+  "%if-c++-only",
+  "void yyFlexLexer::yypush_buffer_state (YY_BUFFER_STATE new_buffer)",
+  "%endif",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "	if (new_buffer == NULL)",
+  "		return;",
+  "",
+  "	yyensure_buffer_stack(M4_YY_CALL_ONLY_ARG);",
+  "",
+  "	/* This block is copied from yy_switch_to_buffer. */",
+  "	if ( YY_CURRENT_BUFFER )",
+  "		{",
+  "		/* Flush out information for old buffer. */",
+  "		*YY_G(yy_c_buf_p) = YY_G(yy_hold_char);",
+  "		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = YY_G(yy_c_buf_p);",
+  "		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = YY_G(yy_n_chars);",
+  "		}",
+  "",
+  "	/* Only push if top exists. Otherwise, replace top. */",
+  "	if (YY_CURRENT_BUFFER)",
+  "		YY_G(yy_buffer_stack_top)++;",
+  "	YY_CURRENT_BUFFER_LVALUE = new_buffer;",
+  "",
+  "	/* copied from yy_switch_to_buffer. */",
+  "	yy_load_buffer_state( M4_YY_CALL_ONLY_ARG );",
+  "	YY_G(yy_did_buffer_switch_on_eof) = 1;",
+  "}",
+  "%endif",
+  "",
+  "",
+  "%if-c-or-c++",
+  "/** Removes and deletes the top of the stack, if present.",
+  " *  The next element becomes the new top.",
+  " *  M4_YY_DOC_PARAM",
+  " */",
+  "%if-c-only",
+  "void yypop_buffer_state YYFARGS0(void)",
+  "%endif",
+  "%if-c++-only",
+  "void yyFlexLexer::yypop_buffer_state (void)",
+  "%endif",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "	if (!YY_CURRENT_BUFFER)",
+  "		return;",
+  "",
+  "	yy_delete_buffer(YY_CURRENT_BUFFER M4_YY_CALL_LAST_ARG);",
+  "	YY_CURRENT_BUFFER_LVALUE = NULL;",
+  "	if (YY_G(yy_buffer_stack_top) > 0)",
+  "		--YY_G(yy_buffer_stack_top);",
+  "",
+  "	if (YY_CURRENT_BUFFER) {",
+  "		yy_load_buffer_state( M4_YY_CALL_ONLY_ARG );",
+  "		YY_G(yy_did_buffer_switch_on_eof) = 1;",
+  "	}",
+  "}",
+  "%endif",
+  "",
+  "",
+  "%if-c-or-c++",
+  "/* Allocates the stack if it does not exist.",
+  " *  Guarantees space for at least one push.",
+  " */",
+  "%if-c-only",
+  "static void yyensure_buffer_stack YYFARGS0(void)",
+  "%endif",
+  "%if-c++-only",
+  "void yyFlexLexer::yyensure_buffer_stack(void)",
+  "%endif",
+  "{",
+  "	yy_size_t num_to_alloc;",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "",
+  "	if (!YY_G(yy_buffer_stack)) {",
+  "",
+  "		/* First allocation is just for 2 elements, since we don't know if this",
+  "		 * scanner will even need a stack. We use 2 instead of 1 to avoid an",
+  "		 * immediate realloc on the next call.",
+  "         */",
+  "		num_to_alloc = 1;",
+  "		YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc",
+  "								(num_to_alloc * sizeof(struct yy_buffer_state*)",
+  "								M4_YY_CALL_LAST_ARG);",
+  "		if ( ! YY_G(yy_buffer_stack) )",
+  "			YY_FATAL_ERROR( \"out of dynamic memory in yyensure_buffer_stack()\" );",
+  "								  ",
+  "		",
+  "		memset(YY_G(yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));",
+  "				",
+  "		YY_G(yy_buffer_stack_max) = num_to_alloc;",
+  "		YY_G(yy_buffer_stack_top) = 0;",
+  "		return;",
+  "	}",
+  "",
+  "	if (YY_G(yy_buffer_stack_top) >= (YY_G(yy_buffer_stack_max)) - 1){",
+  "",
+  "		/* Increase the buffer to prepare for a possible push. */",
+  "		int grow_size = 8 /* arbitrary grow size */;",
+  "",
+  "		num_to_alloc = YY_G(yy_buffer_stack_max) + grow_size;",
+  "		YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc",
+  "								(YY_G(yy_buffer_stack),",
+  "								num_to_alloc * sizeof(struct yy_buffer_state*)",
+  "								M4_YY_CALL_LAST_ARG);",
+  "		if ( ! YY_G(yy_buffer_stack) )",
+  "			YY_FATAL_ERROR( \"out of dynamic memory in yyensure_buffer_stack()\" );",
+  "",
+  "		/* zero only the new slots.*/",
+  "		memset(YY_G(yy_buffer_stack) + YY_G(yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));",
+  "		YY_G(yy_buffer_stack_max) = num_to_alloc;",
+  "	}",
+  "}",
+  "%endif",
+  "",
+  "",
+  "",
+  "",
+  "m4_ifdef( [[M4_YY_NO_SCAN_BUFFER]],,",
+  "[[",
+  "%if-c-only",
+  "/** Setup the input buffer state to scan directly from a user-specified character buffer.",
+  " * @param base the character buffer",
+  " * @param size the size in bytes of the character buffer",
+  " * M4_YY_DOC_PARAM",
+  " * @return the newly allocated buffer state object. ",
+  " */",
+  "YY_BUFFER_STATE yy_scan_buffer  YYFARGS2( char *,base, yy_size_t ,size)",
+  "{",
+  "	YY_BUFFER_STATE b;",
+  "    m4_dnl M4_YY_DECL_GUTS_VAR();",
+  "",
+  "	if ( size < 2 ||",
+  "	     base[size-2] != YY_END_OF_BUFFER_CHAR ||",
+  "	     base[size-1] != YY_END_OF_BUFFER_CHAR )",
+  "		/* They forgot to leave room for the EOB's. */",
+  "		return 0;",
+  "",
+  "	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) M4_YY_CALL_LAST_ARG );",
+  "	if ( ! b )",
+  "		YY_FATAL_ERROR( \"out of dynamic memory in yy_scan_buffer()\" );",
+  "",
+  "	b->yy_buf_size = size - 2;	/* \"- 2\" to take care of EOB's */",
+  "	b->yy_buf_pos = b->yy_ch_buf = base;",
+  "	b->yy_is_our_buffer = 0;",
+  "	b->yy_input_file = 0;",
+  "	b->yy_n_chars = b->yy_buf_size;",
+  "	b->yy_is_interactive = 0;",
+  "	b->yy_at_bol = 1;",
+  "	b->yy_fill_buffer = 0;",
+  "	b->yy_buffer_status = YY_BUFFER_NEW;",
+  "",
+  "	yy_switch_to_buffer( b M4_YY_CALL_LAST_ARG );",
+  "",
+  "	return b;",
+  "}",
+  "%endif",
+  "]])",
+  "",
+  "",
+  "m4_ifdef( [[M4_YY_NO_SCAN_STRING]],,",
+  "[[",
+  "%if-c-only",
+  "/** Setup the input buffer state to scan a string. The next call to yylex() will",
+  " * scan from a @e copy of @a str.",
+  " * @param yystr a NUL-terminated string to scan",
+  " * M4_YY_DOC_PARAM",
+  " * @return the newly allocated buffer state object.",
+  " * @note If you want to scan bytes that may contain NUL values, then use",
+  " *       yy_scan_bytes() instead.",
+  " */",
+  "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *, yystr)",
+  "{",
+  "    m4_dnl M4_YY_DECL_GUTS_VAR();",
+  "",
+  "	return yy_scan_bytes( yystr, strlen(yystr) M4_YY_CALL_LAST_ARG);",
+  "}",
+  "%endif",
+  "]])",
+  "",
+  "",
+  "m4_ifdef( [[M4_YY_NO_SCAN_BYTES]],,",
+  "[[",
+  "%if-c-only",
+  "/** Setup the input buffer state to scan the given bytes. The next call to yylex() will",
+  " * scan from a @e copy of @a bytes.",
+  " * @param yybytes the byte buffer to scan",
+  " * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.",
+  " * M4_YY_DOC_PARAM",
+  " * @return the newly allocated buffer state object.",
+  " */",
+  "YY_BUFFER_STATE yy_scan_bytes  YYFARGS2( yyconst char *,yybytes, yy_size_t ,_yybytes_len)",
+  "{",
+  "	YY_BUFFER_STATE b;",
+  "	char *buf;",
+  "	yy_size_t n;",
+  "	yy_size_t i;",
+  "    m4_dnl M4_YY_DECL_GUTS_VAR();",
+  "",
+  "	/* Get memory for full buffer, including space for trailing EOB's. */",
+  "	n = _yybytes_len + 2;",
+  "	buf = (char *) yyalloc( n M4_YY_CALL_LAST_ARG );",
+  "	if ( ! buf )",
+  "		YY_FATAL_ERROR( \"out of dynamic memory in yy_scan_bytes()\" );",
+  "",
+  "	for ( i = 0; i < _yybytes_len; ++i )",
+  "		buf[i] = yybytes[i];",
+  "",
+  "	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;",
+  "",
+  "	b = yy_scan_buffer( buf, n M4_YY_CALL_LAST_ARG);",
+  "	if ( ! b )",
+  "		YY_FATAL_ERROR( \"bad buffer in yy_scan_bytes()\" );",
+  "",
+  "	/* It's okay to grow etc. this buffer, and we should throw it",
+  "	 * away when we're done.",
+  "	 */",
+  "	b->yy_is_our_buffer = 1;",
+  "",
+  "	return b;",
+  "}",
+  "%endif",
+  "]])",
+  "",
+  "",
+  "m4_ifdef( [[M4_YY_NO_PUSH_STATE]],,",
+  "[[",
+  "%if-c-only",
+  "    static void yy_push_state YYFARGS1( int ,new_state)",
+  "%endif",
+  "%if-c++-only",
+  "    void yyFlexLexer::yy_push_state( int new_state )",
+  "%endif",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "	if ( YY_G(yy_start_stack_ptr) >= YY_G(yy_start_stack_depth) )",
+  "		{",
+  "		yy_size_t new_size;",
+  "",
+  "		YY_G(yy_start_stack_depth) += YY_START_STACK_INCR;",
+  "		new_size = YY_G(yy_start_stack_depth) * sizeof( int );",
+  "",
+  "		if ( ! YY_G(yy_start_stack) )",
+  "			YY_G(yy_start_stack) = (int *) yyalloc( new_size M4_YY_CALL_LAST_ARG );",
+  "",
+  "		else",
+  "			YY_G(yy_start_stack) = (int *) yyrealloc(",
+  "					(void *) YY_G(yy_start_stack), new_size M4_YY_CALL_LAST_ARG );",
+  "",
+  "		if ( ! YY_G(yy_start_stack) )",
+  "			YY_FATAL_ERROR( \"out of memory expanding start-condition stack\" );",
+  "		}",
+  "",
+  "	YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr)++] = YY_START;",
+  "",
+  "	BEGIN(new_state);",
+  "}",
+  "]])",
+  "",
+  "",
+  "m4_ifdef( [[M4_YY_NO_POP_STATE]],,",
+  "[[",
+  "%if-c-only",
+  "    static void yy_pop_state  YYFARGS0(void)",
+  "%endif",
+  "%if-c++-only",
+  "    void yyFlexLexer::yy_pop_state()",
+  "%endif",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "	if ( --YY_G(yy_start_stack_ptr) < 0 )",
+  "		YY_FATAL_ERROR( \"start-condition stack underflow\" );",
+  "",
+  "	BEGIN(YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr)]);",
+  "}",
+  "]])",
+  "",
+  "",
+  "m4_ifdef( [[M4_YY_NO_TOP_STATE]],,",
+  "[[",
+  "%if-c-only",
+  "    static int yy_top_state  YYFARGS0(void)",
+  "%endif",
+  "%if-c++-only",
+  "    int yyFlexLexer::yy_top_state()",
+  "%endif",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "	return YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr) - 1];",
+  "}",
+  "]])",
+  "",
+  "#ifndef YY_EXIT_FAILURE",
+  "#define YY_EXIT_FAILURE 2",
+  "#endif",
+  "",
+  "%if-c-only",
+  "static void yy_fatal_error YYFARGS1(yyconst char*, msg)",
+  "{",
+  "    m4_dnl M4_YY_DECL_GUTS_VAR();",
+  "	(void) fprintf( stderr, \"%s\\n\", msg );",
+  "	exit( YY_EXIT_FAILURE );",
+  "}",
+  "%endif",
+  "%if-c++-only",
+  "void yyFlexLexer::LexerError( yyconst char msg[] )",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "	std::cerr << msg << std::endl;",
+  "	exit( YY_EXIT_FAILURE );",
+  "}",
+  "%endif",
+  "",
+  "/* Redefine yyless() so it works in section 3 code. */",
+  "",
+  "#undef yyless",
+  "#define yyless(n) \\",
+  "	do \\",
+  "		{ \\",
+  "		/* Undo effects of setting up yytext. */ \\",
+  "        int yyless_macro_arg = (n); \\",
+  "        YY_LESS_LINENO(yyless_macro_arg);\\",
+  "		yytext[yyleng] = YY_G(yy_hold_char); \\",
+  "		YY_G(yy_c_buf_p) = yytext + yyless_macro_arg; \\",
+  "		YY_G(yy_hold_char) = *YY_G(yy_c_buf_p); \\",
+  "		*YY_G(yy_c_buf_p) = '\\0'; \\",
+  "		yyleng = yyless_macro_arg; \\",
+  "		} \\",
+  "	while ( 0 )",
+  "",
+  "",
+  "",
+  "/* Accessor  methods (get/set functions) to struct members. */",
+  "",
+  "%if-c-only",
+  "%if-reentrant",
+  "m4_ifdef( [[M4_YY_NO_GET_EXTRA]],,",
+  "[[",
+  "/** Get the user-defined data for this scanner.",
+  " * M4_YY_DOC_PARAM",
+  " */",
+  "YY_EXTRA_TYPE yyget_extra  YYFARGS0(void)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    return yyextra;",
+  "}",
+  "]])",
+  "%endif",
+  "",
+  "m4_ifdef( [[M4_YY_NO_GET_LINENO]],,",
+  "[[",
+  "/** Get the current line number.",
+  " * M4_YY_DOC_PARAM",
+  " */",
+  "int yyget_lineno  YYFARGS0(void)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    ",
+  "    m4_ifdef( [[M4_YY_REENTRANT]],",
+  "    [[",
+  "        if (! YY_CURRENT_BUFFER)",
+  "            return 0;",
+  "    ]])",
+  "    return yylineno;",
+  "}",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_REENTRANT]],",
+  "[[",
+  "m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,",
+  "[[",
+  "/** Get the current column number.",
+  " * M4_YY_DOC_PARAM",
+  " */",
+  "int yyget_column  YYFARGS0(void)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    ",
+  "    m4_ifdef( [[M4_YY_REENTRANT]],",
+  "    [[",
+  "        if (! YY_CURRENT_BUFFER)",
+  "            return 0;",
+  "    ]])",
+  "    return yycolumn;",
+  "}",
+  "]])",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_GET_IN]],,",
+  "[[",
+  "/** Get the input stream.",
+  " * M4_YY_DOC_PARAM",
+  " */",
+  "FILE *yyget_in  YYFARGS0(void)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    return yyin;",
+  "}",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_GET_OUT]],,",
+  "[[",
+  "/** Get the output stream.",
+  " * M4_YY_DOC_PARAM",
+  " */",
+  "FILE *yyget_out  YYFARGS0(void)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    return yyout;",
+  "}",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_GET_LENG]],,",
+  "[[",
+  "/** Get the length of the current token.",
+  " * M4_YY_DOC_PARAM",
+  " */",
+  "yy_size_t yyget_leng  YYFARGS0(void)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    return yyleng;",
+  "}",
+  "]])",
+  "",
+  "/** Get the current token.",
+  " * M4_YY_DOC_PARAM",
+  " */",
+  "m4_ifdef( [[M4_YY_NO_GET_TEXT]],,",
+  "[[",
+  "char *yyget_text  YYFARGS0(void)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    return yytext;",
+  "}",
+  "]])",
+  "",
+  "%if-reentrant",
+  "m4_ifdef( [[M4_YY_NO_SET_EXTRA]],,",
+  "[[",
+  "/** Set the user-defined data. This data is never touched by the scanner.",
+  " * @param user_defined The data to be associated with this scanner.",
+  " * M4_YY_DOC_PARAM",
+  " */",
+  "void yyset_extra YYFARGS1( YY_EXTRA_TYPE ,user_defined)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    yyextra = user_defined ;",
+  "}",
+  "]])",
+  "%endif",
+  "",
+  "m4_ifdef( [[M4_YY_NO_SET_LINENO]],,",
+  "[[",
+  "/** Set the current line number.",
+  " * @param line_number",
+  " * M4_YY_DOC_PARAM",
+  " */",
+  "void yyset_lineno YYFARGS1( int ,line_number)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "",
+  "    m4_ifdef( [[M4_YY_REENTRANT]],",
+  "    [[",
+  "        /* lineno is only valid if an input buffer exists. */",
+  "        if (! YY_CURRENT_BUFFER )",
+  "           YY_FATAL_ERROR( \"yyset_lineno called with no buffer\" );",
+  "    ]])",
+  "    yylineno = line_number;",
+  "}",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_REENTRANT]],",
+  "[[",
+  "m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,",
+  "[[",
+  "/** Set the current column.",
+  " * @param line_number",
+  " * M4_YY_DOC_PARAM",
+  " */",
+  "void yyset_column YYFARGS1( int , column_no)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "",
+  "    m4_ifdef( [[M4_YY_REENTRANT]],",
+  "    [[",
+  "        /* column is only valid if an input buffer exists. */",
+  "        if (! YY_CURRENT_BUFFER )",
+  "           YY_FATAL_ERROR( \"yyset_column called with no buffer\" );",
+  "    ]])",
+  "    yycolumn = column_no;",
+  "}",
+  "]])",
+  "]])",
+  "",
+  "",
+  "m4_ifdef( [[M4_YY_NO_SET_IN]],,",
+  "[[",
+  "/** Set the input stream. This does not discard the current",
+  " * input buffer.",
+  " * @param in_str A readable stream.",
+  " * M4_YY_DOC_PARAM",
+  " * @see yy_switch_to_buffer",
+  " */",
+  "void yyset_in YYFARGS1( FILE * ,in_str)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    yyin = in_str ;",
+  "}",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_SET_OUT]],,",
+  "[[",
+  "void yyset_out YYFARGS1( FILE * ,out_str)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    yyout = out_str ;",
+  "}",
+  "]])",
+  "",
+  "",
+  "m4_ifdef( [[M4_YY_NO_GET_DEBUG]],,",
+  "[[",
+  "int yyget_debug  YYFARGS0(void)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    return yy_flex_debug;",
+  "}",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_SET_DEBUG]],,",
+  "[[",
+  "void yyset_debug YYFARGS1( int ,bdebug)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    yy_flex_debug = bdebug ;",
+  "}",
+  "]])",
+  "%endif",
+  "",
+  "%if-reentrant",
+  "/* Accessor methods for yylval and yylloc */",
+  "",
+  "%if-bison-bridge",
+  "m4_ifdef( [[M4_YY_NO_GET_LVAL]],,",
+  "[[",
+  "YYSTYPE * yyget_lval  YYFARGS0(void)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    return yylval;",
+  "}",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_SET_LVAL]],,",
+  "[[",
+  "void yyset_lval YYFARGS1( YYSTYPE * ,yylval_param)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    yylval = yylval_param;",
+  "}",
+  "]])",
+  "",
+  "m4_ifdef( [[<M4_YY_BISON_LLOC>]],",
+  "[[",
+  "    m4_ifdef( [[M4_YY_NO_GET_LLOC]],,",
+  "    [[",
+  "YYLTYPE *yyget_lloc  YYFARGS0(void)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    return yylloc;",
+  "}",
+  "    ]])",
+  "",
+  "    m4_ifdef( [[M4_YY_NO_SET_LLOC]],,",
+  "    [[",
+  "void yyset_lloc YYFARGS1( YYLTYPE * ,yylloc_param)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    yylloc = yylloc_param;",
+  "}",
+  "    ]])",
+  "]])",
+  "",
+  "%endif",
+  "",
+  "",
+  "/* User-visible API */",
+  "",
+  "/* yylex_init is special because it creates the scanner itself, so it is",
+  " * the ONLY reentrant function that doesn't take the scanner as the last argument.",
+  " * That's why we explicitly handle the declaration, instead of using our macros.",
+  " */",
+  "m4_ifdef( [[M4_YY_NO_ANSI_FUNC_DEFS]],",
+  "[[",
+  "int yylex_init( ptr_yy_globals )",
+  "    yyscan_t* ptr_yy_globals;",
+  "]],",
+  "[[",
+  "int yylex_init(yyscan_t* ptr_yy_globals)",
+  "]])",
+  "{",
+  "    if (ptr_yy_globals == NULL){",
+  "        errno = EINVAL;",
+  "        return 1;",
+  "    }",
+  "",
+  "    *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL );",
+  "",
+  "    if (*ptr_yy_globals == NULL){",
+  "        errno = ENOMEM;",
+  "        return 1;",
+  "    }",
+  "",
+  "    /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */",
+  "    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));",
+  "",
+  "    return yy_init_globals ( *ptr_yy_globals );",
+  "}",
+  "",
+  "",
+  "/* yylex_init_extra has the same functionality as yylex_init, but follows the",
+  " * convention of taking the scanner as the last argument. Note however, that",
+  " * this is a *pointer* to a scanner, as it will be allocated by this call (and",
+  " * is the reason, too, why this function also must handle its own declaration).",
+  " * The user defined value in the first argument will be available to yyalloc in",
+  " * the yyextra field.",
+  " */",
+  "m4_ifdef( [[M4_YY_NO_ANSI_FUNC_DEFS]],",
+  "[[",
+  "int yylex_init_extra( yy_user_defined, ptr_yy_globals )",
+  "    YY_EXTRA_TYPE yy_user_defined;",
+  "    yyscan_t* ptr_yy_globals;",
+  "]],",
+  "[[",
+  "int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals )",
+  "]])",
+  "{",
+  "    struct yyguts_t dummy_yyguts;",
+  "",
+  "    yyset_extra (yy_user_defined, &dummy_yyguts);",
+  "",
+  "    if (ptr_yy_globals == NULL){",
+  "        errno = EINVAL;",
+  "        return 1;",
+  "    }",
+  "	",
+  "    *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );",
+  "	",
+  "    if (*ptr_yy_globals == NULL){",
+  "        errno = ENOMEM;",
+  "        return 1;",
+  "    }",
+  "    ",
+  "    /* By setting to 0xAA, we expose bugs in",
+  "    yy_init_globals. Leave at 0x00 for releases. */",
+  "    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));",
+  "    ",
+  "    yyset_extra (yy_user_defined, *ptr_yy_globals);",
+  "    ",
+  "    return yy_init_globals ( *ptr_yy_globals );",
+  "}",
+  "",
+  "%endif if-c-only",
+  "",
+  "",
+  "%if-c-only",
+  "static int yy_init_globals YYFARGS0(void)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "    /* Initialization is the same as for the non-reentrant scanner.",
+  "     * This function is called from yylex_destroy(), so don't allocate here.",
+  "     */",
+  "",
+  "m4_ifdef( [[M4_YY_USE_LINENO]],",
+  "[[",
+  "    m4_ifdef( [[M4_YY_NOT_REENTRANT]],",
+  "    [[",
+  "    /* We do not touch yylineno unless the option is enabled. */",
+  "    yylineno =  1;",
+  "    ]])",
+  "]])",
+  "    YY_G(yy_buffer_stack) = 0;",
+  "    YY_G(yy_buffer_stack_top) = 0;",
+  "    YY_G(yy_buffer_stack_max) = 0;",
+  "    YY_G(yy_c_buf_p) = (char *) 0;",
+  "    YY_G(yy_init) = 0;",
+  "    YY_G(yy_start) = 0;",
+  "",
+  "m4_ifdef( [[M4_YY_HAS_START_STACK_VARS]],",
+  "[[",
+  "    YY_G(yy_start_stack_ptr) = 0;",
+  "    YY_G(yy_start_stack_depth) = 0;",
+  "    YY_G(yy_start_stack) =  NULL;",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_USES_REJECT]],",
+  "[[",
+  "    YY_G(yy_state_buf) = 0;",
+  "    YY_G(yy_state_ptr) = 0;",
+  "    YY_G(yy_full_match) = 0;",
+  "    YY_G(yy_lp) = 0;",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_TEXT_IS_ARRAY]],",
+  "[[",
+  "    YY_G(yytext_ptr) = 0;",
+  "    YY_G(yy_more_offset) = 0;",
+  "    YY_G(yy_prev_more_offset) = 0;",
+  "]])",
+  "",
+  "/* Defined in main.c */",
+  "#ifdef YY_STDINIT",
+  "    yyin = stdin;",
+  "    yyout = stdout;",
+  "#else",
+  "    yyin = (FILE *) 0;",
+  "    yyout = (FILE *) 0;",
+  "#endif",
+  "",
+  "    /* For future reference: Set errno on error, since we are called by",
+  "     * yylex_init()",
+  "     */",
+  "    return 0;",
+  "}",
+  "%endif",
+  "",
+  "",
+  "%if-c-only SNIP! this currently causes conflicts with the c++ scanner",
+  "/* yylex_destroy is for both reentrant and non-reentrant scanners. */",
+  "int yylex_destroy  YYFARGS0(void)",
+  "{",
+  "    M4_YY_DECL_GUTS_VAR();",
+  "",
+  "    /* Pop the buffer stack, destroying each element. */",
+  "	while(YY_CURRENT_BUFFER){",
+  "		yy_delete_buffer( YY_CURRENT_BUFFER M4_YY_CALL_LAST_ARG );",
+  "		YY_CURRENT_BUFFER_LVALUE = NULL;",
+  "		yypop_buffer_state(M4_YY_CALL_ONLY_ARG);",
+  "	}",
+  "",
+  "	/* Destroy the stack itself. */",
+  "	yyfree(YY_G(yy_buffer_stack) M4_YY_CALL_LAST_ARG);",
+  "	YY_G(yy_buffer_stack) = NULL;",
+  "",
+  "m4_ifdef( [[M4_YY_HAS_START_STACK_VARS]],",
+  "[[",
+  "    /* Destroy the start condition stack. */",
+  "        yyfree( YY_G(yy_start_stack) M4_YY_CALL_LAST_ARG );",
+  "        YY_G(yy_start_stack) = NULL;",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_USES_REJECT]],",
+  "[[",
+  "    yyfree ( YY_G(yy_state_buf) M4_YY_CALL_LAST_ARG);",
+  "    YY_G(yy_state_buf)  = NULL;",
+  "]])",
+  "",
+  "    /* Reset the globals. This is important in a non-reentrant scanner so the next time",
+  "     * yylex() is called, initialization will occur. */",
+  "    yy_init_globals( M4_YY_CALL_ONLY_ARG);",
+  "",
+  "%if-reentrant",
+  "    /* Destroy the main struct (reentrant only). */",
+  "    yyfree ( yyscanner M4_YY_CALL_LAST_ARG );",
+  "    yyscanner = NULL;",
+  "%endif",
+  "    return 0;",
+  "}",
+  "%endif",
+  "",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "/*",
+  " * Internal utility routines.",
+  " */",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "#ifndef yytext_ptr",
+  "static void yy_flex_strncpy YYFARGS3( char*,s1, yyconst char *,s2, int,n)",
+  "{",
+  "	int i;",
+  "	for ( i = 0; i < n; ++i )",
+  "		s1[i] = s2[i];",
+  "}",
+  "#endif",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],",
+  "[[",
+  "#ifdef YY_NEED_STRLEN",
+  "static int yy_flex_strlen YYFARGS1( yyconst char *,s)",
+  "{",
+  "	int n;",
+  "	for ( n = 0; s[n]; ++n )",
+  "		;",
+  "",
+  "	return n;",
+  "}",
+  "#endif",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_FLEX_ALLOC]],,",
+  "[[",
+  "void *yyalloc YYFARGS1( yy_size_t ,size)",
+  "{",
+  "	return (void *) malloc( size );",
+  "}",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_FLEX_REALLOC]],,",
+  "[[",
+  "void *yyrealloc  YYFARGS2( void *,ptr, yy_size_t ,size)",
+  "{",
+  "	/* The cast to (char *) in the following accommodates both",
+  "	 * implementations that use char* generic pointers, and those",
+  "	 * that use void* generic pointers.  It works with the latter",
+  "	 * because both ANSI C and C++ allow castless assignment from",
+  "	 * any pointer type to void*, and deal with argument conversions",
+  "	 * as though doing an assignment.",
+  "	 */",
+  "	return (void *) realloc( (char *) ptr, size );",
+  "}",
+  "]])",
+  "",
+  "m4_ifdef( [[M4_YY_NO_FLEX_FREE]],,",
+  "[[",
+  "void yyfree YYFARGS1( void *,ptr)",
+  "{",
+  "	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */",
+  "}",
+  "]])",
+  "",
+  "%if-tables-serialization definitions",
+  "#ifdef FLEX_SCANNER",
+  "/*",
+  "dnl   tables_shared.c - tables serialization code",
+  "dnl ",
+  "dnl   Copyright (c) 1990 The Regents of the University of California.",
+  "dnl   All rights reserved.",
+  "dnl ",
+  "dnl   This code is derived from software contributed to Berkeley by",
+  "dnl   Vern Paxson.",
+  "dnl ",
+  "dnl   The United States Government has rights in this work pursuant",
+  "dnl   to contract no. DE-AC03-76SF00098 between the United States",
+  "dnl   Department of Energy and the University of California.",
+  "dnl ",
+  "dnl   This file is part of flex.",
+  "dnl ",
+  "dnl   Redistribution and use in source and binary forms, with or without",
+  "dnl   modification, are permitted provided that the following conditions",
+  "dnl   are met:",
+  "dnl ",
+  "dnl   1. Redistributions of source code must retain the above copyright",
+  "dnl      notice, this list of conditions and the following disclaimer.",
+  "dnl   2. Redistributions in binary form must reproduce the above copyright",
+  "dnl      notice, this list of conditions and the following disclaimer in the",
+  "dnl      documentation and/or other materials provided with the distribution.",
+  "dnl ",
+  "dnl   Neither the name of the University nor the names of its contributors",
+  "dnl   may be used to endorse or promote products derived from this software",
+  "dnl   without specific prior written permission.",
+  "dnl ",
+  "dnl   THIS SOFTWARE IS PROVIDED `AS IS' AND WITHOUT ANY EXPRESS OR",
+  "dnl   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED",
+  "dnl   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR",
+  "dnl   PURPOSE.",
+  "dnl ",
+  "*/",
+  "",
+  "/* This file is meant to be included in both the skeleton and the actual",
+  " * flex code (hence the name \"_shared\"). ",
+  " */",
+  "#ifndef yyskel_static",
+  "#define yyskel_static static",
+  "#endif",
+  "#else",
+  "#include \"flexdef.h\"",
+  "#include \"tables.h\"",
+  "#ifndef yyskel_static",
+  "#define yyskel_static",
+  "#endif",
+  "#endif",
+  "",
+  "",
+  "/** Get the number of integers in this table. This is NOT the",
+  " *  same thing as the number of elements.",
+  " *  @param td the table ",
+  " *  @return the number of integers in the table",
+  " */",
+  "yyskel_static flex_int32_t yytbl_calc_total_len (const struct yytbl_data *tbl)",
+  "{",
+  "	flex_int32_t n;",
+  "",
+  "	/* total number of ints */",
+  "	n = tbl->td_lolen;",
+  "	if (tbl->td_hilen > 0)",
+  "		n *= tbl->td_hilen;",
+  "",
+  "	if (tbl->td_id == YYTD_ID_TRANSITION)",
+  "		n *= 2;",
+  "	return n;",
+  "}",
+  "",
+  "",
+  "static int yytbl_read8 (void *v, struct yytbl_reader * rd)",
+  "{",
+  "    errno = 0;",
+  "    if (fread (v, sizeof (flex_uint8_t), 1, rd->fp) != 1){",
+  "        errno = EIO;",
+  "        return -1;",
+  "    }",
+  "    rd->bread += sizeof(flex_uint8_t);",
+  "    return 0;",
+  "}",
+  "",
+  "static int yytbl_read16 (void *v, struct yytbl_reader * rd)",
+  "{",
+  "    errno = 0;",
+  "    if (fread (v, sizeof (flex_uint16_t), 1, rd->fp) != 1){",
+  "        errno = EIO;",
+  "        return -1;",
+  "    }",
+  "    *((flex_uint16_t *) v) = ntohs (*((flex_uint16_t *) v));",
+  "    rd->bread += sizeof(flex_uint16_t);",
+  "    return 0;",
+  "}",
+  "",
+  "static int yytbl_read32 (void *v, struct yytbl_reader * rd)",
+  "{",
+  "    errno = 0;",
+  "    if (fread (v, sizeof (flex_uint32_t), 1, rd->fp) != 1){",
+  "        errno = EIO;",
+  "        return -1;",
+  "    }",
+  "    *((flex_uint32_t *) v) = ntohl (*((flex_uint32_t *) v));",
+  "    rd->bread += sizeof(flex_uint32_t);",
+  "    return 0;",
+  "}",
+  "",
+  "/** Read the header */",
+  "static int yytbl_hdr_read YYFARGS2(struct yytbl_hdr *, th, struct yytbl_reader *, rd)",
+  "{",
+  "    int     bytes;",
+  "    memset (th, 0, sizeof (struct yytbl_hdr));",
+  "",
+  "    if (yytbl_read32 (&(th->th_magic), rd) != 0)",
+  "        return -1;",
+  "",
+  "    if (th->th_magic != YYTBL_MAGIC){",
+  "        YY_FATAL_ERROR( \"bad magic number\" );   /* TODO: not fatal. */",
+  "        return -1;",
+  "    }",
+  "",
+  "    if (yytbl_read32 (&(th->th_hsize), rd) != 0",
+  "        || yytbl_read32 (&(th->th_ssize), rd) != 0",
+  "        || yytbl_read16 (&(th->th_flags), rd) != 0)",
+  "        return -1;",
+  "",
+  "    /* Sanity check on header size. Greater than 1k suggests some funny business. */",
+  "    if (th->th_hsize < 16 || th->th_hsize > 1024){",
+  "        YY_FATAL_ERROR( \"insane header size detected\" );   /* TODO: not fatal. */",
+  "        return -1;",
+  "    }",
+  "",
+  "    /* Allocate enough space for the version and name fields */",
+  "    bytes = th->th_hsize - 14;",
+  "    th->th_version = (char *) yyalloc (bytes M4_YY_CALL_LAST_ARG);",
+  "    if ( ! th->th_version )",
+  "        YY_FATAL_ERROR( \"out of dynamic memory in yytbl_hdr_read()\" );",
+  "",
+  "    /* we read it all into th_version, and point th_name into that data */",
+  "    if (fread (th->th_version, 1, bytes, rd->fp) != bytes){",
+  "        errno = EIO;",
+  "        yyfree(th->th_version M4_YY_CALL_LAST_ARG);",
+  "        th->th_version = NULL;",
+  "        return -1;",
+  "    }",
+  "    else",
+  "        rd->bread += bytes;",
+  "",
+  "    th->th_name = th->th_version + strlen (th->th_version) + 1;",
+  "    return 0;",
+  "}",
+  "",
+  "/** lookup id in the dmap list.",
+  " *  @param dmap pointer to first element in list",
+  " *  @return NULL if not found.",
+  " */",
+  "static struct yytbl_dmap *yytbl_dmap_lookup YYFARGS2(struct yytbl_dmap *, dmap,",
+  "                                                      int, id)",
+  "{",
+  "    while (dmap->dm_id)",
+  "        if (dmap->dm_id == id)",
+  "            return dmap;",
+  "        else",
+  "            dmap++;",
+  "    return NULL;",
+  "}",
+  "",
+  "/** Read a table while mapping its contents to the local array. ",
+  " *  @param dmap used to performing mapping",
+  " *  @return 0 on success",
+  " */",
+  "static int yytbl_data_load YYFARGS2(struct yytbl_dmap *, dmap, struct yytbl_reader*, rd)",
+  "{",
+  "    struct yytbl_data td;",
+  "    struct yytbl_dmap *transdmap=0;",
+  "    int     len, i, rv, inner_loop_count;",
+  "    void   *p=0;",
+  "",
+  "    memset (&td, 0, sizeof (struct yytbl_data));",
+  "",
+  "    if (yytbl_read16 (&td.td_id, rd) != 0",
+  "        || yytbl_read16 (&td.td_flags, rd) != 0",
+  "        || yytbl_read32 (&td.td_hilen, rd) != 0",
+  "        || yytbl_read32 (&td.td_lolen, rd) != 0)",
+  "        return -1;",
+  "",
+  "    /* Lookup the map for the transition table so we have it in case we need it",
+  "     * inside the loop below. This scanner might not even have a transition",
+  "     * table, which is ok.",
+  "     */",
+  "    transdmap = yytbl_dmap_lookup (dmap, YYTD_ID_TRANSITION M4_YY_CALL_LAST_ARG);",
+  "",
+  "    if ((dmap = yytbl_dmap_lookup (dmap, td.td_id M4_YY_CALL_LAST_ARG)) == NULL){",
+  "        YY_FATAL_ERROR( \"table id not found in map.\" );   /* TODO: not fatal. */",
+  "        return -1;",
+  "    }",
+  "",
+  "    /* Allocate space for table.",
+  "     * The --full yy_transition table is a special case, since we",
+  "     * need the dmap.dm_sz entry to tell us the sizeof the individual",
+  "     * struct members.",
+  "     */",
+  "    {",
+  "    size_t  bytes;",
+  "",
+  "    if ((td.td_flags & YYTD_STRUCT))",
+  "        bytes = sizeof(struct yy_trans_info) * td.td_lolen * (td.td_hilen ? td.td_hilen : 1);",
+  "    else",
+  "        bytes = td.td_lolen * (td.td_hilen ? td.td_hilen : 1) * dmap->dm_sz;",
+  "",
+  "    if(M4_YY_TABLES_VERIFY)",
+  "        /* We point to the array itself */",
+  "        p = dmap->dm_arr; ",
+  "    else",
+  "        /* We point to the address of a pointer. */",
+  "        *dmap->dm_arr = p = (void *) yyalloc (bytes M4_YY_CALL_LAST_ARG);",
+  "        if ( ! p )",
+  "            YY_FATAL_ERROR( \"out of dynamic memory in yytbl_data_load()\" );",
+  "    }",
+  "",
+  "    /* If it's a struct, we read 2 integers to get one element */",
+  "    if ((td.td_flags & YYTD_STRUCT) != 0)",
+  "        inner_loop_count = 2;",
+  "    else",
+  "        inner_loop_count = 1;",
+  "",
+  "    /* read and map each element.",
+  "     * This loop iterates once for each element of the td_data array.",
+  "     * Notice that we increment 'i' in the inner loop.",
+  "     */",
+  "    len = yytbl_calc_total_len (&td);",
+  "    for (i = 0; i < len; ){",
+  "        int    j;",
+  "",
+  "",
+  "        /* This loop really executes exactly 1 or 2 times.",
+  "         * The second time is to handle the second member of the",
+  "         * YYTD_STRUCT for the yy_transition array.",
+  "         */",
+  "        for (j = 0; j < inner_loop_count; j++, i++) {",
+  "            flex_int32_t t32;",
+  "",
+  "            /* read into t32 no matter what the real size is. */",
+  "            {",
+  "            flex_int16_t t16;",
+  "            flex_int8_t  t8;",
+  "",
+  "            switch (YYTDFLAGS2BYTES (td.td_flags)) {",
+  "            case sizeof (flex_int32_t):",
+  "                rv = yytbl_read32 (&t32, rd);",
+  "                break;",
+  "            case sizeof (flex_int16_t):",
+  "                rv = yytbl_read16 (&t16, rd);",
+  "                t32 = t16;",
+  "                break;",
+  "            case sizeof (flex_int8_t):",
+  "                rv = yytbl_read8 (&t8, rd);",
+  "                t32 = t8;",
+  "                break;",
+  "            default: ",
+  "                YY_FATAL_ERROR( \"invalid td_flags\" );   /* TODO: not fatal. */",
+  "                return -1;",
+  "            }",
+  "            }",
+  "            if (rv != 0)",
+  "                return -1;",
+  "",
+  "            /* copy into the deserialized array... */",
+  "",
+  "            if ((td.td_flags & YYTD_STRUCT)) {",
+  "                /* t32 is the j'th member of a two-element struct. */",
+  "                void   *v;",
+  "",
+  "                v = j == 0 ? &(((struct yy_trans_info *) p)->yy_verify)",
+  "                    : &(((struct yy_trans_info *) p)->yy_nxt);",
+  "",
+  "                switch (dmap->dm_sz) {",
+  "                case sizeof (flex_int32_t):",
+  "                    if (M4_YY_TABLES_VERIFY){",
+  "                        if( ((flex_int32_t *) v)[0] != (flex_int32_t) t32)",
+  "                           YY_FATAL_ERROR( \"tables verification failed at YYTD_STRUCT flex_int32_t\" );",
+  "                    }else",
+  "                        ((flex_int32_t *) v)[0] = (flex_int32_t) t32;",
+  "                    break;",
+  "                case sizeof (flex_int16_t):",
+  "                    if (M4_YY_TABLES_VERIFY ){",
+  "                        if(((flex_int16_t *) v)[0] != (flex_int16_t) t32)",
+  "                        YY_FATAL_ERROR( \"tables verification failed at YYTD_STRUCT flex_int16_t\" );",
+  "                    }else",
+  "                        ((flex_int16_t *) v)[0] = (flex_int16_t) t32;",
+  "                    break;",
+  "                case sizeof(flex_int8_t):",
+  "                    if (M4_YY_TABLES_VERIFY ){",
+  "                         if( ((flex_int8_t *) v)[0] != (flex_int8_t) t32)",
+  "                        YY_FATAL_ERROR( \"tables verification failed at YYTD_STRUCT flex_int8_t\" );",
+  "                    }else",
+  "                        ((flex_int8_t *) v)[0] = (flex_int8_t) t32;",
+  "                    break;",
+  "                default:",
+  "                    YY_FATAL_ERROR( \"invalid dmap->dm_sz for struct\" );   /* TODO: not fatal. */",
+  "                    return -1;",
+  "                }",
+  "",
+  "                /* if we're done with j, increment p */",
+  "                if (j == 1)",
+  "                    p = (struct yy_trans_info *) p + 1;",
+  "            }",
+  "            else if ((td.td_flags & YYTD_PTRANS)) {",
+  "                /* t32 is an index into the transition array. */",
+  "                struct yy_trans_info *v;",
+  "",
+  "",
+  "                if (!transdmap){",
+  "                    YY_FATAL_ERROR( \"transition table not found\" );   /* TODO: not fatal. */",
+  "                    return -1;",
+  "                }",
+  "                ",
+  "                if( M4_YY_TABLES_VERIFY)",
+  "                    v = &(((struct yy_trans_info *) (transdmap->dm_arr))[t32]);",
+  "                else",
+  "                    v = &((*((struct yy_trans_info **) (transdmap->dm_arr)))[t32]);",
+  "",
+  "                if(M4_YY_TABLES_VERIFY ){",
+  "                    if( ((struct yy_trans_info **) p)[0] != v)",
+  "                        YY_FATAL_ERROR( \"tables verification failed at YYTD_PTRANS\" );",
+  "                }else",
+  "                    ((struct yy_trans_info **) p)[0] = v;",
+  "                ",
+  "                /* increment p */",
+  "                p = (struct yy_trans_info **) p + 1;",
+  "            }",
+  "            else {",
+  "                /* t32 is a plain int. copy data, then incrememnt p. */",
+  "                switch (dmap->dm_sz) {",
+  "                case sizeof (flex_int32_t):",
+  "                    if(M4_YY_TABLES_VERIFY ){",
+  "                        if( ((flex_int32_t *) p)[0] != (flex_int32_t) t32)",
+  "                        YY_FATAL_ERROR( \"tables verification failed at flex_int32_t\" );",
+  "                    }else",
+  "                        ((flex_int32_t *) p)[0] = (flex_int32_t) t32;",
+  "                    p = ((flex_int32_t *) p) + 1;",
+  "                    break;",
+  "                case sizeof (flex_int16_t):",
+  "                    if(M4_YY_TABLES_VERIFY ){",
+  "                        if( ((flex_int16_t *) p)[0] != (flex_int16_t) t32)",
+  "                        YY_FATAL_ERROR( \"tables verification failed at flex_int16_t\" );",
+  "                    }else",
+  "                        ((flex_int16_t *) p)[0] = (flex_int16_t) t32;",
+  "                    p = ((flex_int16_t *) p) + 1;",
+  "                    break;",
+  "                case sizeof (flex_int8_t):",
+  "                    if(M4_YY_TABLES_VERIFY ){",
+  "                        if( ((flex_int8_t *) p)[0] != (flex_int8_t) t32)",
+  "                        YY_FATAL_ERROR( \"tables verification failed at flex_int8_t\" );",
+  "                    }else",
+  "                        ((flex_int8_t *) p)[0] = (flex_int8_t) t32;",
+  "                    p = ((flex_int8_t *) p) + 1;",
+  "                    break;",
+  "                default:",
+  "                    YY_FATAL_ERROR( \"invalid dmap->dm_sz for plain int\" );   /* TODO: not fatal. */",
+  "                    return -1;",
+  "                }",
+  "            }",
+  "        }",
+  "",
+  "    }",
+  "",
+  "    /* Now eat padding. */",
+  "    {",
+  "        int pad;",
+  "        pad = yypad64(rd->bread);",
+  "        while(--pad >= 0){",
+  "            flex_int8_t t8;",
+  "            if(yytbl_read8(&t8,rd) != 0)",
+  "                return -1;",
+  "        }",
+  "    }",
+  "",
+  "    return 0;",
+  "}",
+  "",
+  "%define-yytables   The name for this specific scanner's tables.",
+  "",
+  "/* Find the key and load the DFA tables from the given stream.  */",
+  "static int yytbl_fload YYFARGS2(FILE *, fp, const char *, key)",
+  "{",
+  "    int rv=0;",
+  "    struct yytbl_hdr th;",
+  "    struct yytbl_reader rd;",
+  "",
+  "    rd.fp = fp;",
+  "    th.th_version = NULL;",
+  "",
+  "    /* Keep trying until we find the right set of tables or end of file. */",
+  "    while (!feof(rd.fp)) {",
+  "        rd.bread = 0;",
+  "        if (yytbl_hdr_read (&th, &rd M4_YY_CALL_LAST_ARG) != 0){",
+  "            rv = -1;",
+  "            goto return_rv;",
+  "        }",
+  "",
+  "        /* A NULL key means choose the first set of tables. */",
+  "        if (key == NULL)",
+  "            break;",
+  "",
+  "        if (strcmp(th.th_name,key) != 0){",
+  "            /* Skip ahead to next set */",
+  "            fseek(rd.fp, th.th_ssize - th.th_hsize, SEEK_CUR);",
+  "            yyfree(th.th_version M4_YY_CALL_LAST_ARG);",
+  "            th.th_version = NULL;",
+  "        }",
+  "        else",
+  "            break;",
+  "    }",
+  "",
+  "    while (rd.bread < th.th_ssize){",
+  "        /* Load the data tables */",
+  "        if(yytbl_data_load (yydmap,&rd M4_YY_CALL_LAST_ARG) != 0){",
+  "            rv = -1;",
+  "            goto return_rv;",
+  "        }",
+  "    }",
+  "",
+  "return_rv:",
+  "    if(th.th_version){",
+  "        yyfree(th.th_version M4_YY_CALL_LAST_ARG);",
+  "        th.th_version = NULL;",
+  "    }",
+  "",
+  "    return rv;",
+  "}",
+  "",
+  "/** Load the DFA tables for this scanner from the given stream.  */",
+  "int yytables_fload YYFARGS1(FILE *, fp)",
+  "{",
+  "",
+  "    if( yytbl_fload(fp, YYTABLES_NAME M4_YY_CALL_LAST_ARG) != 0)",
+  "        return -1;",
+  "    return 0;",
+  "}",
+  "",
+  "/** Destroy the loaded tables, freeing memory, etc.. */",
+  "int yytables_destroy YYFARGS0(void)",
+  "{   ",
+  "    struct yytbl_dmap *dmap=0;",
+  "",
+  "    if(!M4_YY_TABLES_VERIFY){",
+  "        /* Walk the dmap, freeing the pointers */",
+  "        for(dmap=yydmap; dmap->dm_id; dmap++) {",
+  "            void * v;",
+  "            v = dmap->dm_arr;",
+  "            if(v && *(char**)v){",
+  "                    yyfree(*(char**)v M4_YY_CALL_LAST_ARG);",
+  "                    *(char**)v = NULL;",
+  "            }",
+  "        }",
+  "    }",
+  "",
+  "    return 0;",
+  "}",
+  "",
+  "/* end table serialization code definitions */",
+  "%endif",
+  "",
+  "",
+  "m4_ifdef([[M4_YY_MAIN]], [[",
+  "int main M4_YY_PARAMS(void);",
+  "",
+  "int main ()",
+  "{",
+  "",
+  "%if-reentrant",
+  "    yyscan_t lexer;",
+  "    yylex_init(&lexer);",
+  "    yylex( lexer );",
+  "    yylex_destroy( lexer);",
+  "",
+  "%endif",
+  "%if-not-reentrant",
+  "	yylex();",
+  "%endif",
+  "",
+  "	return 0;",
+  "}",
+  "]])",
+  "",
+  "%ok-for-header",
+  "m4_ifdef( [[M4_YY_IN_HEADER]],",
+  "[[",
+  "#undef YY_NEW_FILE",
+  "#undef YY_FLUSH_BUFFER",
+  "#undef yy_set_bol",
+  "#undef yy_new_buffer",
+  "#undef yy_set_interactive",
+  "#undef YY_DO_BEFORE_ACTION",
+  "",
+  "#ifdef YY_DECL_IS_OURS",
+  "#undef YY_DECL_IS_OURS",
+  "#undef YY_DECL",
+  "#endif",
+  "]])",
+  0
+};
diff --git a/usr.bin/lex/lex.1 b/usr.bin/lex/lex.1
index c47fbb0..fdb1881 100644
--- a/usr.bin/lex/lex.1
+++ b/usr.bin/lex/lex.1
@@ -1,8 +1,8 @@
 .\" $FreeBSD$
 .\"
-.TH FLEX 1 "April 1995" "Version 2.5"
+.TH FLEX 1 "May 21, 2013" "Version 2.5.37"
 .SH NAME
-flex \- fast lexical analyzer generator
+flex, lex \- fast lexical analyzer generator
 .SH SYNOPSIS
 .B flex
 .B [\-bcdfhilnpstvwBFILTV78+? \-C[aefFmr] \-ooutput \-Pprefix \-Sskeleton]
@@ -11,8 +11,8 @@ flex \- fast lexical analyzer generator
 .SH OVERVIEW
 This manual describes
 .I flex,
-a tool for generating programs that perform pattern-matching on text.  The
-manual includes both tutorial and reference sections:
+a tool for generating programs that perform pattern-matching on text.
+The manual includes both tutorial and reference sections:
 .nf
 
     Description
@@ -95,19 +95,22 @@ programs which recognize lexical patterns in text.
 .I flex
 reads
 the given input files, or its standard input if no file names are given,
-for a description of a scanner to generate.  The description is in
-the form of pairs
+for a description of a scanner to generate.
+The description is in the form of pairs
 of regular expressions and C code, called
-.I rules.  flex
+.I rules.
+.I flex
 generates as output a C source file,
 .B lex.yy.c,
 which defines a routine
 .B yylex().
 This file is compiled and linked with the
 .B \-ll
-library to produce an executable.  When the executable is run,
+library to produce an executable.
+When the executable is run,
 it analyzes its input for occurrences
-of the regular expressions.  Whenever it finds one, it executes
+of the regular expressions.
+Whenever it finds one, it executes
 the corresponding C code.
 .SH SOME SIMPLE EXAMPLES
 First some simple examples to get the flavor of how one uses
@@ -128,7 +131,8 @@ scanner
 is copied to the output, so the net effect of this scanner is
 to copy its input file to its output with each occurrence
 of "username" expanded.
-In this input, there is just one rule.  "username" is the
+In this input, there is just one rule.
+"username" is the
 .I pattern
 and the "printf" is the
 .I action.
@@ -156,13 +160,15 @@ Here's another simple example:
 .fi
 This scanner counts the number of characters and the number
 of lines in its input (it produces no output other than the
-final report on the counts).  The first line
+final report on the counts).
+The first line
 declares two globals, "num_lines" and "num_chars", which are accessible
 both inside
 .B yylex()
 and in the
 .B main()
-routine declared after the second "%%".  There are two rules, one
+routine declared after the second "%%".
+There are two rules, one
 which matches a newline ("\\n") and increments both the line count and
 the character count, and one which matches any character other than
 a newline (indicated by the "." regular expression).
@@ -223,7 +229,8 @@ A somewhat more complicated example:
 
 .fi
 This is the beginnings of a simple scanner for a language like
-Pascal.  It identifies different types of
+Pascal.
+It identifies different types of
 .I tokens
 and reports on what it has seen.
 .PP
@@ -263,7 +270,8 @@ followed by zero or more letters, digits, '_', or '-' (dash).
 The definition is taken to begin at the first non-white-space character
 following the name and continuing to the end of the line.
 The definition can subsequently be referred to using "{name}", which
-will expand to "(definition)".  For example,
+will expand to "(definition)".
+For example,
 .nf
 
     DIGIT    [0-9]
@@ -308,7 +316,8 @@ Finally, the user code section is simply copied to
 .B lex.yy.c
 verbatim.
 It is used for companion routines which call or are called
-by the scanner.  The presence of this section is optional;
+by the scanner.
+The presence of this section is optional;
 if it is missing, the second
 .B %%
 in the input file may be skipped, too.
@@ -339,7 +348,8 @@ beginning with "/*") is also copied verbatim to the output up
 to the next "*/".
 .SH PATTERNS
 The patterns in the input are written using an extended set of regular
-expressions.  These are:
+expressions.
+These are:
 .nf
 
     x          match the character 'x'
@@ -425,7 +435,8 @@ operators, '-', ']', and, at the beginning of the class, '^'.
 .PP
 The regular expressions listed above are grouped according to
 precedence, from highest precedence at the top to lowest at the bottom.
-Those grouped together have equal precedence.  For example,
+Those grouped together have equal precedence.
+For example,
 .nf
 
     foo|bar*
@@ -438,7 +449,8 @@ is the same as
 
 .fi
 since the '*' operator has higher precedence than concatenation,
-and concatenation higher than alternation ('|').  This pattern
+and concatenation higher than alternation ('|').
+This pattern
 therefore matches
 .I either
 the string "foo"
@@ -478,7 +490,8 @@ The valid expressions are:
 These expressions all designate a set of characters equivalent to
 the corresponding standard C
 .B isXXX
-function.  For example,
+function.
+For example,
 .B [:alnum:]
 designates those characters for which
 .B isalnum()
@@ -514,16 +527,19 @@ above
 .I will match a newline
 unless "\\n" (or an equivalent escape sequence) is one of the
 characters explicitly present in the negated character class
-(e.g., "[^A-Z\\n]").  This is unlike how many other regular
+(e.g., "[^A-Z\\n]").
+This is unlike how many other regular
 expression tools treat negated character classes, but unfortunately
 the inconsistency is historically entrenched.
 Matching newlines means that a pattern like [^"]* can match the entire
 input unless there's another quote in the input.
 .IP -
 A rule can have at most one instance of trailing context (the '/' operator
-or the '$' operator).  The start condition, '^', and "<<EOF>>" patterns
+or the '$' operator).
+The start condition, '^', and "<<EOF>>" patterns
 can only occur at the beginning of a pattern, and, as well as with '/' and '$',
-cannot be grouped inside parentheses.  A '^' which does not occur at
+cannot be grouped inside parentheses.
+A '^' which does not occur at
 the beginning of a rule or a '$' which does not occur at the end of
 a rule loses its special properties and is treated as a normal character.
 .IP
@@ -555,10 +571,12 @@ A similar trick will work for matching a foo or a
 bar-at-the-beginning-of-a-line.
 .SH HOW THE INPUT IS MATCHED
 When the generated scanner is run, it analyzes its input looking
-for strings which match any of its patterns.  If it finds more than
+for strings which match any of its patterns.
+If it finds more than
 one match, it takes the one matching the most text (for trailing
 context rules, this includes the length of the trailing part, even
-though it will then be returned to the input).  If it finds two
+though it will then be returned to the input).
+If it finds two
 or more matches of the same length, the
 rule listed first in the
 .I flex
@@ -580,7 +598,8 @@ input is scanned for another match.
 If no match is found, then the
 .I default rule
 is executed: the next character in the input is considered matched and
-copied to the standard output.  Thus, the simplest legal
+copied to the standard output.
+Thus, the simplest legal
 .I flex
 input is:
 .nf
@@ -603,7 +622,8 @@ uses by including one of the special directives
 .B %pointer
 or
 .B %array
-in the first (definitions) section of your flex input.  The default is
+in the first (definitions) section of your flex input.
+The default is
 .B %pointer,
 unless you use the
 .B -l
@@ -613,7 +633,8 @@ will be an array.
 The advantage of using
 .B %pointer
 is substantially faster scanning and no buffer overflow when matching
-very large tokens (unless you run out of dynamic memory).  The disadvantage
+very large tokens (unless you run out of dynamic memory).
+The disadvantage
 is that you are restricted in how your actions can modify
 .B yytext
 (see the next section), and calls to the
@@ -632,7 +653,8 @@ to your heart's content, and calls to
 .B unput()
 do not destroy
 .B yytext
-(see below).  Furthermore, existing
+(see below).
+Furthermore, existing
 .I lex
 programs sometimes access
 .B yytext
@@ -650,14 +672,17 @@ defines
 .B yytext
 to be an array of
 .B YYLMAX
-characters, which defaults to a fairly large value.  You can change
+characters, which defaults to a fairly large value.
+You can change
 the size by simply #define'ing
 .B YYLMAX
 to a different value in the first section of your
 .I flex
-input.  As mentioned above, with
+input.
+As mentioned above, with
 .B %pointer
-yytext grows dynamically to accommodate large tokens.  While this means your
+yytext grows dynamically to accommodate large tokens.
+While this means your
 .B %pointer
 scanner can accommodate very large tokens (such as matching entire blocks
 of comments), bear in mind that each time the scanner must resize
@@ -679,10 +704,13 @@ with C++ scanner classes
 option; see below).
 .SH ACTIONS
 Each pattern in a rule has a corresponding action, which can be any
-arbitrary C statement.  The pattern ends at the first non-escaped
-whitespace character; the remainder of the line is its action.  If the
+arbitrary C statement.
+The pattern ends at the first non-escaped
+whitespace character; the remainder of the line is its action.
+If the
 action is empty, then when the pattern is matched the input token
-is simply discarded.  For example, here is the specification for a program
+is simply discarded.
+For example, here is the specification for a program
 which deletes all occurrences of "zap me" from its input:
 .nf
 
@@ -730,7 +758,8 @@ Actions are free to modify
 .B yytext
 except for lengthening it (adding
 characters to its end--these will overwrite later characters in the
-input stream).  This however does not apply when using
+input stream).
+This however does not apply when using
 .B %array
 (see above); in that case,
 .B yytext
@@ -754,7 +783,8 @@ corresponding start condition (see below).
 .IP -
 .B REJECT
 directs the scanner to proceed on to the "second best" rule which matched the
-input (or a prefix of the input).  The rule is chosen as described
+input (or a prefix of the input).
+The rule is chosen as described
 above in "How the Input is Matched", and
 .B yytext
 and
@@ -782,7 +812,8 @@ scanner normally executes only one action per token.
 Multiple
 .B REJECT's
 are allowed, each one finding the next best choice to the currently
-active rule.  For example, when the following scanner scans the token
+active rule.
+For example, when the following scanner scans the token
 "abcd", it will write "abcdabcaba" to the output:
 .nf
 
@@ -802,7 +833,8 @@ if it is used in
 .I any
 of the scanner's actions it will slow down
 .I all
-of the scanner's matching.  Furthermore,
+of the scanner's matching.
+Furthermore,
 .B REJECT
 cannot be used with the
 .I -Cf
@@ -824,7 +856,8 @@ token should be
 .I appended
 onto the current value of
 .B yytext
-rather than replacing it.  For example, given the input "mega-kludge"
+rather than replacing it.
+For example, given the input "mega-kludge"
 the following will write "mega-mega-kludge" to the output:
 .nf
 
@@ -833,7 +866,8 @@ the following will write "mega-mega-kludge" to the output:
     kludge   ECHO;
 
 .fi
-First "mega-" is matched and echoed to the output.  Then "kludge"
+First "mega-" is matched and echoed to the output.
+Then "kludge"
 is matched, but the previous "mega-" is still hanging around at the
 beginning of
 .B yytext
@@ -869,7 +903,8 @@ are adjusted appropriately (e.g.,
 .B yyleng
 will now be equal to
 .I n
-).  For example, on the input "foobar" the following will write out
+).
+For example, on the input "foobar" the following will write out
 "foobarbar":
 .nf
 
@@ -880,7 +915,8 @@ will now be equal to
 .fi
 An argument of 0 to
 .B yyless
-will cause the entire current input string to be scanned again.  Unless you've
+will cause the entire current input string to be scanned again.
+Unless you've
 changed how the scanner will subsequently process its input (using
 .B BEGIN,
 for example), this will result in an endless loop.
@@ -893,7 +929,8 @@ other source files.
 .B unput(c)
 puts the character
 .I c
-back onto the input stream.  It will be the next character scanned.
+back onto the input stream.
+It will be the next character scanned.
 The following action will take the current token and cause it
 to be rescanned enclosed in parentheses.
 .nf
@@ -926,7 +963,8 @@ is that if you are using
 the contents of
 .I yytext,
 starting with its rightmost character and devouring one character to
-the left with each call.  If you need the value of yytext preserved
+the left with each call.
+If you need the value of yytext preserved
 after a call to
 .B unput()
 (as in the above example),
@@ -939,7 +977,8 @@ Finally, note that you cannot put back
 to attempt to mark the input stream with an end-of-file.
 .IP -
 .B input()
-reads the next character from the input stream.  For example,
+reads the next character from the input stream.
+For example,
 the following is one way to eat up C comments:
 .nf
 
@@ -986,18 +1025,20 @@ flushes the scanner's internal buffer
 so that the next time the scanner attempts to match a token, it will
 first refill the buffer using
 .B YY_INPUT
-(see The Generated Scanner, below).  This action is a special case
+(see The Generated Scanner, below).
+This action is a special case
 of the more general
 .B yy_flush_buffer()
 function, described below in the section Multiple Input Buffers.
 .IP -
 .B yyterminate()
-can be used in lieu of a return statement in an action.  It terminates
+can be used in lieu of a return statement in an action.
+It terminates
 the scanner and returns a 0 to the scanner's caller, indicating "all done".
 By default,
 .B yyterminate()
-is also called when an end-of-file is encountered.  It is a macro and
-may be redefined.
+is also called when an end-of-file is encountered.
+It is a macro and may be redefined.
 .SH THE GENERATED SCANNER
 The output of
 .I flex
@@ -1006,7 +1047,8 @@ is the file
 which contains the scanning routine
 .B yylex(),
 a number of tables used by it for matching tokens, and a number
-of auxiliary routines and macros.  By default,
+of auxiliary routines and macros.
+By default,
 .B yylex()
 is declared as follows:
 .nf
@@ -1019,7 +1061,8 @@ is declared as follows:
 .fi
 (If your environment supports function prototypes, then it will
 be "int yylex( void )".)  This definition may be changed by defining
-the "YY_DECL" macro.  For example, you could use:
+the "YY_DECL" macro.
+For example, you could use:
 .nf
 
     #define YY_DECL float lexscan( a, b ) float a, b;
@@ -1027,7 +1070,8 @@ the "YY_DECL" macro.  For example, you could use:
 .fi
 to give the scanning routine the name
 .I lexscan,
-returning a float, and taking two floats as arguments.  Note that
+returning a float, and taking two floats as arguments.
+Note that
 if you give arguments to the scanning routine using a
 K&R-style/non-prototyped function declaration, you must terminate
 the definition with a semi-colon (;).
@@ -1036,7 +1080,8 @@ Whenever
 .B yylex()
 is called, it scans tokens from the global input file
 .I yyin
-(which defaults to stdin).  It continues until it either reaches
+(which defaults to stdin).
+It continues until it either reaches
 an end-of-file (at which point it returns the value 0) or
 one of its actions executes a
 .I return
@@ -1058,7 +1103,8 @@ to scan from a source other than
 .I yyin),
 and initializes
 .I yyin
-for scanning from that file.  Essentially there is no difference between
+for scanning from that file.
+Essentially there is no difference between
 just assigning
 .I yyin
 to a new input file or using
@@ -1096,8 +1142,8 @@ calls to read characters from
 The nature of how it gets its input can be controlled by defining the
 .B YY_INPUT
 macro.
-YY_INPUT's calling sequence is "YY_INPUT(buf,result,max_size)".  Its
-action is to place up to
+YY_INPUT's calling sequence is "YY_INPUT(buf,result,max_size)".
+Its action is to place up to
 .I max_size
 characters in the character array
 .I buf
@@ -1105,7 +1151,8 @@ and return in the integer variable
 .I result
 either the
 number of characters read or the constant YY_NULL (0 on Unix systems)
-to indicate EOF.  The default YY_INPUT reads from the
+to indicate EOF.
+The default YY_INPUT reads from the
 global file-pointer "yyin".
 .PP
 A sample definition of YY_INPUT (in the definitions
@@ -1127,14 +1174,17 @@ one character at a time.
 When the scanner receives an end-of-file indication from YY_INPUT,
 it then checks the
 .B yywrap()
-function.  If
+function.
+If
 .B yywrap()
 returns false (zero), then it is assumed that the
 function has gone ahead and set up
 .I yyin
-to point to another input file, and scanning continues.  If it returns
+to point to another input file, and scanning continues.
+If it returns
 true (non-zero), then the scanner terminates, returning 0 to its
-caller.  Note that in either case, the start condition remains unchanged;
+caller.
+Note that in either case, the start condition remains unchanged;
 it does
 .I not
 revert to
@@ -1167,9 +1217,11 @@ by assigning it to some other
 pointer.
 .SH START CONDITIONS
 .I flex
-provides a mechanism for conditionally activating rules.  Any rule
+provides a mechanism for conditionally activating rules.
+Any rule
 whose pattern is prefixed with "<sc>" will only be active when
-the scanner is in the start condition named "sc".  For example,
+the scanner is in the start condition named "sc".
+For example,
 .nf
 
     <STRING>[^"]*        { /* eat up the string body ... */
@@ -1200,9 +1252,11 @@ The former declares
 .I inclusive
 start conditions, the latter
 .I exclusive
-start conditions.  A start condition is activated using the
+start conditions.
+A start condition is activated using the
 .B BEGIN
-action.  Until the next
+action.
+Until the next
 .B BEGIN
 action is executed, rules with the given start
 condition will be active and
@@ -1218,14 +1272,16 @@ rules qualified with the start condition will be active.
 A set of rules contingent on the same exclusive start condition
 describe a scanner which is independent of any of the other rules in the
 .I flex
-input.  Because of this,
+input.
+Because of this,
 exclusive start conditions make it easy to specify "mini-scanners"
 which scan portions of the input that are syntactically different
 from the rest (e.g., comments).
 .PP
 If the distinction between inclusive and exclusive start conditions
 is still a little vague, here's a simple example illustrating the
-connection between the two.  The set of rules:
+connection between the two.
+The set of rules:
 .nf
 
     %s example
@@ -1272,8 +1328,8 @@ start condition.
 .PP
 Also note that the special start-condition specifier
 .B <*>
-matches every start condition.  Thus, the above example could also
-have been written;
+matches every start condition.
+Thus, the above example could also have been written;
 .nf
 
     %x example
@@ -1287,7 +1343,8 @@ have been written;
 .PP
 The default rule (to
 .B ECHO
-any unmatched character) remains active in start conditions.  It
+any unmatched character) remains active in start conditions.
+It
 is equivalent to:
 .nf
 
@@ -1297,7 +1354,8 @@ is equivalent to:
 .PP
 .B BEGIN(0)
 returns to the original state where only the rules with
-no start conditions are active.  This state can also be
+no start conditions are active.
+This state can also be
 referred to as the start-condition "INITIAL", so
 .B BEGIN(INITIAL)
 is equivalent to
@@ -1307,7 +1365,8 @@ are considered good style.)
 .PP
 .B BEGIN
 actions can also be given as indented code at the beginning
-of the rules section.  For example, the following will cause
+of the rules section.
+For example, the following will cause
 the scanner to enter the "SPECIAL" start condition whenever
 .B yylex()
 is called and the global variable
@@ -1329,7 +1388,8 @@ is true:
 .PP
 To illustrate the uses of start conditions,
 here is a scanner which provides two different interpretations
-of a string like "123.456".  By default it will treat it as
+of a string like "123.456".
+By default it will treat it as
 three tokens, the integer "123", a dot ('.'), and the integer "456".
 But if the string is preceded earlier in the line by the string
 "expect-floats"
@@ -1383,12 +1443,14 @@ maintaining a count of the current input line.
 
 .fi
 This scanner goes to a bit of trouble to match as much
-text as possible with each rule.  In general, when attempting to write
+text as possible with each rule.
+In general, when attempting to write
 a high-speed scanner try to match as much possible in each rule, as
 it's a big win.
 .PP
 Note that start-conditions names are really integer values and
-can be stored as such.  Thus, the above could be extended in the
+can be stored as such.
+Thus, the above could be extended in the
 following fashion:
 .nf
 
@@ -1418,7 +1480,8 @@ following fashion:
 Furthermore, you can access the current start condition using
 the integer-valued
 .B YY_START
-macro.  For example, the above assignments to
+macro.
+For example, the above assignments to
 .I comment_caller
 could instead be written
 .nf
@@ -1499,8 +1562,8 @@ not including checking for a string that's too long):
 .fi
 .PP
 Often, such as in some of the examples above, you wind up writing a
-whole bunch of rules all preceded by the same start condition(s).  Flex
-makes this a little easier and cleaner by introducing a notion of
+whole bunch of rules all preceded by the same start condition(s).
+Flex makes this a little easier and cleaner by introducing a notion of
 start condition
 .I scope.
 A start condition scope is begun with:
@@ -1511,7 +1574,8 @@ A start condition scope is begun with:
 .fi
 where
 .I SCs
-is a list of one or more start conditions.  Inside the start condition
+is a list of one or more start conditions.
+Inside the start condition
 scope, every rule automatically has the prefix
 .I <SCs>
 applied to it, until a
@@ -1558,14 +1622,16 @@ pops the top of the stack and switches to it via
 returns the top of the stack without altering the stack's contents.
 .PP
 The start condition stack grows dynamically and so has no built-in
-size limitation.  If memory is exhausted, program execution aborts.
+size limitation.
+If memory is exhausted, program execution aborts.
 .PP
 To use start condition stacks, your scanner must include a
 .B %option stack
 directive (see Options below).
 .SH MULTIPLE INPUT BUFFERS
 Some scanners (such as those which support "include" files)
-require reading from several input streams.  As
+require reading from several input streams.
+As
 .I flex
 scanners do a large amount of buffering, one cannot control
 where the next input will be read from by simply writing a
@@ -1579,7 +1645,8 @@ which requires switching the input source.
 To negotiate these sorts of problems,
 .I flex
 provides a mechanism for creating and switching between multiple
-input buffers.  An input buffer is created by using:
+input buffers.
+An input buffer is created by using:
 .nf
 
     YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
@@ -1592,9 +1659,11 @@ file and large enough to hold
 .I size
 characters (when in doubt, use
 .B YY_BUF_SIZE
-for the size).  It returns a
+for the size).
+It returns a
 .B YY_BUFFER_STATE
-handle, which may then be passed to other routines (see below).  The
+handle, which may then be passed to other routines (see below).
+The
 .B YY_BUFFER_STATE
 type is a pointer to an opaque
 .B struct yy_buffer_state
@@ -1602,7 +1671,8 @@ structure, so you may safely initialize YY_BUFFER_STATE variables to
 .B ((YY_BUFFER_STATE) 0)
 if you wish, and also refer to the opaque structure in order to
 correctly declare input buffers in source files other than that
-of your scanner.  Note that the
+of your scanner.
+Note that the
 .I FILE
 pointer in the call to
 .B yy_create_buffer
@@ -1632,7 +1702,8 @@ Note that
 may be used by yywrap() to set things up for continued scanning, instead
 of opening a new file and pointing
 .I yyin
-at it.  Note also that switching input sources via either
+at it.
+Note also that switching input sources via either
 .B yy_switch_to_buffer()
 or
 .B yywrap()
@@ -1644,7 +1715,8 @@ change the start condition.
     void yy_delete_buffer( YY_BUFFER_STATE buffer )
 
 .fi
-is used to reclaim the storage associated with a buffer.  (
+is used to reclaim the storage associated with a buffer.
+(
 .B buffer
 can be nil, in which case the routine does nothing.)
 You can also clear the current contents of a buffer using:
@@ -1734,12 +1806,14 @@ feature is discussed below):
 
 .fi
 Three routines are available for setting up input buffers for
-scanning in-memory strings instead of files.  All of them create
+scanning in-memory strings instead of files.
+All of them create
 a new input buffer for scanning the string, and return a corresponding
 .B YY_BUFFER_STATE
 handle (which you should delete with
 .B yy_delete_buffer()
-when done with it).  They also switch to the new buffer using
+when done with it).
+They also switch to the new buffer using
 .B yy_switch_to_buffer(),
 so the next call to
 .B yylex()
@@ -1757,7 +1831,8 @@ starting at location
 .PP
 Note that both of these functions create and scan a
 .I copy
-of the string or bytes.  (This may be desirable, since
+of the string or bytes.
+(This may be desirable, since
 .B yylex()
 modifies the contents of the buffer it is scanning.)  You can avoid the
 copy by using:
@@ -1795,7 +1870,8 @@ reflecting the size of the buffer.
 The special rule "<<EOF>>" indicates
 actions which are to be taken when an end-of-file is
 encountered and yywrap() returns non-zero (i.e., indicates
-no further files to process).  The action must finish
+no further files to process).
+The action must finish
 by doing one of four things:
 .IP -
 assigning
@@ -1819,10 +1895,12 @@ as shown in the example above.
 .PP
 <<EOF>> rules may not be used with other
 patterns; they may only be qualified with a list of start
-conditions.  If an unqualified <<EOF>> rule is given, it
+conditions.
+If an unqualified <<EOF>> rule is given, it
 applies to
 .I all
-start conditions which do not already have <<EOF>> actions.  To
+start conditions which do not already have <<EOF>> actions.
+To
 specify an <<EOF>> rule for only the initial start condition, use
 .nf
 
@@ -1855,15 +1933,16 @@ An example:
 The macro
 .B YY_USER_ACTION
 can be defined to provide an action
-which is always executed prior to the matched rule's action.  For example,
+which is always executed prior to the matched rule's action.
+For example,
 it could be #define'd to call a routine to convert yytext to lower-case.
 When
 .B YY_USER_ACTION
 is invoked, the variable
 .I yy_act
 gives the number of the matched rule (rules are numbered starting with 1).
-Suppose you want to profile how often each of your rules is matched.  The
-following would do the trick:
+Suppose you want to profile how often each of your rules is matched.
+The following would do the trick:
 .nf
 
     #define YY_USER_ACTION ++ctr[yy_act]
@@ -1871,8 +1950,8 @@ following would do the trick:
 .fi
 where
 .I ctr
-is an array to hold the counts for the different rules.  Note that
-the macro
+is an array to hold the counts for the different rules.
+Note that the macro
 .B YY_NUM_RULES
 gives the total number of rules (including the default rule, even if
 you use
@@ -1902,9 +1981,11 @@ but must be used when the scanner's input source is indeed
 interactive to avoid problems due to waiting to fill buffers
 (see the discussion of the
 .B \-I
-flag below).  A non-zero value
+flag below).
+A non-zero value
 in the macro invocation marks the buffer as interactive, a zero
-value as non-interactive.  Note that use of this macro overrides
+value as non-interactive.
+Note that use of this macro overrides
 .B %option interactive ,
 .B %option always-interactive
 or
@@ -1918,8 +1999,9 @@ The macro
 .B yy_set_bol(at_bol)
 can be used to control whether the current buffer's scanning
 context for the next token match is done as though at the
-beginning of a line.  A non-zero macro argument makes rules anchored with
-\&'^' active, while a zero argument makes '^' rules inactive.
+beginning of a line.
+A non-zero macro argument makes rules anchored with
+'^' active, while a zero argument makes '^' rules inactive.
 .PP
 The macro
 .B YY_AT_BOL()
@@ -1929,7 +2011,8 @@ will have '^' rules active, false otherwise.
 In the generated scanner, the actions are all gathered in one large
 switch statement and separated using
 .B YY_BREAK,
-which may be redefined.  By default, it is simply a "break", to separate
+which may be redefined.
+By default, it is simply a "break", to separate
 each rule's action from the following rule's.
 Redefining
 .B YY_BREAK
@@ -1945,7 +2028,8 @@ This section summarizes the various values available to the user
 in the rule actions.
 .IP -
 .B char *yytext
-holds the text of the current token.  It may be modified but not lengthened
+holds the text of the current token.
+It may be modified but not lengthened
 (you cannot append characters to the end).
 .IP
 If the special directive
@@ -1957,7 +2041,8 @@ is instead declared
 where
 .B YYLMAX
 is a macro definition that you can redefine in the first section
-if you don't like the default value (generally 8KB).  Using
+if you don't like the default value (generally 8KB).
+Using
 .B %array
 results in somewhat slower scanners, but the value of
 .B yytext
@@ -1967,7 +2052,8 @@ and
 .I unput(),
 which potentially destroy its value when
 .B yytext
-is a character pointer.  The opposite of
+is a character pointer.
+The opposite of
 .B %array
 is
 .B %pointer,
@@ -1986,9 +2072,10 @@ holds the length of the current token.
 .B FILE *yyin
 is the file which by default
 .I flex
-reads from.  It may be redefined but doing so only makes sense before
-scanning begins or after an EOF has been encountered.  Changing it in
-the midst of scanning will have unexpected results since
+reads from.
+It may be redefined but doing so only makes sense before
+scanning begins or after an EOF has been encountered.
+Changing it in the midst of scanning will have unexpected results since
 .I flex
 buffers its input; use
 .B yyrestart()
@@ -2001,8 +2088,10 @@ at the new input file and then call the scanner again to continue scanning.
 .B void yyrestart( FILE *new_file )
 may be called to point
 .I yyin
-at the new input file.  The switch-over to the new file is immediate
-(any previously buffered-up input is lost).  Note that calling
+at the new input file.
+The switch-over to the new file is immediate
+(any previously buffered-up input is lost).
+Note that calling
 .B yyrestart()
 with
 .I yyin
@@ -2012,7 +2101,8 @@ scanning the same input file.
 .B FILE *yyout
 is the file to which
 .B ECHO
-actions are done.  It can be reassigned by the user.
+actions are done.
+It can be reassigned by the user.
 .IP -
 .B YY_CURRENT_BUFFER
 returns a
@@ -2021,7 +2111,8 @@ handle to the current buffer.
 .IP -
 .B YY_START
 returns an integer value corresponding to the current start
-condition.  You can subsequently use this value with
+condition.
+You can subsequently use this value with
 .B BEGIN
 to return to that start condition.
 .SH INTERFACING WITH YACC
@@ -2033,7 +2124,8 @@ parser-generator.
 .I yacc
 parsers expect to call a routine named
 .B yylex()
-to find the next input token.  The routine is supposed to
+to find the next input token.
+The routine is supposed to
 return the type of the next token as well as putting any associated
 value in the global
 .B yylval.
@@ -2051,9 +2143,11 @@ containing definitions of all the
 .B %tokens
 appearing in the
 .I yacc
-input.  This file is then included in the
+input.
+This file is then included in the
 .I flex
-scanner.  For example, if one of the tokens is "TOK_NUMBER",
+scanner.
+For example, if one of the tokens is "TOK_NUMBER",
 part of the scanner might look like:
 .nf
 
@@ -2070,12 +2164,14 @@ part of the scanner might look like:
 .I flex
 has the following options:
 .TP
-.B \-b
+.B \-b, --backup
 Generate backing-up information to
 .I lex.backup.
 This is a list of scanner states which require backing up
-and the input characters on which they do so.  By adding rules one
-can remove backing-up states.  If
+and the input characters on which they do so.
+By adding rules one
+can remove backing-up states.
+If
 .I all
 backing-up states are eliminated and
 .B \-Cf
@@ -2083,17 +2179,19 @@ or
 .B \-CF
 is used, the generated scanner will run faster (see the
 .B \-p
-flag).  Only users who wish to squeeze every last cycle out of their
-scanners need worry about this option.  (See the section on Performance
-Considerations below.)
+flag).
+Only users who wish to squeeze every last cycle out of their
+scanners need worry about this option.
+(See the section on Performance Considerations below.)
 .TP
 .B \-c
 is a do-nothing, deprecated option included for POSIX compliance.
 .TP
-.B \-d
+.B \-d, \-\-debug
 makes the generated scanner run in
 .I debug
-mode.  Whenever a pattern is recognized and the global
+mode.
+Whenever a pattern is recognized and the global
 .B yy_flex_debug
 is non-zero (which is the default),
 the scanner will write to
@@ -2105,21 +2203,22 @@ a line of the form:
 
 .fi
 The line number refers to the location of the rule in the file
-defining the scanner (i.e., the file that was fed to flex).  Messages
-are also generated when the scanner backs up, accepts the
+defining the scanner (i.e., the file that was fed to flex).
+Messages are also generated when the scanner backs up, accepts the
 default rule, reaches the end of its input buffer (or encounters
 a NUL; at this point, the two look the same as far as the scanner's concerned),
 or reaches an end-of-file.
 .TP
-.B \-f
+.B \-f, \-\-full
 specifies
 .I fast scanner.
 No table compression is done and stdio is bypassed.
-The result is large but fast.  This option is equivalent to
+The result is large but fast.
+This option is equivalent to
 .B \-Cfr
 (see below).
 .TP
-.B \-h
+.B \-h, \-\-help
 generates a "help" summary of
 .I flex's
 options to
@@ -2131,31 +2230,36 @@ and
 are synonyms for
 .B \-h.
 .TP
-.B \-i
+.B \-i, \-\-case-insensitive
 instructs
 .I flex
 to generate a
 .I case-insensitive
-scanner.  The case of letters given in the
+scanner.
+The case of letters given in the
 .I flex
 input patterns will
-be ignored, and tokens in the input will be matched regardless of case.  The
-matched text given in
+be ignored, and tokens in the input will be matched regardless of case.
+The matched text given in
 .I yytext
 will have the preserved case (i.e., it will not be folded).
 .TP
-.B \-l
+.B \-l, \-\-lex\-compat
 turns on maximum compatibility with the original AT&T
 .I lex
-implementation.  Note that this does not mean
+implementation.
+Note that this does not mean
 .I full
-compatibility.  Use of this option costs a considerable amount of
+compatibility.
+Use of this option costs a considerable amount of
 performance, and it cannot be used with the
 .B \-+, -f, -F, -Cf,
 or
 .B -CF
-options.  For details on the compatibilities it provides, see the section
-"Incompatibilities With Lex And POSIX" below.  This option also results
+options.
+For details on the compatibilities it provides, see the section
+"Incompatibilities With Lex And POSIX" below.
+This option also results
 in the name
 .B YY_FLEX_LEX_COMPAT
 being #define'd in the generated scanner.
@@ -2164,12 +2268,13 @@ being #define'd in the generated scanner.
 is another do-nothing, deprecated option included only for
 POSIX compliance.
 .TP
-.B \-p
-generates a performance report to stderr.  The report
-consists of comments regarding features of the
+.B \-p, \-\-perf\-report
+generates a performance report to stderr.
+The report consists of comments regarding features of the
 .I flex
 input file which will cause a serious loss of performance in the resulting
-scanner.  If you give the flag twice, you will also get comments regarding
+scanner.
+If you give the flag twice, you will also get comments regarding
 features that lead to minor performance losses.
 .IP
 Note that the use of
@@ -2185,23 +2290,25 @@ and the
 .B \-I
 flag entail minor performance penalties.
 .TP
-.B \-s
+.B \-s, \-\-no\-default
 causes the
 .I default rule
 (that unmatched scanner input is echoed to
 .I stdout)
-to be suppressed.  If the scanner encounters input that does not
-match any of its rules, it aborts with an error.  This option is
+to be suppressed.
+If the scanner encounters input that does not
+match any of its rules, it aborts with an error.
+This option is
 useful for finding holes in a scanner's rule set.
 .TP
-.B \-t
+.B \-t, \-\-stdout
 instructs
 .I flex
 to write the scanner it generates to standard output instead
 of
 .B lex.yy.c.
 .TP
-.B \-v
+.B \-v, \-\-verbose
 specifies that
 .I flex
 should write to
@@ -2216,10 +2323,10 @@ user, but the first line identifies the version of
 and the next line the flags used when generating the scanner, including
 those that are on by default.
 .TP
-.B \-w
+.B \-w, \-\-nowarn
 suppresses warning messages.
 .TP
-.B \-B
+.B \-B, \-\-batch
 instructs
 .I flex
 to generate a
@@ -2228,16 +2335,18 @@ scanner, the opposite of
 .I interactive
 scanners generated by
 .B \-I
-(see below).  In general, you use
+(see below).
+In general, you use
 .B \-B
 when you are
 .I certain
 that your scanner will never be used interactively, and you want to
 squeeze a
 .I little
-more performance out of it.  If your goal is instead to squeeze out a
+more performance out of it.
+If your goal is instead to squeeze out a
 .I lot
-more performance, you should  be using the
+more performance, you should be using the
 .B \-Cf
 or
 .B \-CF
@@ -2245,15 +2354,17 @@ options (discussed below), which turn on
 .B \-B
 automatically anyway.
 .TP
-.B \-F
+.B \-F, \-\-fast
 specifies that the
-.I fast
+.ul
+fast
 scanner table representation should be used (and stdio
-bypassed).  This representation is
-about as fast as the full table representation
+bypassed).
+This representation is about as fast as the full table representation
 .B (-f),
 and for some sets of patterns will be considerably smaller (and for
-others, larger).  In general, if the pattern set contains both "keywords"
+others, larger).
+In general, if the pattern set contains both "keywords"
 and a catch-all, "identifier" rule, such as in the set:
 .nf
 
@@ -2264,26 +2375,31 @@ and a catch-all, "identifier" rule, such as in the set:
     [a-z]+    return TOK_ID;
 
 .fi
-then you're better off using the full table representation.  If only
+then you're better off using the full table representation.
+If only
 the "identifier" rule is present and you then use a hash table or some such
 to detect the keywords, you're better off using
 .B -F.
 .IP
 This option is equivalent to
 .B \-CFr
-(see below).  It cannot be used with
+(see below).
+It cannot be used with
 .B \-+.
 .TP
-.B \-I
+.B \-I, \-\-interactive
 instructs
 .I flex
 to generate an
 .I interactive
-scanner.  An interactive scanner is one that only looks ahead to decide
-what token has been matched if it absolutely must.  It turns out that
+scanner.
+An interactive scanner is one that only looks ahead to decide
+what token has been matched if it absolutely must.
+It turns out that
 always looking one extra character ahead, even if the scanner has already
 seen enough text to disambiguate the current token, is a bit faster than
-only looking ahead when necessary.  But scanners that always look ahead
+only looking ahead when necessary.
+But scanners that always look ahead
 give dreadful interactive performance; for example, when a user types
 a newline, it is not recognized as a newline token until they enter
 .I another
@@ -2296,12 +2412,14 @@ unless you use the
 .B \-Cf
 or
 .B \-CF
-table-compression options (see below).  That's because if you're looking
+table-compression options (see below).
+That's because if you're looking
 for high-performance you should be using one of these options, so if you
 didn't,
 .I flex
 assumes you'd rather trade off a bit of run-time performance for intuitive
-interactive behavior.  Note also that you
+interactive behavior.
+Note also that you
 .I cannot
 use
 .B \-I
@@ -2316,7 +2434,8 @@ Note that if
 .B isatty()
 returns false for the scanner input, flex will revert to batch mode, even if
 .B \-I
-was specified.  To force interactive mode no matter what, use
+was specified.
+To force interactive mode no matter what, use
 .B %option always-interactive
 (see Options below).
 .IP
@@ -2326,12 +2445,13 @@ be interactive by using
 .B \-B
 (see above).
 .TP
-.B \-L
+.B \-L, \-\-noline
 instructs
 .I flex
 not to generate
 .B #line
-directives.  Without this option,
+directives.
+Without this option,
 .I flex
 peppers the generated scanner
 with #line directives so error messages in the actions will be correctly
@@ -2344,19 +2464,21 @@ input file (if the errors are due to code in the input file), or
 fault -- you should report these sorts of errors to the email address
 given below).
 .TP
-.B \-T
+.B \-T, \-\-trace
 makes
 .I flex
 run in
 .I trace
-mode.  It will generate a lot of messages to
+mode.
+It will generate a lot of messages to
 .I stderr
 concerning
 the form of the input and the resultant non-deterministic and deterministic
-finite automata.  This option is mostly for use in maintaining
+finite automata.
+This option is mostly for use in maintaining
 .I flex.
 .TP
-.B \-V
+.B \-V, \-\-version
 prints the version number to
 .I stdout
 and exits.
@@ -2364,16 +2486,18 @@ and exits.
 is a synonym for
 .B \-V.
 .TP
-.B \-7
+.B \-7, \-\-7bit
 instructs
 .I flex
 to generate a 7-bit scanner, i.e., one which can only recognize 7-bit
-characters in its input.  The advantage of using
+characters in its input.
+The advantage of using
 .B \-7
 is that the scanner's tables can be up to half the size of those generated
 using the
 .B \-8
-option (see below).  The disadvantage is that such scanners often hang
+option (see below).
+The disadvantage is that such scanners often hang
 or crash if their input contains an 8-bit character.
 .IP
 Note, however, that unless you generate your scanner using the
@@ -2393,7 +2517,8 @@ in which case
 .I flex
 defaults to generating 7-bit scanners unless your site was always
 configured to generate 8-bit scanners (as will often be the case
-with non-USA sites).  You can tell whether flex generated a 7-bit
+with non-USA sites).
+You can tell whether flex generated a 7-bit
 or an 8-bit scanner by inspecting the flag summary in the
 .B \-v
 output as described above.
@@ -2407,11 +2532,12 @@ discussed see below), flex still defaults to generating an 8-bit
 scanner, since usually with these compression options full 8-bit tables
 are not much more expensive than 7-bit tables.
 .TP
-.B \-8
+.B \-8, \-\-8bit
 instructs
 .I flex
 to generate an 8-bit scanner, i.e., one which can recognize 8-bit
-characters.  This flag is only needed for scanners generated using
+characters.
+This flag is only needed for scanners generated using
 .B \-Cf
 or
 .B \-CF,
@@ -2422,24 +2548,27 @@ See the discussion of
 above for flex's default behavior and the tradeoffs between 7-bit
 and 8-bit scanners.
 .TP
-.B \-+
+.B \-+, \-\-c++
 specifies that you want flex to generate a C++
-scanner class.  See the section on Generating C++ Scanners below for
+scanner class.
+See the section on Generating C++ Scanners below for
 details.
 .TP
 .B \-C[aefFmr]
 controls the degree of table compression and, more generally, trade-offs
 between small scanners and fast scanners.
 .IP
-.B \-Ca
+.B \-Ca, \-\-align
 ("align") instructs flex to trade off larger tables in the
 generated scanner for faster performance because the elements of
-the tables are better aligned for memory access and computation.  On some
+the tables are better aligned for memory access and computation.
+On some
 RISC architectures, fetching and manipulating longwords is more efficient
-than with smaller-sized units such as shortwords.  This option can
+than with smaller-sized units such as shortwords.
+This option can
 double the size of the tables used by your scanner.
 .IP
-.B \-Ce
+.B \-Ce, \-\-ecs
 directs
 .I flex
 to construct
@@ -2450,7 +2579,8 @@ appearance of digits in the
 .I flex
 input is in the character class
 "[0-9]" then the digits '0', '1', ..., '9' will all be put
-in the same equivalence class).  Equivalence classes usually give
+in the same equivalence class).
+Equivalence classes usually give
 dramatic reductions in the final table/object file sizes (typically
 a factor of 2-5) and are pretty cheap performance-wise (one array
 look-up per character scanned).
@@ -2465,28 +2595,31 @@ tables by taking advantages of similar transition functions for
 different states.
 .IP
 .B \-CF
-specifies that the alternate fast scanner representation (described
+specifies that the alternative fast scanner representation (described
 above under the
 .B \-F
 flag)
-should be used.  This option cannot be used with
+should be used.
+This option cannot be used with
 .B \-+.
 .IP
-.B \-Cm
+.B \-Cm, \-\-meta-ecs
 directs
 .I flex
 to construct
 .I meta-equivalence classes,
 which are sets of equivalence classes (or characters, if equivalence
-classes are not being used) that are commonly used together.  Meta-equivalence
+classes are not being used) that are commonly used together.
+Meta-equivalence
 classes are often a big win when using compressed tables, but they
 have a moderate performance impact (one or two "if" tests and one
 array look-up per character scanned).
 .IP
-.B \-Cr
+.B \-Cr, \-\-read
 causes the generated scanner to
 .I bypass
-use of the standard I/O library (stdio) for input.  Instead of calling
+use of the standard I/O library (stdio) for input.
+Instead of calling
 .B fread()
 or
 .B getc(),
@@ -2521,7 +2654,8 @@ or
 and
 .B \-Cm
 do not make sense together - there is no opportunity for meta-equivalence
-classes if the table is not being compressed.  Otherwise the options
+classes if the table is not being compressed.
+Otherwise the options
 may be freely mixed, and are cumulative.
 .IP
 The default setting is
@@ -2529,8 +2663,9 @@ The default setting is
 which specifies that
 .I flex
 should generate equivalence classes
-and meta-equivalence classes.  This setting provides the highest
-degree of table compression.  You can trade off
+and meta-equivalence classes.
+This setting provides the highest degree of table compression.
+You can trade off
 faster-executing scanners at the cost of larger tables with
 the following generally being true:
 .nf
@@ -2555,7 +2690,7 @@ compression.
 is often a good compromise between speed and size for production
 scanners.
 .TP
-.B \-ooutput
+.B \-ooutput, \-\-outputfile=FILE
 directs flex to write the scanner to the file
 .B output
 instead of
@@ -2573,7 +2708,7 @@ directives (see the
 option above) refer to the file
 .B output.
 .TP
-.B \-Pprefix
+.B \-Pprefix, \-\-prefix=STRING
 changes the default
 .I "yy"
 prefix used by
@@ -2621,8 +2756,8 @@ have the modified name.
 .IP
 This option lets you easily link together multiple
 .I flex
-programs into the same executable.  Note, though, that using this
-option also renames
+programs into the same executable.
+Note, though, that using this option also renames
 .B yywrap(),
 so you now
 .I must
@@ -2634,12 +2769,54 @@ as linking with
 .B \-ll
 no longer provides one for you by default.
 .TP
-.B \-Sskeleton_file
+.B \-Sskeleton_file, \-\-skel=FILE
 overrides the default skeleton file from which
 .I flex
-constructs its scanners.  You'll never need this option unless you are doing
+constructs its scanners.
+You'll never need this option unless you are doing
 .I flex
 maintenance or development.
+.TP
+.B \-X, \-\-posix\-compat
+maximal compatibility with POSIX lex.
+.TP
+.B \-\-yylineno
+track line count in yylineno.
+.TP
+.B \-\-yyclass=NAME
+name of C++ class.
+.TP
+.B \-\-header\-file=FILE
+create a C header file in addition to the scanner.
+.TP
+.B \-\-tables\-file[=FILE]
+write tables to FILE.
+.TP
+.B \\-Dmacro[=defn]
+#define macro defn (default defn is '1').
+.TP
+.B \-R,  \-\-reentrant
+generate a reentrant C scanner
+.TP
+.B \-\-bison\-bridge
+scanner for bison pure parser.
+.TP
+.B \-\-bison\-locations
+include yylloc support.
+.TP
+.B \-\-stdinit
+initialize yyin/yyout to stdin/stdout.
+.TP
+.B \-\-noansi\-definitions old\-style function definitions.
+.TP
+.B \-\-noansi\-prototypes
+empty parameter list in prototypes.
+.TP
+.B \-\-nounistd
+do not include <unistd.h>.
+.TP
+.B \-\-noFUNCTION
+do not generate a particular FUNCTION.
 .PP
 .I flex
 also provides a mechanism for controlling options within the
@@ -2695,11 +2872,13 @@ provide features otherwise not available:
 .TP
 .B always-interactive
 instructs flex to generate a scanner which always considers its input
-"interactive".  Normally, on each new input file the scanner calls
+"interactive".
+Normally, on each new input file the scanner calls
 .B isatty()
 in an attempt to determine whether
 the scanner's input source is interactive and thus should be read a
-character at a time.  When this option is used, however, then no
+character at a time.
+When this option is used, however, then no
 such call is made.
 .TP
 .B main
@@ -2769,7 +2948,8 @@ scans your rule actions to determine whether you use the
 .B REJECT
 or
 .B yymore()
-features.  The
+features.
+The
 .B reject
 and
 .B yymore
@@ -2805,7 +2985,8 @@ Finally,
 .fi
 only applies when generating a C++ scanner (
 .B \-+
-option).  It informs
+option).
+It informs
 .I flex
 that you have derived
 .B foo
@@ -2825,8 +3006,8 @@ if called.
 See Generating C++ Scanners, below, for additional information.
 .PP
 A number of options are available for lint purists who want to suppress
-the appearance of unneeded routines in the generated scanner.  Each of the
-following, if unset
+the appearance of unneeded routines in the generated scanner.
+Each of the following, if unset
 (e.g.,
 .B %option nounput
 ), results in the corresponding routine not appearing in
@@ -2845,13 +3026,14 @@ and friends won't appear anyway unless you use
 .SH PERFORMANCE CONSIDERATIONS
 The main design goal of
 .I flex
-is that it generate high-performance scanners.  It has been optimized
-for dealing well with large sets of rules.  Aside from the effects on
-scanner speed of the table compression
+is that it generate high-performance scanners.
+It has been optimized
+for dealing well with large sets of rules.
+Aside from the effects on scanner speed of the table compression
 .B \-C
 options outlined above,
-there are a number of options/actions which degrade performance.  These
-are, from most expensive to least:
+there are a number of options/actions which degrade performance.
+These are, from most expensive to least:
 .nf
 
     REJECT
@@ -2868,7 +3050,8 @@ are, from most expensive to least:
 
 .fi
 with the first three all being quite expensive and the last two
-being quite cheap.  Note also that
+being quite cheap.
+Note also that
 .B unput()
 is implemented as a routine call that potentially does quite a bit of
 work, while
@@ -2882,12 +3065,13 @@ should be avoided at all costs when performance is important.
 It is a particularly expensive option.
 .PP
 Getting rid of backing up is messy and often may be an enormous
-amount of work for a complicated scanner.  In principal, one begins
-by using the
+amount of work for a complicated scanner.
+In principal, one begins by using the
 .B \-b
 flag to generate a
 .I lex.backup
-file.  For example, on the input
+file.
+For example, on the input
 .nf
 
     %%
@@ -2922,18 +3106,21 @@ the file looks like:
 The first few lines tell us that there's a scanner state in
 which it can make a transition on an 'o' but not on any other
 character, and that in that state the currently scanned text does not match
-any rule.  The state occurs when trying to match the rules found
+any rule.
+The state occurs when trying to match the rules found
 at lines 2 and 3 in the input file.
 If the scanner is in that state and then reads
 something other than an 'o', it will have to back up to find
-a rule which is matched.  With
-a bit of headscratching one can see that this must be the
-state it's in when it has seen "fo".  When this has happened,
+a rule which is matched.
+With a bit of headscratching one can see that this must be the
+state it's in when it has seen "fo".
+When this has happened,
 if anything other than another 'o' is seen, the scanner will
 have to back up to simply match the 'f' (by the default rule).
 .PP
 The comment regarding State #8 indicates there's a problem
-when "foob" has been scanned.  Indeed, on any character other
+when "foob" has been scanned.
+Indeed, on any character other
 than an 'a', the scanner will have to back up to accept "foo".
 Similarly, the comment for State #9 concerns when "fooba" has
 been scanned and an 'r' does not follow.
@@ -2977,23 +3164,27 @@ This is usually the best solution when appropriate.
 .PP
 Backing up messages tend to cascade.
 With a complicated set of rules it's not uncommon to get hundreds
-of messages.  If one can decipher them, though, it often
+of messages.
+If one can decipher them, though, it often
 only takes a dozen or so rules to eliminate the backing up (though
 it's easy to make a mistake and have an error rule accidentally match
-a valid token.  A possible future
+a valid token.
+A possible future
 .I flex
 feature will be to automatically add rules to eliminate backing up).
 .PP
 It's important to keep in mind that you gain the benefits of eliminating
 backing up only if you eliminate
 .I every
-instance of backing up.  Leaving just one means you gain nothing.
+instance of backing up.
+Leaving just one means you gain nothing.
 .PP
 .I Variable
 trailing context (where both the leading and trailing parts do not have
 a fixed length) entails almost the same performance loss as
 .B REJECT
-(i.e., substantial).  So when possible a rule like:
+(i.e., substantial).
+So when possible a rule like:
 .nf
 
     %%
@@ -3029,7 +3220,8 @@ characters takes place in the (short) inner scanning loop, and
 does not often have to go through the additional work of setting up
 the scanning environment (e.g.,
 .B yytext)
-for the action.  Recall the scanner for C comments:
+for the action.
+Recall the scanner for C comments:
 .nf
 
     %x comment
@@ -3062,7 +3254,8 @@ This could be sped up by writing it as:
 .fi
 Now instead of each newline requiring the processing of another
 action, recognizing the newlines is "distributed" over the other rules
-to keep the matched text as long as possible.  Note that
+to keep the matched text as long as possible.
+Note that
 .I adding
 rules does
 .I not
@@ -3074,7 +3267,8 @@ regard to operators such as '*' and '|'.
 A final example in speeding up a scanner: suppose you want to scan
 through a file containing identifiers and keywords, one per line
 and with no other extraneous characters, and recognize all the
-keywords.  A natural first approach is:
+keywords.
+A natural first approach is:
 .nf
 
     %%
@@ -3122,16 +3316,19 @@ tokens:
 
 .fi
 One has to be careful here, as we have now reintroduced backing up
-into the scanner.  In particular, while
+into the scanner.
+In particular, while
 .I we
 know that there will never be any characters in the input stream
 other than letters or newlines,
 .I flex
 can't figure this out, and it will plan for possibly needing to back up
 when it has scanned a token like "auto" and then the next character
-is something other than a newline or a letter.  Previously it would
+is something other than a newline or a letter.
+Previously it would
 then just match the "auto" rule and be done, but now it has no "auto"
-rule, only an "auto\\n" rule.  To eliminate the possibility of backing up,
+rule, only an "auto\\n" rule.
+To eliminate the possibility of backing up,
 we could either duplicate all rules but without final newlines, or,
 since we never expect to encounter such an input and therefore don't
 how it's classified, we can introduce one more catch-all rule, this
@@ -3169,20 +3366,22 @@ Another final note regarding performance: as mentioned above in the section
 How the Input is Matched, dynamically resizing
 .B yytext
 to accommodate huge tokens is a slow process because it presently requires that
-the (huge) token be rescanned from the beginning.  Thus if performance is
+the (huge) token be rescanned from the beginning.
+Thus if performance is
 vital, you should attempt to match "large" quantities of text but not
 "huge" quantities, where the cutoff between the two is at about 8K
 characters/token.
 .SH GENERATING C++ SCANNERS
 .I flex
-provides two different ways to generate scanners for use with C++.  The
-first way is to simply compile a scanner generated by
+provides two different ways to generate scanners for use with C++.
+The first way is to simply compile a scanner generated by
 .I flex
-using a C++ compiler instead of a C compiler.  You should not encounter
+using a C++ compiler instead of a C compiler.
+You should not encounter
 any compilations errors (please report any you find to the email address
-given in the Author section below).  You can then use C++ code in your
-rule actions instead of C code.  Note that the default input source for
-your scanner remains
+given in the Author section below).
+You can then use C++ code in your rule actions instead of C code.
+Note that the default input source for your scanner remains
 .I yyin,
 and default echoing is still done to
 .I yyout.
@@ -3211,7 +3410,8 @@ which defines the interface to two C++ classes.
 The first class,
 .B FlexLexer,
 provides an abstract base class defining the general scanner class
-interface.  It provides the following member functions:
+interface.
+It provides the following member functions:
 .TP
 .B const char* YYText()
 returns the text of the most recently matched token, the equivalent of
@@ -3234,8 +3434,8 @@ was not used.
 .B void set_debug( int flag )
 sets the debugging flag for the scanner, equivalent to assigning to
 .B yy_flex_debug
-(see the Options section above).  Note that you must build the scanner
-using
+(see the Options section above).
+Note that you must build the scanner using
 .B %option debug
 to include debugging information in it.
 .TP
@@ -3246,7 +3446,7 @@ Also provided are member functions equivalent to
 .B yy_switch_to_buffer(),
 .B yy_create_buffer()
 (though the first argument is an
-.B istream*
+.B std::istream*
 object pointer and not a
 .B FILE*),
 .B yy_flush_buffer(),
@@ -3254,7 +3454,7 @@ object pointer and not a
 and
 .B yyrestart()
 (again, the first argument is a
-.B istream*
+.B std::istream*
 object pointer).
 .PP
 The second class defined in
@@ -3266,11 +3466,11 @@ which is derived from
 It defines the following additional member functions:
 .TP
 .B
-yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 )
+yyFlexLexer( std::istream* arg_yyin = 0, std::ostream* arg_yyout = 0 )
 constructs a
 .B yyFlexLexer
-object using the given streams for input and output.  If not specified,
-the streams default to
+object using the given streams for input and output.
+If not specified, the streams default to
 .B cin
 and
 .B cout,
@@ -3280,7 +3480,8 @@ respectively.
 performs the same role is
 .B yylex()
 does for ordinary flex scanners: it scans the input stream, consuming
-tokens, until a rule's action returns a value.  If you derive a subclass
+tokens, until a rule's action returns a value.
+If you derive a subclass
 .B S
 from
 .B yyFlexLexer
@@ -3306,9 +3507,9 @@ that calls
 if called).
 .TP
 .B
-virtual void switch_streams(istream* new_in = 0,
+virtual void switch_streams(std::istream* new_in = 0,
 .B
-ostream* new_out = 0)
+std::ostream* new_out = 0)
 reassigns
 .B yyin
 to
@@ -3323,7 +3524,7 @@ to
 is reassigned.
 .TP
 .B
-int yylex( istream* new_in, ostream* new_out = 0 )
+int yylex( std::istream* new_in, std::ostream* new_out = 0 )
 first switches the input streams via
 .B switch_streams( new_in, new_out )
 and then returns the value of
@@ -3340,8 +3541,9 @@ reads up to
 .B max_size
 characters into
 .B buf
-and returns the number of characters read.  To indicate end-of-input,
-return 0 characters.  Note that "interactive" scanners (see the
+and returns the number of characters read.
+To indicate end-of-input, return 0 characters.
+Note that "interactive" scanners (see the
 .B \-B
 and
 .B \-I
@@ -3365,8 +3567,8 @@ the scanner's rules can match text with NUL's in them.
 .TP
 .B
 virtual void LexerError( const char* msg )
-reports a fatal error message.  The default version of this function
-writes the message to the stream
+reports a fatal error message.
+The default version of this function writes the message to the stream
 .B cerr
 and exits.
 .PP
@@ -3374,8 +3576,9 @@ Note that a
 .B yyFlexLexer
 object contains its
 .I entire
-scanning state.  Thus you can use such objects to create reentrant
-scanners.  You can instantiate multiple instances of the same
+scanning state.
+Thus you can use such objects to create reentrant scanners.
+You can instantiate multiple instances of the same
 .B yyFlexLexer
 class, and you can also combine multiple C++ scanner classes together
 in the same program using the
@@ -3488,7 +3691,8 @@ is a rewrite of the AT&T Unix
 tool (the two implementations do not share any code, though),
 with some extensions and incompatibilities, both of which
 are of concern to those who wish to write scanners acceptable
-to either implementation.  Flex is fully compliant with the POSIX
+to either implementation.
+Flex is fully compliant with the POSIX
 .I lex
 specification, except that when using
 .B %pointer
@@ -3506,7 +3710,8 @@ between flex, AT&T lex, and the POSIX specification.
 option turns on maximum compatibility with the original AT&T
 .I lex
 implementation, at the cost of a major loss in the generated scanner's
-performance.  We note below which incompatibilities can be overcome
+performance.
+We note below which incompatibilities can be overcome
 using the
 .B \-l
 option.
@@ -3536,11 +3741,13 @@ is not part of the POSIX specification.
 The
 .B input()
 routine is not redefinable, though it may be called to read characters
-following whatever has been matched by a rule.  If
+following whatever has been matched by a rule.
+If
 .B input()
 encounters an end-of-file the normal
 .B yywrap()
-processing is done.  A ``real'' end-of-file is returned by
+processing is done.
+A ``real'' end-of-file is returned by
 .B input()
 as
 .I EOF.
@@ -3560,12 +3767,14 @@ scanner's input other than by making an initial assignment to
 .IP -
 The
 .B unput()
-routine is not redefinable.  This restriction is in accordance with POSIX.
+routine is not redefinable.
+This restriction is in accordance with POSIX.
 .IP -
 .I flex
 scanners are not as reentrant as
 .I lex
-scanners.  In particular, if you have an interactive scanner and
+scanners.
+In particular, if you have an interactive scanner and
 an interrupt handler which long-jumps out of the scanner, and
 the scanner is subsequently called again, you may get the following
 message:
@@ -3586,7 +3795,8 @@ isn't a problem with an interactive scanner.
 Also note that flex C++ scanner classes
 .I are
 reentrant, so if using C++ is an option for you, you should use
-them instead.  See "Generating C++ Scanners" above for details.
+them instead.
+See "Generating C++ Scanners" above for details.
 .IP -
 .B output()
 is not supported.
@@ -3619,7 +3829,8 @@ With lex, the following:
 will not match the string "foo" because when the macro
 is expanded the rule is equivalent to "foo[A-Z][A-Z0-9]*?"
 and the precedence is such that the '?' is associated with
-"[A-Z0-9]*".  With
+"[A-Z0-9]*".
+With
 .I flex,
 the rule will be expanded to
 "foo([A-Z][A-Z0-9]*)?" and so the string "foo" will match.
@@ -3631,7 +3842,8 @@ or ends with
 then it is
 .I not
 expanded with parentheses, to allow these operators to appear in
-definitions without losing their special meanings.  But the
+definitions without losing their special meanings.
+But the
 .B <s>, /,
 and
 .B <<EOF>>
@@ -3664,7 +3876,8 @@ does not support this feature.
 The
 .I lex
 .B %r
-(generate a Ratfor scanner) option is not supported.  It is not part
+(generate a Ratfor scanner) option is not supported.
+It is not part
 of the POSIX specification.
 .IP -
 After a call to
@@ -3675,7 +3888,8 @@ was built using
 .B %array.
 This is not the case with
 .I lex
-or the POSIX specification.  The
+or the POSIX specification.
+The
 .B \-l
 option does away with this incompatibility.
 .IP -
@@ -3687,8 +3901,8 @@ interprets "abc{1,3}" as "match one, two, or
 three occurrences of 'abc'", whereas
 .I flex
 interprets it as "match 'ab'
-followed by one, two, or three occurrences of 'c'".  The latter is
-in agreement with the POSIX specification.
+followed by one, two, or three occurrences of 'c'".
+The latter is in agreement with the POSIX specification.
 .IP -
 The precedence of the
 .B ^
@@ -3698,7 +3912,8 @@ interprets "^foo|bar" as "match either 'foo' at the beginning of a line,
 or 'bar' anywhere", whereas
 .I flex
 interprets it as "match either 'foo' or 'bar' if they come at the beginning
-of a line".  The latter is in agreement with the POSIX specification.
+of a line".
+The latter is in agreement with the POSIX specification.
 .IP -
 The special table-size declarations such as
 .B %a
@@ -3773,14 +3988,15 @@ is (rather surprisingly) truncated to
 
 .fi
 .I flex
-does not truncate the action.  Actions that are not enclosed in
+does not truncate the action.
+Actions that are not enclosed in
 braces are simply terminated at the end of the line.
 .SH DIAGNOSTICS
 .I warning, rule cannot be matched
 indicates that the given rule
 cannot be matched because it follows other rules that will
-always match the same text as it.  For
-example, in the following "foo" cannot be matched because it comes after
+always match the same text as it.
+For example, in the following "foo" cannot be matched because it comes after
 an identifier "catch-all" rule:
 .nf
 
@@ -3798,15 +4014,16 @@ in a scanner suppresses this warning.
 option given but default rule can be matched
 means that it is possible (perhaps only in a particular start condition)
 that the default rule (match any single character) is the only one
-that will match a particular input.  Since
+that will match a particular input.
+Since
 .B \-s
 was given, presumably this is not intended.
 .PP
 .I reject_used_but_not_detected undefined
 or
 .I yymore_used_but_not_detected undefined -
-These errors can occur at compile time.  They indicate that the
-scanner uses
+These errors can occur at compile time.
+They indicate that the scanner uses
 .B REJECT
 or
 .B yymore()
@@ -3816,7 +4033,8 @@ failed to notice the fact, meaning that
 .I flex
 scanned the first two sections looking for occurrences of these actions
 and failed to find any, but somehow you snuck some in (via a #include
-file, for example).  Use
+file, for example).
+Use
 .B %option reject
 or
 .B %option yymore
@@ -3826,14 +4044,16 @@ to indicate to flex that you really do use these features.
 a scanner compiled with
 .B \-s
 has encountered an input string which wasn't matched by
-any of its rules.  This error can also occur due to internal problems.
+any of its rules.
+This error can also occur due to internal problems.
 .PP
 .I token too large, exceeds YYLMAX -
 your scanner uses
 .B %array
 and one of its rules matched a string longer than the
 .B YYLMAX
-constant (8K bytes by default).  You can increase the value by
+constant (8K bytes by default).
+You can increase the value by
 #define'ing
 .B YYLMAX
 in the definitions section of your
@@ -3849,7 +4069,8 @@ because you used the
 .B \-Cf
 or
 .B \-CF
-table compression options.  See the discussion of the
+table compression options.
+See the discussion of the
 .B \-7
 flag for details.
 .PP
@@ -3865,15 +4086,16 @@ present it does not.
 .I
 input buffer overflow, can't enlarge buffer because scanner uses REJECT -
 the scanner was working on matching an extremely large token and needed
-to expand the input buffer.  This doesn't work with scanners that use
+to expand the input buffer.
+This doesn't work with scanners that use
 .B
 REJECT.
 .PP
 .I
 fatal flex scanner internal error--end of buffer missed -
 This can occur in a scanner which is reentered after a long-jump
-has jumped out (or over) the scanner's activation frame.  Before
-reentering the scanner, use:
+has jumped out (or over) the scanner's activation frame.
+Before reentering the scanner, use:
 .nf
 
     yyrestart( yyin );
@@ -3905,8 +4127,8 @@ and its derived class,
 .B yyFlexLexer.
 .TP
 .I flex.skl
-skeleton scanner.  This file is only used when building flex, not when
-flex executes.
+skeleton scanner.
+This file is only used when building flex, not when flex executes.
 .TP
 .I lex.backup
 backing-up information for
@@ -3917,11 +4139,12 @@ on some systems).
 .SH DEFICIENCIES / BUGS
 Some trailing context
 patterns cannot be properly matched and generate
-warning messages ("dangerous trailing context").  These are
-patterns where the ending of the
+warning messages ("dangerous trailing context").
+These are patterns where the ending of the
 first part of the rule matches the beginning of the second
 part, such as "zx*/xy*", where the 'x*' matches the 'x' at
-the beginning of the trailing context.  (Note that the POSIX draft
+the beginning of the trailing context.
+(Note that the POSIX draft
 states that the text matched by such patterns is undefined.)
 .PP
 For some trailing context rules, parts which are actually fixed-length are
@@ -3933,7 +4156,8 @@ Combining trailing context with the special '|' action can result in
 .I fixed
 trailing context being turned into the more expensive
 .I variable
-trailing context.  For example, in the following:
+trailing context.
+For example, in the following:
 .nf
 
     %%
@@ -3962,14 +4186,16 @@ calls to <stdio.h> routines, such as, for example,
 .B getchar(),
 with
 .I flex
-rules and expect it to work.  Call
+rules and expect it to work.
+Call
 .B input()
 instead.
 .PP
 The total table entries listed by the
 .B \-v
 flag excludes the number of table entries needed to determine
-what rule has been matched.  The number of entries is equal
+what rule has been matched.
+The number of entries is equal
 to the number of DFA states if the scanner does not use
 .B REJECT,
 and somewhat greater than the number of states if it does.
@@ -3989,21 +4215,26 @@ lex(1), yacc(1), sed(1), awk(1).
 .PP
 John Levine, Tony Mason, and Doug Brown,
 .I Lex & Yacc,
-O'Reilly and Associates.  Be sure to get the 2nd edition.
+O'Reilly and Associates.
+Be sure to get the 2nd edition.
 .PP
 M. E. Lesk and E. Schmidt,
 .I LEX \- Lexical Analyzer Generator
 .PP
 Alfred Aho, Ravi Sethi and Jeffrey Ullman,
 .I Compilers: Principles, Techniques and Tools,
-Addison-Wesley (1986).  Describes the pattern-matching techniques used by
+Addison-Wesley (1986).
+Describes the pattern-matching techniques used by
 .I flex
 (deterministic finite automata).
 .SH AUTHOR
 Vern Paxson, with the help of many ideas and much inspiration from
-Van Jacobson.  Original version by Jef Poskanzer.  The fast table
+Van Jacobson.
+Original version by Jef Poskanzer.
+The fast table
 representation is a partial implementation of a design done by Van
-Jacobson.  The implementation was done by Kevin Gong and Vern Paxson.
+Jacobson.
+The implementation was done by Kevin Gong and Vern Paxson.
 .PP
 Thanks to the many
 .I flex
@@ -4016,7 +4247,7 @@ Karl Berry, Peter A. Bigot, Simon Blanchard,
 Keith Bostic, Frederic Brehm, Ian Brockbank, Kin Cho, Nick Christopher,
 Brian Clapper, J.T. Conklin,
 Jason Coughlin, Bill Cox, Nick Cropper, Dave Curtis, Scott David
-Daniels, Chris G. Demetriou, Theo Deraadt,
+Daniels, Chris G. Demetriou, Theo de Raadt,
 Mike Donahue, Chuck Doucette, Tom Epperly, Leo Eskin,
 Chris Faylor, Chris Flatters, Jon Forrest, Jeffrey Friedl,
 Joe Gayda, Kaveh R. Ghazi, Wolfgang Glunz,
@@ -4061,7 +4292,7 @@ Epperly for C++ class support; to Ove Ewerlid for support of NUL's; and to
 Eric Hughes for support of multiple buffers.
 .PP
 This work was primarily done when I was with the Real Time Systems Group
-at the Lawrence Berkeley Laboratory in Berkeley, CA.  Many thanks to all there
-for the support I received.
+at the Lawrence Berkeley Laboratory in Berkeley, CA.
+Many thanks to all there for the support I received.
 .PP
 Send comments to vern@ee.lbl.gov.
diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile
index b43d803..d7e430f 100644
--- a/usr.bin/lex/lib/Makefile
+++ b/usr.bin/lex/lib/Makefile
@@ -2,12 +2,12 @@
 
 .include <bsd.own.mk>
 
+.PATH:	${.CURDIR}/../../../contrib/flex
+
 LIB=    ln
 SRCS=   libmain.c libyywrap.c
 NO_PIC=
 
-WARNS?=	2
-
 .if ${MK_INSTALLLIB} != "no"
 LINKS=  ${LIBDIR}/libln.a ${LIBDIR}/libl.a
 LINKS+=	${LIBDIR}/libln.a ${LIBDIR}/libfl.a
diff --git a/usr.bin/lex/lib/libmain.c b/usr.bin/lex/lib/libmain.c
deleted file mode 100644
index 426eb98..0000000
--- a/usr.bin/lex/lib/libmain.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* libmain - flex run-time support library "main" function */
-
-/* $Header: /home/daffy/u0/vern/flex/RCS/libmain.c,v 1.4 95/09/27 12:47:55 vern Exp $
- * $FreeBSD$ */
-
-extern int yylex();
-
-int main( argc, argv )
-int argc;
-char *argv[];
-	{
-	while ( yylex() != 0 )
-		;
-
-	return 0;
-	}
diff --git a/usr.bin/lex/lib/libyywrap.c b/usr.bin/lex/lib/libyywrap.c
deleted file mode 100644
index 75c669c..0000000
--- a/usr.bin/lex/lib/libyywrap.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* libyywrap - flex run-time support library "yywrap" function */
-
-/* $Header: /home/daffy/u0/vern/flex/RCS/libyywrap.c,v 1.1 93/10/02 15:23:09 vern Exp $
- * $FreeBSD$ */
-
-int yywrap()
-	{
-	return 1;
-	}
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c
deleted file mode 100644
index a037ce9..0000000
--- a/usr.bin/lex/main.c
+++ /dev/null
@@ -1,1179 +0,0 @@
-/* flex - tool to generate fast lexical analyzers */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Vern Paxson.
- *
- * The United States Government has rights in this work pursuant
- * to contract no. DE-AC03-76SF00098 between the United States
- * Department of Energy and the University of California.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1990 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-/* $Header: /home/daffy/u0/vern/flex/RCS/main.c,v 2.64 96/05/25 20:42:42 vern Exp $ */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-
-#include "flexdef.h"
-#include "version.h"
-
-static char flex_version[] = FLEX_VERSION;
-
-
-/* declare functions that have forward references */
-
-void flexinit PROTO((int, char**));
-void readin PROTO((void));
-void set_up_initial_allocations PROTO((void));
-
-#ifdef NEED_ARGV_FIXUP
-extern void argv_fixup PROTO((int *, char ***));
-#endif
-
-
-/* these globals are all defined and commented in flexdef.h */
-int printstats, syntaxerror, eofseen, ddebug, trace, nowarn, spprdflt;
-int interactive, caseins, lex_compat, do_yylineno, useecs, fulltbl, usemecs;
-int fullspd, gen_line_dirs, performance_report, backing_up_report;
-int C_plus_plus, long_align, use_read, yytext_is_array, do_yywrap, csize;
-int yymore_used, reject, real_reject, continued_action, in_rule;
-int yymore_really_used, reject_really_used;
-int datapos, dataline, linenum, out_linenum;
-FILE *skelfile = NULL;
-int skel_ind = 0;
-char *action_array;
-int action_size, defs1_offset, prolog_offset, action_offset, action_index;
-char *infilename = NULL, *outfilename = NULL;
-int did_outfilename;
-char *prefix, *yyclass;
-int do_stdinit, use_stdout;
-int onestate[ONE_STACK_SIZE], onesym[ONE_STACK_SIZE];
-int onenext[ONE_STACK_SIZE], onedef[ONE_STACK_SIZE], onesp;
-int current_mns, current_max_rules;
-int num_rules, num_eof_rules, default_rule, lastnfa;
-int *firstst, *lastst, *finalst, *transchar, *trans1, *trans2;
-int *accptnum, *assoc_rule, *state_type;
-int *rule_type, *rule_linenum, *rule_useful;
-int current_state_type;
-int variable_trailing_context_rules;
-int numtemps, numprots, protprev[MSP], protnext[MSP], prottbl[MSP];
-int protcomst[MSP], firstprot, lastprot, protsave[PROT_SAVE_SIZE];
-int numecs, nextecm[CSIZE + 1], ecgroup[CSIZE + 1], nummecs, tecfwd[CSIZE + 1];
-int tecbck[CSIZE + 1];
-int lastsc, *scset, *scbol, *scxclu, *sceof;
-int current_max_scs;
-char **scname;
-int current_max_dfa_size, current_max_xpairs;
-int current_max_template_xpairs, current_max_dfas;
-int lastdfa, *nxt, *chk, *tnxt;
-int *base, *def, *nultrans, NUL_ec, tblend, firstfree, **dss, *dfasiz;
-union dfaacc_union *dfaacc;
-int *accsiz, *dhash, numas;
-int numsnpairs, jambase, jamstate;
-int lastccl, *cclmap, *ccllen, *cclng, cclreuse;
-int current_maxccls, current_max_ccl_tbl_size;
-Char *ccltbl;
-char nmstr[MAXLINE];
-int sectnum, nummt, hshcol, dfaeql, numeps, eps2, num_reallocs;
-int tmpuses, totnst, peakpairs, numuniq, numdup, hshsave;
-int num_backing_up, bol_needed;
-FILE *backing_up_file;
-int end_of_buffer_state;
-char **input_files;
-int num_input_files;
-
-/* Make sure program_name is initialized so we don't crash if writing
- * out an error message before getting the program name from argv[0].
- */
-char *program_name = "flex";
-
-#ifndef SHORT_FILE_NAMES
-static char *outfile_template = "lex.%s.%s";
-static char *backing_name = "lex.backup";
-#else
-static char *outfile_template = "lex%s.%s";
-static char *backing_name = "lex.bck";
-#endif
-
-#ifdef THINK_C
-#include <console.h>
-#endif
-
-#ifdef MS_DOS
-extern unsigned _stklen = 16384;
-#endif
-
-static char outfile_path[MAXLINE];
-static int outfile_created = 0;
-static char *skelname = NULL;
-
-
-int main( argc, argv )
-int argc;
-char **argv;
-	{
-	int i;
-
-#ifdef THINK_C
-	argc = ccommand( &argv );
-#endif
-#ifdef NEED_ARGV_FIXUP
-	argv_fixup( &argc, &argv );
-#endif
-
-	flexinit( argc, argv );
-
-	readin();
-
-	ntod();
-
-	for ( i = 1; i <= num_rules; ++i )
-		if ( ! rule_useful[i] && i != default_rule )
-			line_warning( _( "rule cannot be matched" ),
-					rule_linenum[i] );
-
-	if ( spprdflt && ! reject && rule_useful[default_rule] )
-		line_warning(
-			_( "-s option given but default rule can be matched" ),
-			rule_linenum[default_rule] );
-
-	/* Generate the C state transition tables from the DFA. */
-	make_tables();
-
-	/* Note, flexend does not return.  It exits with its argument
-	 * as status.
-	 */
-	flexend( 0 );
-
-	return 0;	/* keep compilers/lint happy */
-	}
-
-
-/* check_options - check user-specified options */
-
-void check_options()
-	{
-	int i;
-
-	if ( lex_compat )
-		{
-		if ( C_plus_plus )
-			flexerror( _( "Can't use -+ with -l option" ) );
-
-		if ( fulltbl || fullspd )
-			flexerror( _( "Can't use -f or -F with -l option" ) );
-
-		/* Don't rely on detecting use of yymore() and REJECT,
-		 * just assume they'll be used.
-		 */
-		yymore_really_used = reject_really_used = true;
-
-		yytext_is_array = true;
-		do_yylineno = true;
-		use_read = false;
-		}
-
-	if ( do_yylineno )
-		/* This should really be "maintain_backup_tables = true" */
-		reject_really_used = true;
-
-	if ( csize == unspecified )
-		{
-		if ( (fulltbl || fullspd) && ! useecs )
-			csize = DEFAULT_CSIZE;
-		else
-			csize = CSIZE;
-		}
-
-	if ( interactive == unspecified )
-		{
-		if ( fulltbl || fullspd )
-			interactive = false;
-		else
-			interactive = true;
-		}
-
-	if ( fulltbl || fullspd )
-		{
-		if ( usemecs )
-			flexerror(
-			_( "-Cf/-CF and -Cm don't make sense together" ) );
-
-		if ( interactive )
-			flexerror( _( "-Cf/-CF and -I are incompatible" ) );
-
-		if ( lex_compat )
-			flexerror(
-		_( "-Cf/-CF are incompatible with lex-compatibility mode" ) );
-
-		if ( do_yylineno )
-			flexerror(
-			_( "-Cf/-CF and %option yylineno are incompatible" ) );
-
-		if ( fulltbl && fullspd )
-			flexerror( _( "-Cf and -CF are mutually exclusive" ) );
-		}
-
-	if ( C_plus_plus && fullspd )
-		flexerror( _( "Can't use -+ with -CF option" ) );
-
-	if ( C_plus_plus && yytext_is_array )
-		{
-		warn( _( "%array incompatible with -+ option" ) );
-		yytext_is_array = false;
-		}
-
-	if ( useecs )
-		{ /* Set up doubly-linked equivalence classes. */
-
-		/* We loop all the way up to csize, since ecgroup[csize] is
-		 * the position used for NUL characters.
-		 */
-		ecgroup[1] = NIL;
-
-		for ( i = 2; i <= csize; ++i )
-			{
-			ecgroup[i] = i - 1;
-			nextecm[i - 1] = i;
-			}
-
-		nextecm[csize] = NIL;
-		}
-
-	else
-		{
-		/* Put everything in its own equivalence class. */
-		for ( i = 1; i <= csize; ++i )
-			{
-			ecgroup[i] = i;
-			nextecm[i] = BAD_SUBSCRIPT;	/* to catch errors */
-			}
-		}
-
-	if ( ! use_stdout )
-		{
-		FILE *prev_stdout;
-
-		if ( ! did_outfilename )
-			{
-			char *suffix;
-
-			if ( C_plus_plus )
-				suffix = "cc";
-			else
-				suffix = "c";
-
-			sprintf( outfile_path, outfile_template,
-				prefix, suffix );
-
-			outfilename = outfile_path;
-			}
-
-		prev_stdout = freopen( outfilename, "w", stdout );
-
-		if ( prev_stdout == NULL )
-			lerrsf( _( "could not create %s" ), outfilename );
-
-		outfile_created = 1;
-		}
-
-	if ( skelname && (skelfile = fopen( skelname, "r" )) == NULL )
-		lerrsf( _( "can't open skeleton file %s" ), skelname );
-
-	if ( strcmp( prefix, "yy" ) )
-		{
-#define GEN_PREFIX(name) out_str3( "#define yy%s %s%s\n", name, prefix, name )
-		if ( C_plus_plus )
-			GEN_PREFIX( "FlexLexer" );
-		else
-			{
-			GEN_PREFIX( "_create_buffer" );
-			GEN_PREFIX( "_delete_buffer" );
-			GEN_PREFIX( "_scan_buffer" );
-			GEN_PREFIX( "_scan_string" );
-			GEN_PREFIX( "_scan_bytes" );
-			GEN_PREFIX( "_flex_debug" );
-			GEN_PREFIX( "_init_buffer" );
-			GEN_PREFIX( "_flush_buffer" );
-			GEN_PREFIX( "_load_buffer_state" );
-			GEN_PREFIX( "_switch_to_buffer" );
-			GEN_PREFIX( "in" );
-			GEN_PREFIX( "leng" );
-			GEN_PREFIX( "lex" );
-			GEN_PREFIX( "out" );
-			GEN_PREFIX( "restart" );
-			GEN_PREFIX( "text" );
-
-			if ( do_yylineno )
-				GEN_PREFIX( "lineno" );
-			}
-
-		if ( do_yywrap )
-			GEN_PREFIX( "wrap" );
-
-		outn( "" );
-		}
-
-	if ( did_outfilename )
-		line_directive_out( stdout, 0 );
-
-	skelout();
-	}
-
-
-/* flexend - terminate flex
- *
- * note
- *    This routine does not return.
- */
-
-void flexend( exit_status )
-int exit_status;
-
-	{
-	int tblsiz;
-	int unlink();
-
-	if ( skelfile != NULL )
-		{
-		if ( ferror( skelfile ) )
-			lerrsf( _( "input error reading skeleton file %s" ),
-				skelname );
-
-		else if ( fclose( skelfile ) )
-			lerrsf( _( "error closing skeleton file %s" ),
-				skelname );
-		}
-
-	if ( exit_status != 0 && outfile_created )
-		{
-		if ( ferror( stdout ) )
-			lerrsf( _( "error writing output file %s" ),
-				outfilename );
-
-		else if ( fclose( stdout ) )
-			lerrsf( _( "error closing output file %s" ),
-				outfilename );
-
-		else if ( unlink( outfilename ) )
-			lerrsf( _( "error deleting output file %s" ),
-				outfilename );
-		}
-
-	if ( backing_up_report && backing_up_file )
-		{
-		if ( num_backing_up == 0 )
-			fprintf( backing_up_file, _( "No backing up.\n" ) );
-		else if ( fullspd || fulltbl )
-			fprintf( backing_up_file,
-				_( "%d backing up (non-accepting) states.\n" ),
-				num_backing_up );
-		else
-			fprintf( backing_up_file,
-				_( "Compressed tables always back up.\n" ) );
-
-		if ( ferror( backing_up_file ) )
-			lerrsf( _( "error writing backup file %s" ),
-				backing_name );
-
-		else if ( fclose( backing_up_file ) )
-			lerrsf( _( "error closing backup file %s" ),
-				backing_name );
-		}
-
-	if ( printstats )
-		{
-		fprintf( stderr, _( "%s version %s usage statistics:\n" ),
-			program_name, flex_version );
-
-		fprintf( stderr, _( "  scanner options: -" ) );
-
-		if ( C_plus_plus )
-			putc( '+', stderr );
-		if ( backing_up_report )
-			putc( 'b', stderr );
-		if ( ddebug )
-			putc( 'd', stderr );
-		if ( caseins )
-			putc( 'i', stderr );
-		if ( lex_compat )
-			putc( 'l', stderr );
-		if ( performance_report > 0 )
-			putc( 'p', stderr );
-		if ( performance_report > 1 )
-			putc( 'p', stderr );
-		if ( spprdflt )
-			putc( 's', stderr );
-		if ( use_stdout )
-			putc( 't', stderr );
-		if ( printstats )
-			putc( 'v', stderr );	/* always true! */
-		if ( nowarn )
-			putc( 'w', stderr );
-		if ( interactive == false )
-			putc( 'B', stderr );
-		if ( interactive == true )
-			putc( 'I', stderr );
-		if ( ! gen_line_dirs )
-			putc( 'L', stderr );
-		if ( trace )
-			putc( 'T', stderr );
-
-		if ( csize == unspecified )
-			/* We encountered an error fairly early on, so csize
-			 * never got specified.  Define it now, to prevent
-			 * bogus table sizes being written out below.
-			 */
-			csize = 256;
-
-		if ( csize == 128 )
-			putc( '7', stderr );
-		else
-			putc( '8', stderr );
-
-		fprintf( stderr, " -C" );
-
-		if ( long_align )
-			putc( 'a', stderr );
-		if ( fulltbl )
-			putc( 'f', stderr );
-		if ( fullspd )
-			putc( 'F', stderr );
-		if ( useecs )
-			putc( 'e', stderr );
-		if ( usemecs )
-			putc( 'm', stderr );
-		if ( use_read )
-			putc( 'r', stderr );
-
-		if ( did_outfilename )
-			fprintf( stderr, " -o%s", outfilename );
-
-		if ( skelname )
-			fprintf( stderr, " -S%s", skelname );
-
-		if ( strcmp( prefix, "yy" ) )
-			fprintf( stderr, " -P%s", prefix );
-
-		putc( '\n', stderr );
-
-		fprintf( stderr, _( "  %d/%d NFA states\n" ),
-			lastnfa, current_mns );
-		fprintf( stderr, _( "  %d/%d DFA states (%d words)\n" ),
-			lastdfa, current_max_dfas, totnst );
-		fprintf( stderr, _( "  %d rules\n" ),
-		num_rules + num_eof_rules - 1 /* - 1 for def. rule */ );
-
-		if ( num_backing_up == 0 )
-			fprintf( stderr, _( "  No backing up\n" ) );
-		else if ( fullspd || fulltbl )
-			fprintf( stderr,
-			_( "  %d backing-up (non-accepting) states\n" ),
-				num_backing_up );
-		else
-			fprintf( stderr,
-				_( "  Compressed tables always back-up\n" ) );
-
-		if ( bol_needed )
-			fprintf( stderr,
-				_( "  Beginning-of-line patterns used\n" ) );
-
-		fprintf( stderr, _( "  %d/%d start conditions\n" ), lastsc,
-			current_max_scs );
-		fprintf( stderr,
-			_( "  %d epsilon states, %d double epsilon states\n" ),
-			numeps, eps2 );
-
-		if ( lastccl == 0 )
-			fprintf( stderr, _( "  no character classes\n" ) );
-		else
-			fprintf( stderr,
-_( "  %d/%d character classes needed %d/%d words of storage, %d reused\n" ),
-				lastccl, current_maxccls,
-				cclmap[lastccl] + ccllen[lastccl],
-				current_max_ccl_tbl_size, cclreuse );
-
-		fprintf( stderr, _( "  %d state/nextstate pairs created\n" ),
-			numsnpairs );
-		fprintf( stderr, _( "  %d/%d unique/duplicate transitions\n" ),
-			numuniq, numdup );
-
-		if ( fulltbl )
-			{
-			tblsiz = lastdfa * numecs;
-			fprintf( stderr, _( "  %d table entries\n" ), tblsiz );
-			}
-
-		else
-			{
-			tblsiz = 2 * (lastdfa + numtemps) + 2 * tblend;
-
-			fprintf( stderr,
-				_( "  %d/%d base-def entries created\n" ),
-				lastdfa + numtemps, current_max_dfas );
-			fprintf( stderr,
-			_( "  %d/%d (peak %d) nxt-chk entries created\n" ),
-				tblend, current_max_xpairs, peakpairs );
-			fprintf( stderr,
-		_( "  %d/%d (peak %d) template nxt-chk entries created\n" ),
-				numtemps * nummecs,
-				current_max_template_xpairs,
-				numtemps * numecs );
-			fprintf( stderr, _( "  %d empty table entries\n" ),
-				nummt );
-			fprintf( stderr, _( "  %d protos created\n" ),
-				numprots );
-			fprintf( stderr,
-				_( "  %d templates created, %d uses\n" ),
-				numtemps, tmpuses );
-			}
-
-		if ( useecs )
-			{
-			tblsiz = tblsiz + csize;
-			fprintf( stderr,
-				_( "  %d/%d equivalence classes created\n" ),
-				numecs, csize );
-			}
-
-		if ( usemecs )
-			{
-			tblsiz = tblsiz + numecs;
-			fprintf( stderr,
-			_( "  %d/%d meta-equivalence classes created\n" ),
-				nummecs, csize );
-			}
-
-		fprintf( stderr,
-		_( "  %d (%d saved) hash collisions, %d DFAs equal\n" ),
-			hshcol, hshsave, dfaeql );
-		fprintf( stderr, _( "  %d sets of reallocations needed\n" ),
-			num_reallocs );
-		fprintf( stderr, _( "  %d total table entries needed\n" ),
-			tblsiz );
-		}
-
-	exit( exit_status );
-	}
-
-
-/* flexinit - initialize flex */
-
-void flexinit( argc, argv )
-int argc;
-char **argv;
-	{
-	int i, sawcmpflag;
-	char *arg;
-
-	printstats = syntaxerror = trace = spprdflt = caseins = false;
-	lex_compat = C_plus_plus = backing_up_report = ddebug = fulltbl = false;
-	fullspd = long_align = nowarn = yymore_used = continued_action = false;
-	do_yylineno = yytext_is_array = in_rule = reject = do_stdinit = false;
-	yymore_really_used = reject_really_used = unspecified;
-	interactive = csize = unspecified;
-	do_yywrap = gen_line_dirs = usemecs = useecs = true;
-	performance_report = 0;
-	did_outfilename = 0;
-	prefix = "yy";
-	yyclass = 0;
-	use_read = use_stdout = false;
-
-	sawcmpflag = false;
-
-	/* Initialize dynamic array for holding the rule actions. */
-	action_size = 2048;	/* default size of action array in bytes */
-	action_array = allocate_character_array( action_size );
-	defs1_offset = prolog_offset = action_offset = action_index = 0;
-	action_array[0] = '\0';
-
-	program_name = argv[0];
-
-	if ( program_name[0] != '\0' &&
-	     program_name[strlen( program_name ) - 1] == '+' )
-		C_plus_plus = true;
-
-	/* read flags */
-	for ( --argc, ++argv; argc ; --argc, ++argv )
-		{
-		arg = argv[0];
-
-		if ( arg[0] != '-' || arg[1] == '\0' )
-			break;
-
-		if ( arg[1] == '-' )
-			{ /* --option */
-			if ( ! strcmp( arg, "--help" ) )
-				arg = "-h";
-
-			else if ( ! strcmp( arg, "--version" ) )
-				arg = "-V";
-
-			else if ( ! strcmp( arg, "--" ) )
-				{ /* end of options */
-				--argc;
-				++argv;
-				break;
-				}
-			}
-
-		for ( i = 1; arg[i] != '\0'; ++i )
-			switch ( arg[i] )
-				{
-				case '+':
-					C_plus_plus = true;
-					break;
-
-				case 'B':
-					interactive = false;
-					break;
-
-				case 'b':
-					backing_up_report = true;
-					break;
-
-				case 'c':
-					break;
-
-				case 'C':
-					if ( i != 1 )
-						flexerror(
-				_( "-C flag must be given separately" ) );
-
-					if ( ! sawcmpflag )
-						{
-						useecs = false;
-						usemecs = false;
-						fulltbl = false;
-						sawcmpflag = true;
-						}
-
-					for ( ++i; arg[i] != '\0'; ++i )
-						switch ( arg[i] )
-							{
-							case 'a':
-								long_align =
-									true;
-								break;
-
-							case 'e':
-								useecs = true;
-								break;
-
-							case 'F':
-								fullspd = true;
-								break;
-
-							case 'f':
-								fulltbl = true;
-								break;
-
-							case 'm':
-								usemecs = true;
-								break;
-
-							case 'r':
-								use_read = true;
-								break;
-
-							default:
-								lerrif(
-						_( "unknown -C option '%c'" ),
-								(int) arg[i] );
-								break;
-							}
-
-					goto get_next_arg;
-
-				case 'd':
-					ddebug = true;
-					break;
-
-				case 'f':
-					useecs = usemecs = false;
-					use_read = fulltbl = true;
-					break;
-
-				case 'F':
-					useecs = usemecs = false;
-					use_read = fullspd = true;
-					break;
-
-				case '?':
-				case 'h':
-					usage();
-					exit( 0 );
-
-				case 'I':
-					interactive = true;
-					break;
-
-				case 'i':
-					caseins = true;
-					break;
-
-				case 'l':
-					lex_compat = true;
-					break;
-
-				case 'L':
-					gen_line_dirs = false;
-					break;
-
-				case 'n':
-					/* Stupid do-nothing deprecated
-					 * option.
-					 */
-					break;
-
-				case 'o':
-					if ( i != 1 )
-						flexerror(
-				_( "-o flag must be given separately" ) );
-
-					outfilename = arg + i + 1;
-					did_outfilename = 1;
-					goto get_next_arg;
-
-				case 'P':
-					if ( i != 1 )
-						flexerror(
-				_( "-P flag must be given separately" ) );
-
-					prefix = arg + i + 1;
-					goto get_next_arg;
-
-				case 'p':
-					++performance_report;
-					break;
-
-				case 'S':
-					if ( i != 1 )
-						flexerror(
-				_( "-S flag must be given separately" ) );
-
-					skelname = arg + i + 1;
-					goto get_next_arg;
-
-				case 's':
-					spprdflt = true;
-					break;
-
-				case 't':
-					use_stdout = true;
-					break;
-
-				case 'T':
-					trace = true;
-					break;
-
-				case 'v':
-					printstats = true;
-					break;
-
-				case 'V':
-					printf( _( "%s version %s\n" ),
-						program_name, flex_version );
-					exit( 0 );
-
-				case 'w':
-					nowarn = true;
-					break;
-
-				case '7':
-					csize = 128;
-					break;
-
-				case '8':
-					csize = CSIZE;
-					break;
-
-				default:
-					fprintf( stderr,
-		_( "%s: unknown flag '%c'.  For usage, try\n\t%s --help\n" ),
-						program_name, (int) arg[i],
-						program_name );
-					exit( 1 );
-				}
-
-		/* Used by -C, -S, -o, and -P flags in lieu of a "continue 2"
-		 * control.
-		 */
-		get_next_arg: ;
-		}
-
-	num_input_files = argc;
-	input_files = argv;
-	set_input_file( num_input_files > 0 ? input_files[0] : NULL );
-
-	lastccl = lastsc = lastdfa = lastnfa = 0;
-	num_rules = num_eof_rules = default_rule = 0;
-	numas = numsnpairs = tmpuses = 0;
-	numecs = numeps = eps2 = num_reallocs = hshcol = dfaeql = totnst = 0;
-	numuniq = numdup = hshsave = eofseen = datapos = dataline = 0;
-	num_backing_up = onesp = numprots = 0;
-	variable_trailing_context_rules = bol_needed = false;
-
-	out_linenum = linenum = sectnum = 1;
-	firstprot = NIL;
-
-	/* Used in mkprot() so that the first proto goes in slot 1
-	 * of the proto queue.
-	 */
-	lastprot = 1;
-
-	set_up_initial_allocations();
-	}
-
-
-/* readin - read in the rules section of the input file(s) */
-
-void readin()
-	{
-	static char yy_stdinit[] = "FILE *yyin = stdin, *yyout = stdout;";
-	static char yy_nostdinit[] =
-		"FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;";
-
-	line_directive_out( (FILE *) 0, 1 );
-
-	if ( yyparse() )
-		{
-		pinpoint_message( _( "fatal parse error" ) );
-		flexend( 1 );
-		}
-
-	if ( syntaxerror )
-		flexend( 1 );
-
-	if ( backing_up_report )
-		{
-		backing_up_file = fopen( backing_name, "w" );
-		if ( backing_up_file == NULL )
-			lerrsf(
-			_( "could not create backing-up info file %s" ),
-				backing_name );
-		}
-
-	else
-		backing_up_file = NULL;
-
-	if ( yymore_really_used == true )
-		yymore_used = true;
-	else if ( yymore_really_used == false )
-		yymore_used = false;
-
-	if ( reject_really_used == true )
-		reject = true;
-	else if ( reject_really_used == false )
-		reject = false;
-
-	if ( performance_report > 0 )
-		{
-		if ( lex_compat )
-			{
-			fprintf( stderr,
-_( "-l AT&T lex compatibility option entails a large performance penalty\n" ) );
-			fprintf( stderr,
-_( " and may be the actual source of other reported performance penalties\n" ) );
-			}
-
-		else if ( do_yylineno )
-			{
-			fprintf( stderr,
-	_( "%%option yylineno entails a large performance penalty\n" ) );
-			}
-
-		if ( performance_report > 1 )
-			{
-			if ( interactive )
-				fprintf( stderr,
-	_( "-I (interactive) entails a minor performance penalty\n" ) );
-
-			if ( yymore_used )
-				fprintf( stderr,
-		_( "yymore() entails a minor performance penalty\n" ) );
-			}
-
-		if ( reject )
-			fprintf( stderr,
-			_( "REJECT entails a large performance penalty\n" ) );
-
-		if ( variable_trailing_context_rules )
-			fprintf( stderr,
-_( "Variable trailing context rules entail a large performance penalty\n" ) );
-		}
-
-	if ( reject )
-		real_reject = true;
-
-	if ( variable_trailing_context_rules )
-		reject = true;
-
-	if ( (fulltbl || fullspd) && reject )
-		{
-		if ( real_reject )
-			flexerror(
-				_( "REJECT cannot be used with -f or -F" ) );
-		else if ( do_yylineno )
-			flexerror(
-			_( "%option yylineno cannot be used with -f or -F" ) );
-		else
-			flexerror(
-	_( "variable trailing context rules cannot be used with -f or -F" ) );
-		}
-
-	if ( reject )
-		outn( "\n#define YY_USES_REJECT" );
-
-	if ( ! do_yywrap )
-		{
-		outn( "\n#define yywrap() 1" );
-		outn( "#define YY_SKIP_YYWRAP" );
-		}
-
-	if ( ddebug )
-		outn( "\n#define FLEX_DEBUG" );
-
-	if ( csize == 256 )
-		outn( "typedef unsigned char YY_CHAR;" );
-	else
-		outn( "typedef char YY_CHAR;" );
-
-	if ( C_plus_plus )
-		{
-		outn( "#define yytext_ptr yytext" );
-
-		if ( interactive )
-			outn( "#define YY_INTERACTIVE" );
-		}
-
-	else
-		{
-		if ( do_stdinit )
-			{
-			outn( "#ifdef VMS" );
-			outn( "#ifndef __VMS_POSIX" );
-			outn( yy_nostdinit );
-			outn( "#else" );
-			outn( yy_stdinit );
-			outn( "#endif" );
-			outn( "#else" );
-			outn( yy_stdinit );
-			outn( "#endif" );
-			}
-
-		else
-			outn( yy_nostdinit );
-		}
-
-	if ( fullspd )
-		outn( "typedef yyconst struct yy_trans_info *yy_state_type;" );
-	else if ( ! C_plus_plus )
-		outn( "typedef int yy_state_type;" );
-
-	if ( ddebug )
-		outn( "\n#define FLEX_DEBUG" );
-
-	if ( lex_compat )
-		outn( "#define YY_FLEX_LEX_COMPAT" );
-
-	if ( do_yylineno && ! C_plus_plus )
-		{
-		outn( "extern int yylineno;" );
-		outn( "int yylineno = 1;" );
-		}
-
-	if ( C_plus_plus )
-		{
-		outn( "\n#include <FlexLexer.h>" );
-
-		if ( yyclass )
-			{
-			outn( "int yyFlexLexer::yylex()" );
-			outn( "\t{" );
-			outn(
-"\tLexerError( \"yyFlexLexer::yylex invoked but %option yyclass used\" );" );
-			outn( "\treturn 0;" );
-			outn( "\t}" );
-	
-			out_str( "\n#define YY_DECL int %s::yylex()\n",
-				yyclass );
-			}
-		}
-
-	else
-		{
-		if ( yytext_is_array )
-			outn( "extern char yytext[];\n" );
-
-		else
-			{
-			outn( "extern char *yytext;" );
-			outn( "#define yytext_ptr yytext" );
-			}
-
-		if ( yyclass )
-			flexerror(
-		_( "%option yyclass only meaningful for C++ scanners" ) );
-		}
-
-	if ( useecs )
-		numecs = cre8ecs( nextecm, ecgroup, csize );
-	else
-		numecs = csize;
-
-	/* Now map the equivalence class for NUL to its expected place. */
-	ecgroup[0] = ecgroup[csize];
-	NUL_ec = ABS( ecgroup[0] );
-
-	if ( useecs )
-		ccl2ecl();
-	}
-
-
-/* set_up_initial_allocations - allocate memory for internal tables */
-
-void set_up_initial_allocations()
-	{
-	current_mns = INITIAL_MNS;
-	firstst = allocate_integer_array( current_mns );
-	lastst = allocate_integer_array( current_mns );
-	finalst = allocate_integer_array( current_mns );
-	transchar = allocate_integer_array( current_mns );
-	trans1 = allocate_integer_array( current_mns );
-	trans2 = allocate_integer_array( current_mns );
-	accptnum = allocate_integer_array( current_mns );
-	assoc_rule = allocate_integer_array( current_mns );
-	state_type = allocate_integer_array( current_mns );
-
-	current_max_rules = INITIAL_MAX_RULES;
-	rule_type = allocate_integer_array( current_max_rules );
-	rule_linenum = allocate_integer_array( current_max_rules );
-	rule_useful = allocate_integer_array( current_max_rules );
-
-	current_max_scs = INITIAL_MAX_SCS;
-	scset = allocate_integer_array( current_max_scs );
-	scbol = allocate_integer_array( current_max_scs );
-	scxclu = allocate_integer_array( current_max_scs );
-	sceof = allocate_integer_array( current_max_scs );
-	scname = allocate_char_ptr_array( current_max_scs );
-
-	current_maxccls = INITIAL_MAX_CCLS;
-	cclmap = allocate_integer_array( current_maxccls );
-	ccllen = allocate_integer_array( current_maxccls );
-	cclng = allocate_integer_array( current_maxccls );
-
-	current_max_ccl_tbl_size = INITIAL_MAX_CCL_TBL_SIZE;
-	ccltbl = allocate_Character_array( current_max_ccl_tbl_size );
-
-	current_max_dfa_size = INITIAL_MAX_DFA_SIZE;
-
-	current_max_xpairs = INITIAL_MAX_XPAIRS;
-	nxt = allocate_integer_array( current_max_xpairs );
-	chk = allocate_integer_array( current_max_xpairs );
-
-	current_max_template_xpairs = INITIAL_MAX_TEMPLATE_XPAIRS;
-	tnxt = allocate_integer_array( current_max_template_xpairs );
-
-	current_max_dfas = INITIAL_MAX_DFAS;
-	base = allocate_integer_array( current_max_dfas );
-	def = allocate_integer_array( current_max_dfas );
-	dfasiz = allocate_integer_array( current_max_dfas );
-	accsiz = allocate_integer_array( current_max_dfas );
-	dhash = allocate_integer_array( current_max_dfas );
-	dss = allocate_int_ptr_array( current_max_dfas );
-	dfaacc = allocate_dfaacc_union( current_max_dfas );
-
-	nultrans = (int *) 0;
-	}
-
-
-void usage()
-	{
-	FILE *f = stdout;
-
-	fprintf( f,
-_( "%s [-bcdfhilnpstvwBFILTV78+? -C[aefFmr] -ooutput -Pprefix -Sskeleton]\n" ),
-		program_name );
-	fprintf( f, _( "\t[--help --version] [file ...]\n" ) );
-
-	fprintf( f, _( "\t-b  generate backing-up information to %s\n" ),
-		backing_name );
-	fprintf( f, _( "\t-c  do-nothing POSIX option\n" ) );
-	fprintf( f, _( "\t-d  turn on debug mode in generated scanner\n" ) );
-	fprintf( f, _( "\t-f  generate fast, large scanner\n" ) );
-	fprintf( f, _( "\t-h  produce this help message\n" ) );
-	fprintf( f, _( "\t-i  generate case-insensitive scanner\n" ) );
-	fprintf( f, _( "\t-l  maximal compatibility with original lex\n" ) );
-	fprintf( f, _( "\t-n  do-nothing POSIX option\n" ) );
-	fprintf( f, _( "\t-p  generate performance report to stderr\n" ) );
-	fprintf( f,
-		_( "\t-s  suppress default rule to ECHO unmatched text\n" ) );
-
-	if ( ! did_outfilename )
-		{
-		sprintf( outfile_path, outfile_template,
-			prefix, C_plus_plus ? "cc" : "c" );
-		outfilename = outfile_path;
-		}
-
-	fprintf( f,
-		_( "\t-t  write generated scanner on stdout instead of %s\n" ),
-		outfilename );
-
-	fprintf( f,
-		_( "\t-v  write summary of scanner statistics to f\n" ) );
-	fprintf( f, _( "\t-w  do not generate warnings\n" ) );
-	fprintf( f, _( "\t-B  generate batch scanner (opposite of -I)\n" ) );
-	fprintf( f,
-		_( "\t-F  use alternative fast scanner representation\n" ) );
-	fprintf( f,
-		_( "\t-I  generate interactive scanner (opposite of -B)\n" ) );
-	fprintf( f, _( "\t-L  suppress #line directives in scanner\n" ) );
-	fprintf( f, _( "\t-T  %s should run in trace mode\n" ), program_name );
-	fprintf( f, _( "\t-V  report %s version\n" ), program_name );
-	fprintf( f, _( "\t-7  generate 7-bit scanner\n" ) );
-	fprintf( f, _( "\t-8  generate 8-bit scanner\n" ) );
-	fprintf( f, _( "\t-+  generate C++ scanner class\n" ) );
-	fprintf( f, _( "\t-?  produce this help message\n" ) );
-	fprintf( f,
-_( "\t-C  specify degree of table compression (default is -Cem):\n" ) );
-	fprintf( f,
-_( "\t\t-Ca  trade off larger tables for better memory alignment\n" ) );
-	fprintf( f, _( "\t\t-Ce  construct equivalence classes\n" ) );
-	fprintf( f,
-_( "\t\t-Cf  do not compress scanner tables; use -f representation\n" ) );
-	fprintf( f,
-_( "\t\t-CF  do not compress scanner tables; use -F representation\n" ) );
-	fprintf( f, _( "\t\t-Cm  construct meta-equivalence classes\n" ) );
-	fprintf( f,
-	_( "\t\t-Cr  use read() instead of stdio for scanner input\n" ) );
-	fprintf( f, _( "\t-o  specify output filename\n" ) );
-	fprintf( f, _( "\t-P  specify scanner prefix other than \"yy\"\n" ) );
-	fprintf( f, _( "\t-S  specify skeleton file\n" ) );
-	fprintf( f, _( "\t--help     produce this help message\n" ) );
-	fprintf( f, _( "\t--version  report %s version\n" ), program_name );
-	}
diff --git a/usr.bin/lex/misc.c b/usr.bin/lex/misc.c
deleted file mode 100644
index b78c8df..0000000
--- a/usr.bin/lex/misc.c
+++ /dev/null
@@ -1,888 +0,0 @@
-/* misc - miscellaneous flex routines */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Vern Paxson.
- * 
- * The United States Government has rights in this work pursuant
- * to contract no. DE-AC03-76SF00098 between the United States
- * Department of Energy and the University of California.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* $Header: /home/daffy/u0/vern/flex/RCS/misc.c,v 2.47 95/04/28 11:39:39 vern Exp $ */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "flexdef.h"
-
-
-void action_define( defname, value )
-char *defname;
-int value;
-	{
-	char buf[MAXLINE];
-
-	if ( (int) strlen( defname ) > MAXLINE / 2 )
-		{
-		format_pinpoint_message( _( "name \"%s\" ridiculously long" ), 
-			defname );
-		return;
-		}
-
-	sprintf( buf, "#define %s %d\n", defname, value );
-	add_action( buf );
-	}
-
-
-void add_action( new_text )
-char *new_text;
-	{
-	int len = strlen( new_text );
-
-	while ( len + action_index >= action_size - 10 /* slop */ )
-		{
-		int new_size = action_size * 2;
-
-		if ( new_size <= 0 )
-			/* Increase just a little, to try to avoid overflow
-			 * on 16-bit machines.
-			 */
-			action_size += action_size / 8;
-		else
-			action_size = new_size;
-
-		action_array =
-			reallocate_character_array( action_array, action_size );
-		}
-
-	strcpy( &action_array[action_index], new_text );
-
-	action_index += len;
-	}
-
-
-/* allocate_array - allocate memory for an integer array of the given size */
-
-void *allocate_array( size, element_size )
-int size;
-size_t element_size;
-	{
-	void *mem;
-	size_t num_bytes = element_size * size;
-
-	mem = flex_alloc( num_bytes );
-	if ( ! mem )
-		flexfatal(
-			_( "memory allocation failed in allocate_array()" ) );
-
-	return mem;
-	}
-
-
-/* all_lower - true if a string is all lower-case */
-
-int all_lower( str )
-char *str;
-	{
-	while ( *str )
-		{
-		if ( ! isascii( (Char) *str ) || ! islower( *str ) )
-			return 0;
-		++str;
-		}
-
-	return 1;
-	}
-
-
-/* all_upper - true if a string is all upper-case */
-
-int all_upper( str )
-char *str;
-	{
-	while ( *str )
-		{
-		if ( ! isascii( (Char) *str ) || ! isupper( *str ) )
-			return 0;
-		++str;
-		}
-
-	return 1;
-	}
-
-
-/* bubble - bubble sort an integer array in increasing order
- *
- * synopsis
- *   int v[n], n;
- *   void bubble( v, n );
- *
- * description
- *   sorts the first n elements of array v and replaces them in
- *   increasing order.
- *
- * passed
- *   v - the array to be sorted
- *   n - the number of elements of 'v' to be sorted
- */
-
-void bubble( v, n )
-int v[], n;
-	{
-	int i, j, k;
-
-	for ( i = n; i > 1; --i )
-		for ( j = 1; j < i; ++j )
-			if ( v[j] > v[j + 1] )	/* compare */
-				{
-				k = v[j];	/* exchange */
-				v[j] = v[j + 1];
-				v[j + 1] = k;
-				}
-	}
-
-
-/* check_char - checks a character to make sure it's within the range
- *		we're expecting.  If not, generates fatal error message
- *		and exits.
- */
-
-void check_char( c )
-int c;
-	{
-	if ( c >= CSIZE )
-		lerrsf( _( "bad character '%s' detected in check_char()" ),
-			readable_form( c ) );
-
-	if ( c >= csize )
-		lerrsf(
-		_( "scanner requires -8 flag to use the character %s" ),
-			readable_form( c ) );
-	}
-
-
-
-/* clower - replace upper-case letter to lower-case */
-
-Char clower( c )
-int c;
-	{
-	return (Char) ((isascii( c ) && isupper( c )) ? tolower( c ) : c);
-	}
-
-
-/* copy_string - returns a dynamically allocated copy of a string */
-
-char *copy_string( str )
-const char *str;
-	{
-	const char *c1;
-	char *c2;
-	char *copy;
-	unsigned int size;
-
-	/* find length */
-	for ( c1 = str; *c1; ++c1 )
-		;
-
-	size = (c1 - str + 1) * sizeof( char );
-	copy = (char *) flex_alloc( size );
-
-	if ( copy == NULL )
-		flexfatal( _( "dynamic memory failure in copy_string()" ) );
-
-	for ( c2 = copy; (*c2++ = *str++) != 0; )
-		;
-
-	return copy;
-	}
-
-
-/* copy_unsigned_string -
- *    returns a dynamically allocated copy of a (potentially) unsigned string
- */
-
-Char *copy_unsigned_string( str )
-Char *str;
-	{
-	Char *c;
-	Char *copy;
-
-	/* find length */
-	for ( c = str; *c; ++c )
-		;
-
-	copy = allocate_Character_array( c - str + 1 );
-
-	for ( c = copy; (*c++ = *str++) != 0; )
-		;
-
-	return copy;
-	}
-
-
-/* cshell - shell sort a character array in increasing order
- *
- * synopsis
- *
- *   Char v[n];
- *   int n, special_case_0;
- *   cshell( v, n, special_case_0 );
- *
- * description
- *   Does a shell sort of the first n elements of array v.
- *   If special_case_0 is true, then any element equal to 0
- *   is instead assumed to have infinite weight.
- *
- * passed
- *   v - array to be sorted
- *   n - number of elements of v to be sorted
- */
-
-void cshell( v, n, special_case_0 )
-Char v[];
-int n, special_case_0;
-	{
-	int gap, i, j, jg;
-	Char k;
-
-	for ( gap = n / 2; gap > 0; gap = gap / 2 )
-		for ( i = gap; i < n; ++i )
-			for ( j = i - gap; j >= 0; j = j - gap )
-				{
-				jg = j + gap;
-
-				if ( special_case_0 )
-					{
-					if ( v[jg] == 0 )
-						break;
-
-					else if ( v[j] != 0 && v[j] <= v[jg] )
-						break;
-					}
-
-				else if ( v[j] <= v[jg] )
-					break;
-
-				k = v[j];
-				v[j] = v[jg];
-				v[jg] = k;
-				}
-	}
-
-
-/* dataend - finish up a block of data declarations */
-
-void dataend()
-	{
-	if ( datapos > 0 )
-		dataflush();
-
-	/* add terminator for initialization; { for vi */
-	outn( "    } ;\n" );
-
-	dataline = 0;
-	datapos = 0;
-	}
-
-
-/* dataflush - flush generated data statements */
-
-void dataflush()
-	{
-	outc( '\n' );
-
-	if ( ++dataline >= NUMDATALINES )
-		{
-		/* Put out a blank line so that the table is grouped into
-		 * large blocks that enable the user to find elements easily.
-		 */
-		outc( '\n' );
-		dataline = 0;
-		}
-
-	/* Reset the number of characters written on the current line. */
-	datapos = 0;
-	}
-
-
-/* flexerror - report an error message and terminate */
-
-void flexerror( msg )
-const char msg[];
-	{
-	fprintf( stderr, "%s: %s\n", program_name, msg );
-	flexend( 1 );
-	}
-
-
-/* flexfatal - report a fatal error message and terminate */
-
-void flexfatal( msg )
-const char msg[];
-	{
-	fprintf( stderr, _( "%s: fatal internal error, %s\n" ),
-		program_name, msg );
-	exit( 1 );
-	}
-
-
-/* htoi - convert a hexadecimal digit string to an integer value */
-
-int htoi( str )
-Char str[];
-	{
-	unsigned int result;
-
-	(void) sscanf( (char *) str, "%x", &result );
-
-	return result;
-	}
-
-
-/* lerrif - report an error message formatted with one integer argument */
-
-void lerrif( msg, arg )
-const char msg[];
-int arg;
-	{
-	char errmsg[MAXLINE];
-	(void) sprintf( errmsg, msg, arg );
-	flexerror( errmsg );
-	}
-
-
-/* lerrsf - report an error message formatted with one string argument */
-
-void lerrsf( msg, arg )
-const char msg[], arg[];
-	{
-	char errmsg[MAXLINE];
-
-	(void) sprintf( errmsg, msg, arg );
-	flexerror( errmsg );
-	}
-
-
-/* line_directive_out - spit out a "#line" statement */
-
-void line_directive_out( output_file, do_infile )
-FILE *output_file;
-int do_infile;
-	{
-	char directive[MAXLINE], filename[MAXLINE];
-	char *s1, *s2, *s3;
-	static char line_fmt[] = "#line %d \"%s\"\n";
-
-	if ( ! gen_line_dirs )
-		return;
-
-	if ( (do_infile && ! infilename) || (! do_infile && ! outfilename) )
-		/* don't know the filename to use, skip */
-		return;
-
-	s1 = do_infile ? infilename : outfilename;
-	s2 = filename;
-	s3 = &filename[sizeof( filename ) - 2];
-
-	while ( s2 < s3 && *s1 )
-		{
-		if ( *s1 == '\\' )
-			/* Escape the '\' */
-			*s2++ = '\\';
-
-		*s2++ = *s1++;
-		}
-
-	*s2 = '\0';
-
-	if ( do_infile )
-		sprintf( directive, line_fmt, linenum, filename );
-	else
-		{
-		if ( output_file == stdout )
-			/* Account for the line directive itself. */
-			++out_linenum;
-
-		sprintf( directive, line_fmt, out_linenum, filename );
-		}
-
-	/* If output_file is nil then we should put the directive in
-	 * the accumulated actions.
-	 */
-	if ( output_file )
-		{
-		fputs( directive, output_file );
-		}
-	else
-		add_action( directive );
-	}
-
-
-/* mark_defs1 - mark the current position in the action array as
- *               representing where the user's section 1 definitions end
- *		 and the prolog begins
- */
-void mark_defs1()
-	{
-	defs1_offset = 0;
-	action_array[action_index++] = '\0';
-	action_offset = prolog_offset = action_index;
-	action_array[action_index] = '\0';
-	}
-
-
-/* mark_prolog - mark the current position in the action array as
- *               representing the end of the action prolog
- */
-void mark_prolog()
-	{
-	action_array[action_index++] = '\0';
-	action_offset = action_index;
-	action_array[action_index] = '\0';
-	}
-
-
-/* mk2data - generate a data statement for a two-dimensional array
- *
- * Generates a data statement initializing the current 2-D array to "value".
- */
-void mk2data( value )
-int value;
-	{
-	if ( datapos >= NUMDATAITEMS )
-		{
-		outc( ',' );
-		dataflush();
-		}
-
-	if ( datapos == 0 )
-		/* Indent. */
-		out( "    " );
-
-	else
-		outc( ',' );
-
-	++datapos;
-
-	out_dec( "%5d", value );
-	}
-
-
-/* mkdata - generate a data statement
- *
- * Generates a data statement initializing the current array element to
- * "value".
- */
-void mkdata( value )
-int value;
-	{
-	if ( datapos >= NUMDATAITEMS )
-		{
-		outc( ',' );
-		dataflush();
-		}
-
-	if ( datapos == 0 )
-		/* Indent. */
-		out( "    " );
-	else
-		outc( ',' );
-
-	++datapos;
-
-	out_dec( "%5d", value );
-	}
-
-
-/* myctoi - return the integer represented by a string of digits */
-
-int myctoi( array )
-char array[];
-	{
-	int val = 0;
-
-	(void) sscanf( array, "%d", &val );
-
-	return val;
-	}
-
-
-/* myesc - return character corresponding to escape sequence */
-
-Char myesc( array )
-Char array[];
-	{
-	Char c, esc_char;
-
-	switch ( array[1] )
-		{
-		case 'b': return '\b';
-		case 'f': return '\f';
-		case 'n': return '\n';
-		case 'r': return '\r';
-		case 't': return '\t';
-
-#if __STDC__
-		case 'a': return '\a';
-		case 'v': return '\v';
-#else
-		case 'a': return '\007';
-		case 'v': return '\013';
-#endif
-
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-			{ /* \<octal> */
-			int sptr = 1;
-
-			while ( isascii( array[sptr] ) &&
-				isdigit( array[sptr] ) )
-				/* Don't increment inside loop control
-				 * because if isdigit() is a macro it might
-				 * expand into multiple increments ...
-				 */
-				++sptr;
-
-			c = array[sptr];
-			array[sptr] = '\0';
-
-			esc_char = otoi( array + 1 );
-
-			array[sptr] = c;
-
-			return esc_char;
-			}
-
-		case 'x':
-			{ /* \x<hex> */
-			int sptr = 2;
-
-			while ( isascii( array[sptr] ) &&
-				isxdigit( (char) array[sptr] ) )
-				/* Don't increment inside loop control
-				 * because if isdigit() is a macro it might
-				 * expand into multiple increments ...
-				 */
-				++sptr;
-
-			c = array[sptr];
-			array[sptr] = '\0';
-
-			esc_char = htoi( array + 2 );
-
-			array[sptr] = c;
-
-			return esc_char;
-			}
-
-		default:
-			return array[1];
-		}
-	}
-
-
-/* otoi - convert an octal digit string to an integer value */
-
-int otoi( str )
-Char str[];
-	{
-	unsigned int result;
-
-	(void) sscanf( (char *) str, "%o", &result );
-	return result;
-	}
-
-
-/* out - various flavors of outputing a (possibly formatted) string for the
- *	 generated scanner, keeping track of the line count.
- */
-
-void out( str )
-const char str[];
-	{
-	fputs( str, stdout );
-	out_line_count( str );
-	}
-
-void out_dec( fmt, n )
-const char fmt[];
-int n;
-	{
-	printf( fmt, n );
-	out_line_count( fmt );
-	}
-
-void out_dec2( fmt, n1, n2 )
-const char fmt[];
-int n1, n2;
-	{
-	printf( fmt, n1, n2 );
-	out_line_count( fmt );
-	}
-
-void out_hex( fmt, x )
-const char fmt[];
-unsigned int x;
-	{
-	printf( fmt, x );
-	out_line_count( fmt );
-	}
-
-void out_line_count( str )
-const char str[];
-	{
-	int i;
-
-	for ( i = 0; str[i]; ++i )
-		if ( str[i] == '\n' )
-			++out_linenum;
-	}
-
-void out_str( fmt, str )
-const char fmt[], str[];
-	{
-	printf( fmt, str );
-	out_line_count( fmt );
-	out_line_count( str );
-	}
-
-void out_str3( fmt, s1, s2, s3 )
-const char fmt[], s1[], s2[], s3[];
-	{
-	printf( fmt, s1, s2, s3 );
-	out_line_count( fmt );
-	out_line_count( s1 );
-	out_line_count( s2 );
-	out_line_count( s3 );
-	}
-
-void out_str_dec( fmt, str, n )
-const char fmt[], str[];
-int n;
-	{
-	printf( fmt, str, n );
-	out_line_count( fmt );
-	out_line_count( str );
-	}
-
-void outc( c )
-int c;
-	{
-	putc( c, stdout );
-
-	if ( c == '\n' )
-		++out_linenum;
-	}
-
-void outn( str )
-const char str[];
-	{
-	puts( str );
-	out_line_count( str );
-	++out_linenum;
-	}
-
-
-/* readable_form - return the human-readable form of a character
- *
- * The returned string is in static storage.
- */
-
-char *readable_form( c )
-int c;
-	{
-	static char rform[10];
-
-	if ( (c >= 0 && c < 32) || c >= 127 )
-		{
-		switch ( c )
-			{
-			case '\b': return "\\b";
-			case '\f': return "\\f";
-			case '\n': return "\\n";
-			case '\r': return "\\r";
-			case '\t': return "\\t";
-
-#if __STDC__
-			case '\a': return "\\a";
-			case '\v': return "\\v";
-#endif
-
-			default:
-				(void) sprintf( rform, "\\%.3o",
-						(unsigned int) c );
-				return rform;
-			}
-		}
-
-	else if ( c == ' ' )
-		return "' '";
-
-	else
-		{
-		rform[0] = c;
-		rform[1] = '\0';
-
-		return rform;
-		}
-	}
-
-
-/* reallocate_array - increase the size of a dynamic array */
-
-void *reallocate_array( array, size, element_size )
-void *array;
-int size;
-size_t element_size;
-	{
-	void *new_array;
-	size_t num_bytes = element_size * size;
-
-	new_array = flex_realloc( array, num_bytes );
-	if ( ! new_array )
-		flexfatal( _( "attempt to increase array size failed" ) );
-
-	return new_array;
-	}
-
-
-/* skelout - write out one section of the skeleton file
- *
- * Description
- *    Copies skelfile or skel array to stdout until a line beginning with
- *    "%%" or EOF is found.
- */
-void skelout()
-	{
-	char buf_storage[MAXLINE];
-	char *buf = buf_storage;
-	int do_copy = 1;
-
-	/* Loop pulling lines either from the skelfile, if we're using
-	 * one, or from the skel[] array.
-	 */
-	while ( skelfile ?
-		(fgets( buf, MAXLINE, skelfile ) != NULL) :
-		((buf = (char *) skel[skel_ind++]) != 0) )
-		{ /* copy from skel array */
-		if ( buf[0] == '%' )
-			{ /* control line */
-			switch ( buf[1] )
-				{
-				case '%':
-					return;
-
-				case '+':
-					do_copy = C_plus_plus;
-					break;
-
-				case '-':
-					do_copy = ! C_plus_plus;
-					break;
-
-				case '*':
-					do_copy = 1;
-					break;
-
-				default:
-					flexfatal(
-					_( "bad line in skeleton file" ) );
-				}
-			}
-
-		else if ( do_copy )
-			{
-			if ( skelfile )
-				/* Skeleton file reads include final
-				 * newline, skel[] array does not.
-				 */
-				out( buf );
-			else
-				outn( buf );
-			}
-		}
-	}
-
-
-/* transition_struct_out - output a yy_trans_info structure
- *
- * outputs the yy_trans_info structure with the two elements, element_v and
- * element_n.  Formats the output with spaces and carriage returns.
- */
-
-void transition_struct_out( element_v, element_n )
-int element_v, element_n;
-	{
-	out_dec2( " {%4d,%4d },", element_v, element_n );
-
-	datapos += TRANS_STRUCT_PRINT_LENGTH;
-
-	if ( datapos >= 79 - TRANS_STRUCT_PRINT_LENGTH )
-		{
-		outc( '\n' );
-
-		if ( ++dataline % 10 == 0 )
-			outc( '\n' );
-
-		datapos = 0;
-		}
-	}
-
-
-/* The following is only needed when building flex's parser using certain
- * broken versions of bison.
- */
-void *yy_flex_xmalloc( size )
-int size;
-	{
-	void *result = flex_alloc( (size_t) size );
-
-	if ( ! result  )
-		flexfatal(
-			_( "memory allocation failed in yy_flex_xmalloc()" ) );
-
-	return result;
-	}
-
-
-/* zero_out - set a region of memory to 0
- *
- * Sets region_ptr[0] through region_ptr[size_in_bytes - 1] to zero.
- */
-
-void zero_out( region_ptr, size_in_bytes )
-char *region_ptr;
-size_t size_in_bytes;
-	{
-	char *rp, *rp_end;
-
-	rp = region_ptr;
-	rp_end = region_ptr + size_in_bytes;
-
-	while ( rp < rp_end )
-		*rp++ = 0;
-	}
diff --git a/usr.bin/lex/mkskel.sh b/usr.bin/lex/mkskel.sh
deleted file mode 100755
index a03a11a..0000000
--- a/usr.bin/lex/mkskel.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-cat <<!
-/* File created from flex.skl via mkskel.sh */
-
-#include "flexdef.h"
-
-const char *skel[] = {
-!
-
-sed 's/\\/&&/g' $* | sed 's/"/\\"/g' | sed 's/.*/  "&",/'
-
-cat <<!
-  0
-};
-!
diff --git a/usr.bin/lex/nfa.c b/usr.bin/lex/nfa.c
deleted file mode 100644
index 99b4ecf..0000000
--- a/usr.bin/lex/nfa.c
+++ /dev/null
@@ -1,711 +0,0 @@
-/* nfa - NFA construction routines */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Vern Paxson.
- * 
- * The United States Government has rights in this work pursuant
- * to contract no. DE-AC03-76SF00098 between the United States
- * Department of Energy and the University of California.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* $Header: /home/daffy/u0/vern/flex/RCS/nfa.c,v 2.17 95/03/04 16:11:42 vern Exp $ */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "flexdef.h"
-
-
-/* declare functions that have forward references */
-
-int dupmachine PROTO((int));
-void mkxtion PROTO((int, int));
-
-
-/* add_accept - add an accepting state to a machine
- *
- * accepting_number becomes mach's accepting number.
- */
-
-void add_accept( mach, accepting_number )
-int mach, accepting_number;
-	{
-	/* Hang the accepting number off an epsilon state.  if it is associated
-	 * with a state that has a non-epsilon out-transition, then the state
-	 * will accept BEFORE it makes that transition, i.e., one character
-	 * too soon.
-	 */
-
-	if ( transchar[finalst[mach]] == SYM_EPSILON )
-		accptnum[finalst[mach]] = accepting_number;
-
-	else
-		{
-		int astate = mkstate( SYM_EPSILON );
-		accptnum[astate] = accepting_number;
-		(void) link_machines( mach, astate );
-		}
-	}
-
-
-/* copysingl - make a given number of copies of a singleton machine
- *
- * synopsis
- *
- *   newsng = copysingl( singl, num );
- *
- *     newsng - a new singleton composed of num copies of singl
- *     singl  - a singleton machine
- *     num    - the number of copies of singl to be present in newsng
- */
-
-int copysingl( singl, num )
-int singl, num;
-	{
-	int copy, i;
-
-	copy = mkstate( SYM_EPSILON );
-
-	for ( i = 1; i <= num; ++i )
-		copy = link_machines( copy, dupmachine( singl ) );
-
-	return copy;
-	}
-
-
-/* dumpnfa - debugging routine to write out an nfa */
-
-void dumpnfa( state1 )
-int state1;
-
-	{
-	int sym, tsp1, tsp2, anum, ns;
-
-	fprintf( stderr,
-	_( "\n\n********** beginning dump of nfa with start state %d\n" ),
-		state1 );
-
-	/* We probably should loop starting at firstst[state1] and going to
-	 * lastst[state1], but they're not maintained properly when we "or"
-	 * all of the rules together.  So we use our knowledge that the machine
-	 * starts at state 1 and ends at lastnfa.
-	 */
-
-	/* for ( ns = firstst[state1]; ns <= lastst[state1]; ++ns ) */
-	for ( ns = 1; ns <= lastnfa; ++ns )
-		{
-		fprintf( stderr, _( "state # %4d\t" ), ns );
-
-		sym = transchar[ns];
-		tsp1 = trans1[ns];
-		tsp2 = trans2[ns];
-		anum = accptnum[ns];
-
-		fprintf( stderr, "%3d:  %4d, %4d", sym, tsp1, tsp2 );
-
-		if ( anum != NIL )
-			fprintf( stderr, "  [%d]", anum );
-
-		fprintf( stderr, "\n" );
-		}
-
-	fprintf( stderr, _( "********** end of dump\n" ) );
-	}
-
-
-/* dupmachine - make a duplicate of a given machine
- *
- * synopsis
- *
- *   copy = dupmachine( mach );
- *
- *     copy - holds duplicate of mach
- *     mach - machine to be duplicated
- *
- * note that the copy of mach is NOT an exact duplicate; rather, all the
- * transition states values are adjusted so that the copy is self-contained,
- * as the original should have been.
- *
- * also note that the original MUST be contiguous, with its low and high
- * states accessible by the arrays firstst and lastst
- */
-
-int dupmachine( mach )
-int mach;
-	{
-	int i, init, state_offset;
-	int state = 0;
-	int last = lastst[mach];
-
-	for ( i = firstst[mach]; i <= last; ++i )
-		{
-		state = mkstate( transchar[i] );
-
-		if ( trans1[i] != NO_TRANSITION )
-			{
-			mkxtion( finalst[state], trans1[i] + state - i );
-
-			if ( transchar[i] == SYM_EPSILON &&
-			     trans2[i] != NO_TRANSITION )
-				mkxtion( finalst[state],
-					trans2[i] + state - i );
-			}
-
-		accptnum[state] = accptnum[i];
-		}
-
-	if ( state == 0 )
-		flexfatal( _( "empty machine in dupmachine()" ) );
-
-	state_offset = state - i + 1;
-
-	init = mach + state_offset;
-	firstst[init] = firstst[mach] + state_offset;
-	finalst[init] = finalst[mach] + state_offset;
-	lastst[init] = lastst[mach] + state_offset;
-
-	return init;
-	}
-
-
-/* finish_rule - finish up the processing for a rule
- *
- * An accepting number is added to the given machine.  If variable_trail_rule
- * is true then the rule has trailing context and both the head and trail
- * are variable size.  Otherwise if headcnt or trailcnt is non-zero then
- * the machine recognizes a pattern with trailing context and headcnt is
- * the number of characters in the matched part of the pattern, or zero
- * if the matched part has variable length.  trailcnt is the number of
- * trailing context characters in the pattern, or zero if the trailing
- * context has variable length.
- */
-
-void finish_rule( mach, variable_trail_rule, headcnt, trailcnt )
-int mach, variable_trail_rule, headcnt, trailcnt;
-	{
-	char action_text[MAXLINE];
-
-	add_accept( mach, num_rules );
-
-	/* We did this in new_rule(), but it often gets the wrong
-	 * number because we do it before we start parsing the current rule.
-	 */
-	rule_linenum[num_rules] = linenum;
-
-	/* If this is a continued action, then the line-number has already
-	 * been updated, giving us the wrong number.
-	 */
-	if ( continued_action )
-		--rule_linenum[num_rules];
-
-	sprintf( action_text, "case %d:\n", num_rules );
-	add_action( action_text );
-
-	if ( variable_trail_rule )
-		{
-		rule_type[num_rules] = RULE_VARIABLE;
-
-		if ( performance_report > 0 )
-			fprintf( stderr,
-			_( "Variable trailing context rule at line %d\n" ),
-				rule_linenum[num_rules] );
-
-		variable_trailing_context_rules = true;
-		}
-
-	else
-		{
-		rule_type[num_rules] = RULE_NORMAL;
-
-		if ( headcnt > 0 || trailcnt > 0 )
-			{
-			/* Do trailing context magic to not match the trailing
-			 * characters.
-			 */
-			char *scanner_cp = "yy_c_buf_p = yy_cp";
-			char *scanner_bp = "yy_bp";
-
-			add_action(
-	"*yy_cp = yy_hold_char; /* undo effects of setting up yytext */\n" );
-
-			if ( headcnt > 0 )
-				{
-				sprintf( action_text, "%s = %s + %d;\n",
-				scanner_cp, scanner_bp, headcnt );
-				add_action( action_text );
-				}
-
-			else
-				{
-				sprintf( action_text, "%s -= %d;\n",
-					scanner_cp, trailcnt );
-				add_action( action_text );
-				}
-
-			add_action(
-			"YY_DO_BEFORE_ACTION; /* set up yytext again */\n" );
-			}
-		}
-
-	/* Okay, in the action code at this point yytext and yyleng have
-	 * their proper final values for this rule, so here's the point
-	 * to do any user action.  But don't do it for continued actions,
-	 * as that'll result in multiple YY_RULE_SETUP's.
-	 */
-	if ( ! continued_action )
-		add_action( "YY_RULE_SETUP\n" );
-
-	line_directive_out( (FILE *) 0, 1 );
-	}
-
-
-/* link_machines - connect two machines together
- *
- * synopsis
- *
- *   new = link_machines( first, last );
- *
- *     new    - a machine constructed by connecting first to last
- *     first  - the machine whose successor is to be last
- *     last   - the machine whose predecessor is to be first
- *
- * note: this routine concatenates the machine first with the machine
- *  last to produce a machine new which will pattern-match first first
- *  and then last, and will fail if either of the sub-patterns fails.
- *  FIRST is set to new by the operation.  last is unmolested.
- */
-
-int link_machines( first, last )
-int first, last;
-	{
-	if ( first == NIL )
-		return last;
-
-	else if ( last == NIL )
-		return first;
-
-	else
-		{
-		mkxtion( finalst[first], last );
-		finalst[first] = finalst[last];
-		lastst[first] = MAX( lastst[first], lastst[last] );
-		firstst[first] = MIN( firstst[first], firstst[last] );
-
-		return first;
-		}
-	}
-
-
-/* mark_beginning_as_normal - mark each "beginning" state in a machine
- *                            as being a "normal" (i.e., not trailing context-
- *                            associated) states
- *
- * The "beginning" states are the epsilon closure of the first state
- */
-
-void mark_beginning_as_normal( mach )
-int mach;
-	{
-	switch ( state_type[mach] )
-		{
-		case STATE_NORMAL:
-			/* Oh, we've already visited here. */
-			return;
-
-		case STATE_TRAILING_CONTEXT:
-			state_type[mach] = STATE_NORMAL;
-
-			if ( transchar[mach] == SYM_EPSILON )
-				{
-				if ( trans1[mach] != NO_TRANSITION )
-					mark_beginning_as_normal(
-						trans1[mach] );
-
-				if ( trans2[mach] != NO_TRANSITION )
-					mark_beginning_as_normal(
-						trans2[mach] );
-				}
-			break;
-
-		default:
-			flexerror(
-			_( "bad state type in mark_beginning_as_normal()" ) );
-			break;
-		}
-	}
-
-
-/* mkbranch - make a machine that branches to two machines
- *
- * synopsis
- *
- *   branch = mkbranch( first, second );
- *
- *     branch - a machine which matches either first's pattern or second's
- *     first, second - machines whose patterns are to be or'ed (the | operator)
- *
- * Note that first and second are NEITHER destroyed by the operation.  Also,
- * the resulting machine CANNOT be used with any other "mk" operation except
- * more mkbranch's.  Compare with mkor()
- */
-
-int mkbranch( first, second )
-int first, second;
-	{
-	int eps;
-
-	if ( first == NO_TRANSITION )
-		return second;
-
-	else if ( second == NO_TRANSITION )
-		return first;
-
-	eps = mkstate( SYM_EPSILON );
-
-	mkxtion( eps, first );
-	mkxtion( eps, second );
-
-	return eps;
-	}
-
-
-/* mkclos - convert a machine into a closure
- *
- * synopsis
- *   new = mkclos( state );
- *
- * new - a new state which matches the closure of "state"
- */
-
-int mkclos( state )
-int state;
-	{
-	return mkopt( mkposcl( state ) );
-	}
-
-
-/* mkopt - make a machine optional
- *
- * synopsis
- *
- *   new = mkopt( mach );
- *
- *     new  - a machine which optionally matches whatever mach matched
- *     mach - the machine to make optional
- *
- * notes:
- *     1. mach must be the last machine created
- *     2. mach is destroyed by the call
- */
-
-int mkopt( mach )
-int mach;
-	{
-	int eps;
-
-	if ( ! SUPER_FREE_EPSILON(finalst[mach]) )
-		{
-		eps = mkstate( SYM_EPSILON );
-		mach = link_machines( mach, eps );
-		}
-
-	/* Can't skimp on the following if FREE_EPSILON(mach) is true because
-	 * some state interior to "mach" might point back to the beginning
-	 * for a closure.
-	 */
-	eps = mkstate( SYM_EPSILON );
-	mach = link_machines( eps, mach );
-
-	mkxtion( mach, finalst[mach] );
-
-	return mach;
-	}
-
-
-/* mkor - make a machine that matches either one of two machines
- *
- * synopsis
- *
- *   new = mkor( first, second );
- *
- *     new - a machine which matches either first's pattern or second's
- *     first, second - machines whose patterns are to be or'ed (the | operator)
- *
- * note that first and second are both destroyed by the operation
- * the code is rather convoluted because an attempt is made to minimize
- * the number of epsilon states needed
- */
-
-int mkor( first, second )
-int first, second;
-	{
-	int eps, orend;
-
-	if ( first == NIL )
-		return second;
-
-	else if ( second == NIL )
-		return first;
-
-	else
-		{
-		/* See comment in mkopt() about why we can't use the first
-		 * state of "first" or "second" if they satisfy "FREE_EPSILON".
-		 */
-		eps = mkstate( SYM_EPSILON );
-
-		first = link_machines( eps, first );
-
-		mkxtion( first, second );
-
-		if ( SUPER_FREE_EPSILON(finalst[first]) &&
-		     accptnum[finalst[first]] == NIL )
-			{
-			orend = finalst[first];
-			mkxtion( finalst[second], orend );
-			}
-
-		else if ( SUPER_FREE_EPSILON(finalst[second]) &&
-			  accptnum[finalst[second]] == NIL )
-			{
-			orend = finalst[second];
-			mkxtion( finalst[first], orend );
-			}
-
-		else
-			{
-			eps = mkstate( SYM_EPSILON );
-
-			first = link_machines( first, eps );
-			orend = finalst[first];
-
-			mkxtion( finalst[second], orend );
-			}
-		}
-
-	finalst[first] = orend;
-	return first;
-	}
-
-
-/* mkposcl - convert a machine into a positive closure
- *
- * synopsis
- *   new = mkposcl( state );
- *
- *    new - a machine matching the positive closure of "state"
- */
-
-int mkposcl( state )
-int state;
-	{
-	int eps;
-
-	if ( SUPER_FREE_EPSILON(finalst[state]) )
-		{
-		mkxtion( finalst[state], state );
-		return state;
-		}
-
-	else
-		{
-		eps = mkstate( SYM_EPSILON );
-		mkxtion( eps, state );
-		return link_machines( state, eps );
-		}
-	}
-
-
-/* mkrep - make a replicated machine
- *
- * synopsis
- *   new = mkrep( mach, lb, ub );
- *
- *    new - a machine that matches whatever "mach" matched from "lb"
- *          number of times to "ub" number of times
- *
- * note
- *   if "ub" is INFINITY then "new" matches "lb" or more occurrences of "mach"
- */
-
-int mkrep( mach, lb, ub )
-int mach, lb, ub;
-	{
-	int base_mach, tail, copy, i;
-
-	base_mach = copysingl( mach, lb - 1 );
-
-	if ( ub == INFINITY )
-		{
-		copy = dupmachine( mach );
-		mach = link_machines( mach,
-		link_machines( base_mach, mkclos( copy ) ) );
-		}
-
-	else
-		{
-		tail = mkstate( SYM_EPSILON );
-
-		for ( i = lb; i < ub; ++i )
-			{
-			copy = dupmachine( mach );
-			tail = mkopt( link_machines( copy, tail ) );
-			}
-
-		mach = link_machines( mach, link_machines( base_mach, tail ) );
-		}
-
-	return mach;
-	}
-
-
-/* mkstate - create a state with a transition on a given symbol
- *
- * synopsis
- *
- *   state = mkstate( sym );
- *
- *     state - a new state matching sym
- *     sym   - the symbol the new state is to have an out-transition on
- *
- * note that this routine makes new states in ascending order through the
- * state array (and increments LASTNFA accordingly).  The routine DUPMACHINE
- * relies on machines being made in ascending order and that they are
- * CONTIGUOUS.  Change it and you will have to rewrite DUPMACHINE (kludge
- * that it admittedly is)
- */
-
-int mkstate( sym )
-int sym;
-	{
-	if ( ++lastnfa >= current_mns )
-		{
-		if ( (current_mns += MNS_INCREMENT) >= MAXIMUM_MNS )
-			lerrif(
-		_( "input rules are too complicated (>= %d NFA states)" ),
-				current_mns );
-
-		++num_reallocs;
-
-		firstst = reallocate_integer_array( firstst, current_mns );
-		lastst = reallocate_integer_array( lastst, current_mns );
-		finalst = reallocate_integer_array( finalst, current_mns );
-		transchar = reallocate_integer_array( transchar, current_mns );
-		trans1 = reallocate_integer_array( trans1, current_mns );
-		trans2 = reallocate_integer_array( trans2, current_mns );
-		accptnum = reallocate_integer_array( accptnum, current_mns );
-		assoc_rule =
-			reallocate_integer_array( assoc_rule, current_mns );
-		state_type =
-			reallocate_integer_array( state_type, current_mns );
-		}
-
-	firstst[lastnfa] = lastnfa;
-	finalst[lastnfa] = lastnfa;
-	lastst[lastnfa] = lastnfa;
-	transchar[lastnfa] = sym;
-	trans1[lastnfa] = NO_TRANSITION;
-	trans2[lastnfa] = NO_TRANSITION;
-	accptnum[lastnfa] = NIL;
-	assoc_rule[lastnfa] = num_rules;
-	state_type[lastnfa] = current_state_type;
-
-	/* Fix up equivalence classes base on this transition.  Note that any
-	 * character which has its own transition gets its own equivalence
-	 * class.  Thus only characters which are only in character classes
-	 * have a chance at being in the same equivalence class.  E.g. "a|b"
-	 * puts 'a' and 'b' into two different equivalence classes.  "[ab]"
-	 * puts them in the same equivalence class (barring other differences
-	 * elsewhere in the input).
-	 */
-
-	if ( sym < 0 )
-		{
-		/* We don't have to update the equivalence classes since
-		 * that was already done when the ccl was created for the
-		 * first time.
-		 */
-		}
-
-	else if ( sym == SYM_EPSILON )
-		++numeps;
-
-	else
-		{
-		check_char( sym );
-
-		if ( useecs )
-			/* Map NUL's to csize. */
-			mkechar( sym ? sym : csize, nextecm, ecgroup );
-		}
-
-	return lastnfa;
-	}
-
-
-/* mkxtion - make a transition from one state to another
- *
- * synopsis
- *
- *   mkxtion( statefrom, stateto );
- *
- *     statefrom - the state from which the transition is to be made
- *     stateto   - the state to which the transition is to be made
- */
-
-void mkxtion( statefrom, stateto )
-int statefrom, stateto;
-	{
-	if ( trans1[statefrom] == NO_TRANSITION )
-		trans1[statefrom] = stateto;
-
-	else if ( (transchar[statefrom] != SYM_EPSILON) ||
-		  (trans2[statefrom] != NO_TRANSITION) )
-		flexfatal( _( "found too many transitions in mkxtion()" ) );
-
-	else
-		{ /* second out-transition for an epsilon state */
-		++eps2;
-		trans2[statefrom] = stateto;
-		}
-	}
-
-/* new_rule - initialize for a new rule */
-
-void new_rule()
-	{
-	if ( ++num_rules >= current_max_rules )
-		{
-		++num_reallocs;
-		current_max_rules += MAX_RULES_INCREMENT;
-		rule_type = reallocate_integer_array( rule_type,
-							current_max_rules );
-		rule_linenum = reallocate_integer_array( rule_linenum,
-							current_max_rules );
-		rule_useful = reallocate_integer_array( rule_useful,
-							current_max_rules );
-		}
-
-	if ( num_rules > MAX_RULE )
-		lerrif( _( "too many rules (> %d)!" ), MAX_RULE );
-
-	rule_linenum[num_rules] = linenum;
-	rule_useful[num_rules] = false;
-	}
diff --git a/usr.bin/lex/parse.y b/usr.bin/lex/parse.y
deleted file mode 100644
index f3b56d8..0000000
--- a/usr.bin/lex/parse.y
+++ /dev/null
@@ -1,914 +0,0 @@
-/* parse.y - parser for flex input */
-
-%token CHAR NUMBER SECTEND SCDECL XSCDECL NAME PREVCCL EOF_OP
-%token OPTION_OP OPT_OUTFILE OPT_PREFIX OPT_YYCLASS
-
-%token CCE_ALNUM CCE_ALPHA CCE_BLANK CCE_CNTRL CCE_DIGIT CCE_GRAPH
-%token CCE_LOWER CCE_PRINT CCE_PUNCT CCE_SPACE CCE_UPPER CCE_XDIGIT
-
-%{
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Vern Paxson.
- * 
- * The United States Government has rights in this work pursuant
- * to contract no. DE-AC03-76SF00098 between the United States
- * Department of Energy and the University of California.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* $Header: /home/daffy/u0/vern/flex/RCS/parse.y,v 2.28 95/04/21 11:51:51 vern Exp $ */
-/* $FreeBSD$ */
-
-
-/* Some versions of bison are broken in that they use alloca() but don't
- * declare it properly.  The following is the patented (just kidding!)
- * #ifdef chud to fix the problem, courtesy of Francois Pinard.
- */
-#ifdef YYBISON
-/* AIX requires this to be the first thing in the file.  What a piece.  */
-# ifdef _AIX
- #pragma alloca
-# endif
-#endif
-
-#include "flexdef.h"
-
-/* The remainder of the alloca() cruft has to come after including flexdef.h,
- * so HAVE_ALLOCA_H is (possibly) defined.
- */
-#ifdef YYBISON
-# ifdef __GNUC__
-#  ifndef alloca
-#   define alloca __builtin_alloca
-#  endif
-# else
-#  if HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef __hpux
-void *alloca ();
-#   else
-#    ifdef __TURBOC__
-#     include <malloc.h>
-#    else
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-/* Bletch, ^^^^ that was ugly! */
-
-
-int pat, scnum, eps, headcnt, trailcnt, anyccl, lastchar, i, rulelen;
-int trlcontxt, xcluflg, currccl, cclsorted, varlength, variable_trail_rule;
-
-int *scon_stk;
-int scon_stk_ptr;
-
-static int madeany = false;  /* whether we've made the '.' character class */
-int previous_continued_action;	/* whether the previous rule's action was '|' */
-
-/* Expand a POSIX character class expression. */
-#define CCL_EXPR(func) \
-	{ \
-	int c; \
-	for ( c = 0; c < csize; ++c ) \
-		if ( isascii(c) && func(c) ) \
-			ccladd( currccl, c ); \
-	}
-
-/* While POSIX defines isblank(), it's not ANSI C. */
-#define IS_BLANK(c) ((c) == ' ' || (c) == '\t')
-
-/* On some over-ambitious machines, such as DEC Alpha's, the default
- * token type is "long" instead of "int"; this leads to problems with
- * declaring yylval in flexdef.h.  But so far, all the yacc's I've seen
- * wrap their definitions of YYSTYPE with "#ifndef YYSTYPE"'s, so the
- * following should ensure that the default token type is "int".
- */
-#define YYSTYPE int
-
-%}
-
-%%
-goal		:  initlex sect1 sect1end sect2 initforrule
-			{ /* add default rule */
-			int def_rule;
-
-			pat = cclinit();
-			cclnegate( pat );
-
-			def_rule = mkstate( -pat );
-
-			/* Remember the number of the default rule so we
-			 * don't generate "can't match" warnings for it.
-			 */
-			default_rule = num_rules;
-
-			finish_rule( def_rule, false, 0, 0 );
-
-			for ( i = 1; i <= lastsc; ++i )
-				scset[i] = mkbranch( scset[i], def_rule );
-
-			if ( spprdflt )
-				add_action(
-				"YY_FATAL_ERROR( \"flex scanner jammed\" )" );
-			else
-				add_action( "ECHO" );
-
-			add_action( ";\n\tYY_BREAK\n" );
-			}
-		;
-
-initlex		:
-			{ /* initialize for processing rules */
-
-			/* Create default DFA start condition. */
-			scinstal( "INITIAL", false );
-			}
-		;
-
-sect1		:  sect1 startconddecl namelist1
-		|  sect1 options
-		|
-		|  error
-			{ synerr( "unknown error processing section 1" ); }
-		;
-
-sect1end	:  SECTEND
-			{
-			check_options();
-			scon_stk = allocate_integer_array( lastsc + 1 );
-			scon_stk_ptr = 0;
-			}
-		;
-
-startconddecl	:  SCDECL
-			{ xcluflg = false; }
-
-		|  XSCDECL
-			{ xcluflg = true; }
-		;
-
-namelist1	:  namelist1 NAME
-			{ scinstal( nmstr, xcluflg ); }
-
-		|  NAME
-			{ scinstal( nmstr, xcluflg ); }
-
-		|  error
-			{ synerr( "bad start condition list" ); }
-		;
-
-options		:  OPTION_OP optionlist
-		;
-
-optionlist	:  optionlist option
-		|
-		;
-
-option		:  OPT_OUTFILE '=' NAME
-			{
-			outfilename = copy_string( nmstr );
-			did_outfilename = 1;
-			}
-		|  OPT_PREFIX '=' NAME
-			{ prefix = copy_string( nmstr ); }
-		|  OPT_YYCLASS '=' NAME
-			{ yyclass = copy_string( nmstr ); }
-		;
-
-sect2		:  sect2 scon initforrule flexrule '\n'
-			{ scon_stk_ptr = $2; }
-		|  sect2 scon '{' sect2 '}'
-			{ scon_stk_ptr = $2; }
-		|
-		;
-
-initforrule	:
-			{
-			/* Initialize for a parse of one rule. */
-			trlcontxt = variable_trail_rule = varlength = false;
-			trailcnt = headcnt = rulelen = 0;
-			current_state_type = STATE_NORMAL;
-			previous_continued_action = continued_action;
-			in_rule = true;
-
-			new_rule();
-			}
-		;
-
-flexrule	:  '^' rule
-			{
-			pat = $2;
-			finish_rule( pat, variable_trail_rule,
-				headcnt, trailcnt );
-
-			if ( scon_stk_ptr > 0 )
-				{
-				for ( i = 1; i <= scon_stk_ptr; ++i )
-					scbol[scon_stk[i]] =
-						mkbranch( scbol[scon_stk[i]],
-								pat );
-				}
-
-			else
-				{
-				/* Add to all non-exclusive start conditions,
-				 * including the default (0) start condition.
-				 */
-
-				for ( i = 1; i <= lastsc; ++i )
-					if ( ! scxclu[i] )
-						scbol[i] = mkbranch( scbol[i],
-									pat );
-				}
-
-			if ( ! bol_needed )
-				{
-				bol_needed = true;
-
-				if ( performance_report > 1 )
-					pinpoint_message(
-			"'^' operator results in sub-optimal performance" );
-				}
-			}
-
-		|  rule
-			{
-			pat = $1;
-			finish_rule( pat, variable_trail_rule,
-				headcnt, trailcnt );
-
-			if ( scon_stk_ptr > 0 )
-				{
-				for ( i = 1; i <= scon_stk_ptr; ++i )
-					scset[scon_stk[i]] =
-						mkbranch( scset[scon_stk[i]],
-								pat );
-				}
-
-			else
-				{
-				for ( i = 1; i <= lastsc; ++i )
-					if ( ! scxclu[i] )
-						scset[i] =
-							mkbranch( scset[i],
-								pat );
-				}
-			}
-
-		|  EOF_OP
-			{
-			if ( scon_stk_ptr > 0 )
-				build_eof_action();
-	
-			else
-				{
-				/* This EOF applies to all start conditions
-				 * which don't already have EOF actions.
-				 */
-				for ( i = 1; i <= lastsc; ++i )
-					if ( ! sceof[i] )
-						scon_stk[++scon_stk_ptr] = i;
-
-				if ( scon_stk_ptr == 0 )
-					warn(
-			"all start conditions already have <<EOF>> rules" );
-
-				else
-					build_eof_action();
-				}
-			}
-
-		|  error
-			{ synerr( "unrecognized rule" ); }
-		;
-
-scon_stk_ptr	:
-			{ $$ = scon_stk_ptr; }
-		;
-
-scon		:  '<' scon_stk_ptr namelist2 '>'
-			{ $$ = $2; }
-
-		|  '<' '*' '>'
-			{
-			$$ = scon_stk_ptr;
-
-			for ( i = 1; i <= lastsc; ++i )
-				{
-				int j;
-
-				for ( j = 1; j <= scon_stk_ptr; ++j )
-					if ( scon_stk[j] == i )
-						break;
-
-				if ( j > scon_stk_ptr )
-					scon_stk[++scon_stk_ptr] = i;
-				}
-			}
-
-		|
-			{ $$ = scon_stk_ptr; }
-		;
-
-namelist2	:  namelist2 ',' sconname
-
-		|  sconname
-
-		|  error
-			{ synerr( "bad start condition list" ); }
-		;
-
-sconname	:  NAME
-			{
-			if ( (scnum = sclookup( nmstr )) == 0 )
-				format_pinpoint_message(
-					"undeclared start condition %s",
-					nmstr );
-			else
-				{
-				for ( i = 1; i <= scon_stk_ptr; ++i )
-					if ( scon_stk[i] == scnum )
-						{
-						format_warn(
-							"<%s> specified twice",
-							scname[scnum] );
-						break;
-						}
-
-				if ( i > scon_stk_ptr )
-					scon_stk[++scon_stk_ptr] = scnum;
-				}
-			}
-		;
-
-rule		:  re2 re
-			{
-			if ( transchar[lastst[$2]] != SYM_EPSILON )
-				/* Provide final transition \now/ so it
-				 * will be marked as a trailing context
-				 * state.
-				 */
-				$2 = link_machines( $2,
-						mkstate( SYM_EPSILON ) );
-
-			mark_beginning_as_normal( $2 );
-			current_state_type = STATE_NORMAL;
-
-			if ( previous_continued_action )
-				{
-				/* We need to treat this as variable trailing
-				 * context so that the backup does not happen
-				 * in the action but before the action switch
-				 * statement.  If the backup happens in the
-				 * action, then the rules "falling into" this
-				 * one's action will *also* do the backup,
-				 * erroneously.
-				 */
-				if ( ! varlength || headcnt != 0 )
-					warn(
-		"trailing context made variable due to preceding '|' action" );
-
-				/* Mark as variable. */
-				varlength = true;
-				headcnt = 0;
-				}
-
-			if ( lex_compat || (varlength && headcnt == 0) )
-				{ /* variable trailing context rule */
-				/* Mark the first part of the rule as the
-				 * accepting "head" part of a trailing
-				 * context rule.
-				 *
-				 * By the way, we didn't do this at the
-				 * beginning of this production because back
-				 * then current_state_type was set up for a
-				 * trail rule, and add_accept() can create
-				 * a new state ...
-				 */
-				add_accept( $1,
-					num_rules | YY_TRAILING_HEAD_MASK );
-				variable_trail_rule = true;
-				}
-			
-			else
-				trailcnt = rulelen;
-
-			$$ = link_machines( $1, $2 );
-			}
-
-		|  re2 re '$'
-			{ synerr( "trailing context used twice" ); }
-
-		|  re '$'
-			{
-			headcnt = 0;
-			trailcnt = 1;
-			rulelen = 1;
-			varlength = false;
-
-			current_state_type = STATE_TRAILING_CONTEXT;
-
-			if ( trlcontxt )
-				{
-				synerr( "trailing context used twice" );
-				$$ = mkstate( SYM_EPSILON );
-				}
-
-			else if ( previous_continued_action )
-				{
-				/* See the comment in the rule for "re2 re"
-				 * above.
-				 */
-				warn(
-		"trailing context made variable due to preceding '|' action" );
-
-				varlength = true;
-				}
-
-			if ( lex_compat || varlength )
-				{
-				/* Again, see the comment in the rule for
-				 * "re2 re" above.
-				 */
-				add_accept( $1,
-					num_rules | YY_TRAILING_HEAD_MASK );
-				variable_trail_rule = true;
-				}
-
-			trlcontxt = true;
-
-			eps = mkstate( SYM_EPSILON );
-			$$ = link_machines( $1,
-				link_machines( eps, mkstate( '\n' ) ) );
-			}
-
-		|  re
-			{
-			$$ = $1;
-
-			if ( trlcontxt )
-				{
-				if ( lex_compat || (varlength && headcnt == 0) )
-					/* Both head and trail are
-					 * variable-length.
-					 */
-					variable_trail_rule = true;
-				else
-					trailcnt = rulelen;
-				}
-			}
-		;
-
-
-re		:  re '|' series
-			{
-			varlength = true;
-			$$ = mkor( $1, $3 );
-			}
-
-		|  series
-			{ $$ = $1; }
-		;
-
-
-re2		:  re '/'
-			{
-			/* This rule is written separately so the
-			 * reduction will occur before the trailing
-			 * series is parsed.
-			 */
-
-			if ( trlcontxt )
-				synerr( "trailing context used twice" );
-			else
-				trlcontxt = true;
-
-			if ( varlength )
-				/* We hope the trailing context is
-				 * fixed-length.
-				 */
-				varlength = false;
-			else
-				headcnt = rulelen;
-
-			rulelen = 0;
-
-			current_state_type = STATE_TRAILING_CONTEXT;
-			$$ = $1;
-			}
-		;
-
-series		:  series singleton
-			{
-			/* This is where concatenation of adjacent patterns
-			 * gets done.
-			 */
-			$$ = link_machines( $1, $2 );
-			}
-
-		|  singleton
-			{ $$ = $1; }
-		;
-
-singleton	:  singleton '*'
-			{
-			varlength = true;
-
-			$$ = mkclos( $1 );
-			}
-
-		|  singleton '+'
-			{
-			varlength = true;
-			$$ = mkposcl( $1 );
-			}
-
-		|  singleton '?'
-			{
-			varlength = true;
-			$$ = mkopt( $1 );
-			}
-
-		|  singleton '{' NUMBER ',' NUMBER '}'
-			{
-			varlength = true;
-
-			if ( $3 > $5 || $3 < 0 )
-				{
-				synerr( "bad iteration values" );
-				$$ = $1;
-				}
-			else
-				{
-				if ( $3 == 0 )
-					{
-					if ( $5 <= 0 )
-						{
-						synerr(
-						"bad iteration values" );
-						$$ = $1;
-						}
-					else
-						$$ = mkopt(
-							mkrep( $1, 1, $5 ) );
-					}
-				else
-					$$ = mkrep( $1, $3, $5 );
-				}
-			}
-
-		|  singleton '{' NUMBER ',' '}'
-			{
-			varlength = true;
-
-			if ( $3 <= 0 )
-				{
-				synerr( "iteration value must be positive" );
-				$$ = $1;
-				}
-
-			else
-				$$ = mkrep( $1, $3, INFINITY );
-			}
-
-		|  singleton '{' NUMBER '}'
-			{
-			/* The singleton could be something like "(foo)",
-			 * in which case we have no idea what its length
-			 * is, so we punt here.
-			 */
-			varlength = true;
-
-			if ( $3 <= 0 )
-				{
-				synerr( "iteration value must be positive" );
-				$$ = $1;
-				}
-
-			else
-				$$ = link_machines( $1,
-						copysingl( $1, $3 - 1 ) );
-			}
-
-		|  '.'
-			{
-			if ( ! madeany )
-				{
-				/* Create the '.' character class. */
-				anyccl = cclinit();
-				ccladd( anyccl, '\n' );
-				cclnegate( anyccl );
-
-				if ( useecs )
-					mkeccl( ccltbl + cclmap[anyccl],
-						ccllen[anyccl], nextecm,
-						ecgroup, csize, csize );
-
-				madeany = true;
-				}
-
-			++rulelen;
-
-			$$ = mkstate( -anyccl );
-			}
-
-		|  fullccl
-			{
-			if ( ! cclsorted )
-				/* Sort characters for fast searching.  We
-				 * use a shell sort since this list could
-				 * be large.
-				 */
-				cshell( ccltbl + cclmap[$1], ccllen[$1], true );
-
-			if ( useecs )
-				mkeccl( ccltbl + cclmap[$1], ccllen[$1],
-					nextecm, ecgroup, csize, csize );
-
-			++rulelen;
-
-			$$ = mkstate( -$1 );
-			}
-
-		|  PREVCCL
-			{
-			++rulelen;
-
-			$$ = mkstate( -$1 );
-			}
-
-		|  '"' string '"'
-			{ $$ = $2; }
-
-		|  '(' re ')'
-			{ $$ = $2; }
-
-		|  CHAR
-			{
-			++rulelen;
-
-			if ( caseins && $1 >= 'A' && $1 <= 'Z' )
-				$1 = clower( $1 );
-
-			$$ = mkstate( $1 );
-			}
-		;
-
-fullccl		:  '[' ccl ']'
-			{ $$ = $2; }
-
-		|  '[' '^' ccl ']'
-			{
-			cclnegate( $3 );
-			$$ = $3;
-			}
-		;
-
-ccl		:  ccl CHAR '-' CHAR
-			{
-			if ( caseins )
-				{
-				if ( $2 >= 'A' && $2 <= 'Z' )
-					$2 = clower( $2 );
-				if ( $4 >= 'A' && $4 <= 'Z' )
-					$4 = clower( $4 );
-				}
-
-			if ( $2 > $4 )
-				synerr( "negative range in character class" );
-
-			else
-				{
-				for ( i = $2; i <= $4; ++i )
-					ccladd( $1, i );
-
-				/* Keep track if this ccl is staying in
-				 * alphabetical order.
-				 */
-				cclsorted = cclsorted && ($2 > lastchar);
-				lastchar = $4;
-				}
-
-			$$ = $1;
-			}
-
-		|  ccl CHAR
-			{
-			if ( caseins && $2 >= 'A' && $2 <= 'Z' )
-				$2 = clower( $2 );
-
-			ccladd( $1, $2 );
-			cclsorted = cclsorted && ($2 > lastchar);
-			lastchar = $2;
-			$$ = $1;
-			}
-
-		|  ccl ccl_expr
-			{
-			/* Too hard to properly maintain cclsorted. */
-			cclsorted = false;
-			$$ = $1;
-			}
-
-		|
-			{
-			cclsorted = true;
-			lastchar = 0;
-			currccl = $$ = cclinit();
-			}
-		;
-
-ccl_expr:	   CCE_ALNUM	{ CCL_EXPR(isalnum) }
-		|  CCE_ALPHA	{ CCL_EXPR(isalpha) }
-		|  CCE_BLANK	{ CCL_EXPR(IS_BLANK) }
-		|  CCE_CNTRL	{ CCL_EXPR(iscntrl) }
-		|  CCE_DIGIT	{ CCL_EXPR(isdigit) }
-		|  CCE_GRAPH	{ CCL_EXPR(isgraph) }
-		|  CCE_LOWER	{ CCL_EXPR(islower) }
-		|  CCE_PRINT	{ CCL_EXPR(isprint) }
-		|  CCE_PUNCT	{ CCL_EXPR(ispunct) }
-		|  CCE_SPACE	{ CCL_EXPR(isspace) }
-		|  CCE_UPPER	{
-				if ( caseins )
-					CCL_EXPR(islower)
-				else
-					CCL_EXPR(isupper)
-				}
-		|  CCE_XDIGIT	{ CCL_EXPR(isxdigit) }
-		;
-		
-string		:  string CHAR
-			{
-			if ( caseins && $2 >= 'A' && $2 <= 'Z' )
-				$2 = clower( $2 );
-
-			++rulelen;
-
-			$$ = link_machines( $1, mkstate( $2 ) );
-			}
-
-		|
-			{ $$ = mkstate( SYM_EPSILON ); }
-		;
-
-%%
-
-
-/* build_eof_action - build the "<<EOF>>" action for the active start
- *                    conditions
- */
-
-void build_eof_action()
-	{
-	int i;
-	char action_text[MAXLINE];
-
-	for ( i = 1; i <= scon_stk_ptr; ++i )
-		{
-		if ( sceof[scon_stk[i]] )
-			format_pinpoint_message(
-				"multiple <<EOF>> rules for start condition %s",
-				scname[scon_stk[i]] );
-
-		else
-			{
-			sceof[scon_stk[i]] = true;
-			sprintf( action_text, "case YY_STATE_EOF(%s):\n",
-				scname[scon_stk[i]] );
-			add_action( action_text );
-			}
-		}
-
-	line_directive_out( (FILE *) 0, 1 );
-
-	/* This isn't a normal rule after all - don't count it as
-	 * such, so we don't have any holes in the rule numbering
-	 * (which make generating "rule can never match" warnings
-	 * more difficult.
-	 */
-	--num_rules;
-	++num_eof_rules;
-	}
-
-
-/* format_synerr - write out formatted syntax error */
-
-void format_synerr( msg, arg )
-char msg[], arg[];
-	{
-	char errmsg[MAXLINE];
-
-	(void) sprintf( errmsg, msg, arg );
-	synerr( errmsg );
-	}
-
-
-/* synerr - report a syntax error */
-
-void synerr( str )
-char str[];
-	{
-	syntaxerror = true;
-	pinpoint_message( str );
-	}
-
-
-/* format_warn - write out formatted warning */
-
-void format_warn( msg, arg )
-char msg[], arg[];
-	{
-	char warn_msg[MAXLINE];
-
-	(void) sprintf( warn_msg, msg, arg );
-	warn( warn_msg );
-	}
-
-
-/* warn - report a warning, unless -w was given */
-
-void warn( str )
-char str[];
-	{
-	line_warning( str, linenum );
-	}
-
-/* format_pinpoint_message - write out a message formatted with one string,
- *			     pinpointing its location
- */
-
-void format_pinpoint_message( msg, arg )
-char msg[], arg[];
-	{
-	char errmsg[MAXLINE];
-
-	(void) sprintf( errmsg, msg, arg );
-	pinpoint_message( errmsg );
-	}
-
-
-/* pinpoint_message - write out a message, pinpointing its location */
-
-void pinpoint_message( str )
-char str[];
-	{
-	line_pinpoint( str, linenum );
-	}
-
-
-/* line_warning - report a warning at a given line, unless -w was given */
-
-void line_warning( str, line )
-char str[];
-int line;
-	{
-	char warning[MAXLINE];
-
-	if ( ! nowarn )
-		{
-		sprintf( warning, "warning, %s", str );
-		line_pinpoint( warning, line );
-		}
-	}
-
-
-/* line_pinpoint - write out a message, pinpointing it at the given line */
-
-void line_pinpoint( str, line )
-char str[];
-int line;
-	{
-	fprintf( stderr, "\"%s\", line %d: %s\n", infilename, line, str );
-	}
-
-
-/* yyerror - eat up an error message from the parser;
- *	     currently, messages are ignore
- */
-
-void yyerror( msg )
-char msg[];
-	{
-	}
diff --git a/usr.bin/lex/scan.l b/usr.bin/lex/scan.l
deleted file mode 100644
index b109a50..0000000
--- a/usr.bin/lex/scan.l
+++ /dev/null
@@ -1,711 +0,0 @@
-/* scan.l - scanner for flex input */
-
-%{
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Vern Paxson.
- * 
- * The United States Government has rights in this work pursuant
- * to contract no. DE-AC03-76SF00098 between the United States
- * Department of Energy and the University of California.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* $Header: /home/daffy/u0/vern/flex/RCS/scan.l,v 2.56 95/04/24 12:17:19 vern Exp $ */
-/* $FreeBSD$ */
-
-#include "flexdef.h"
-#include "parse.h"
-
-#define ACTION_ECHO add_action( yytext )
-#define ACTION_IFDEF(def, should_define) \
-	{ \
-	if ( should_define ) \
-		action_define( def, 1 ); \
-	}
-
-#define MARK_END_OF_PROLOG mark_prolog();
-
-#define YY_DECL \
-	int flexscan()
-
-#define RETURNCHAR \
-	yylval = (unsigned char) yytext[0]; \
-	return CHAR;
-
-#define RETURNNAME \
-	strcpy( nmstr, yytext ); \
-	return NAME;
-
-#define PUT_BACK_STRING(str, start) \
-	for ( i = strlen( str ) - 1; i >= start; --i ) \
-		unput((str)[i])
-
-#define CHECK_REJECT(str) \
-	if ( all_upper( str ) ) \
-		reject = true;
-
-#define CHECK_YYMORE(str) \
-	if ( all_lower( str ) ) \
-		yymore_used = true;
-%}
-
-%option caseless nodefault outfile="scan.c" stack noyy_top_state
-%option nostdinit
-
-%x SECT2 SECT2PROLOG SECT3 CODEBLOCK PICKUPDEF SC CARETISBOL NUM QUOTE
-%x FIRSTCCL CCL ACTION RECOVER COMMENT ACTION_STRING PERCENT_BRACE_ACTION
-%x OPTION LINEDIR
-
-WS		[[:blank:]]+
-OPTWS		[[:blank:]]*
-NOT_WS		[^[:blank:]\n]
-
-NL		\r?\n
-
-NAME		([[:alpha:]_][[:alnum:]_-]*)
-NOT_NAME	[^[:alpha:]_*\n]+
-
-SCNAME		{NAME}
-
-ESCSEQ		(\\([^\n]|[0-7]{1,3}|x[[:xdigit:]]{1,2}))
-
-FIRST_CCL_CHAR	([^\\\n]|{ESCSEQ})
-CCL_CHAR	([^\\\n\]]|{ESCSEQ})
-CCL_EXPR	("[:"[[:alpha:]]+":]")
-
-LEXOPT		[aceknopr]
-
-%%
-	static int bracelevel, didadef, indented_code;
-	static int doing_rule_action = false;
-	static int option_sense;
-
-	int doing_codeblock = false;
-	int i;
-	Char nmdef[MAXLINE], myesc();
-
-
-<INITIAL>{
-	^{WS}		indented_code = true; BEGIN(CODEBLOCK);
-	^"/*"		ACTION_ECHO; yy_push_state( COMMENT );
-	^#{OPTWS}line{WS}	yy_push_state( LINEDIR );
-	^"%s"{NAME}?	return SCDECL;
-	^"%x"{NAME}?	return XSCDECL;
-	^"%{".*{NL}	{
-			++linenum;
-			line_directive_out( (FILE *) 0, 1 );
-			indented_code = false;
-			BEGIN(CODEBLOCK);
-			}
-
-	{WS}		/* discard */
-
-	^"%%".*		{
-			sectnum = 2;
-			bracelevel = 0;
-			mark_defs1();
-			line_directive_out( (FILE *) 0, 1 );
-			BEGIN(SECT2PROLOG);
-			return SECTEND;
-			}
-
-	^"%pointer".*{NL}	yytext_is_array = false; ++linenum;
-	^"%array".*{NL}		yytext_is_array = true; ++linenum;
-
-	^"%option"	BEGIN(OPTION); return OPTION_OP;
-
-	^"%"{LEXOPT}{OPTWS}[[:digit:]]*{OPTWS}{NL}	++linenum; /* ignore */
-	^"%"{LEXOPT}{WS}.*{NL}	++linenum;	/* ignore */
-
-	^"%"[^sxaceknopr{}].*	synerr( _( "unrecognized '%' directive" ) );
-
-	^{NAME}		{
-			strcpy( nmstr, yytext );
-			didadef = false;
-			BEGIN(PICKUPDEF);
-			}
-
-	{SCNAME}	RETURNNAME;
-	^{OPTWS}{NL}	++linenum; /* allows blank lines in section 1 */
-	{OPTWS}{NL}	ACTION_ECHO; ++linenum; /* maybe end of comment line */
-}
-
-
-<COMMENT>{
-	"*/"		ACTION_ECHO; yy_pop_state();
-	"*"		ACTION_ECHO;
-	[^*\n]+		ACTION_ECHO;
-	[^*\n]*{NL}	++linenum; ACTION_ECHO;
-}
-
-<LINEDIR>{
-	\n		yy_pop_state();
-	[[:digit:]]+	linenum = myctoi( yytext );
-
-	\"[^"\n]*\"	{
-			flex_free( (void *) infilename );
-			infilename = copy_string( yytext + 1 );
-			infilename[strlen( infilename ) - 1] = '\0';
-			}
-	.		/* ignore spurious characters */
-}
-
-<CODEBLOCK>{
-	^"%}".*{NL}	++linenum; BEGIN(INITIAL);
-
-	{NAME}|{NOT_NAME}|.	ACTION_ECHO;
-
-	{NL}		{
-			++linenum;
-			ACTION_ECHO;
-			if ( indented_code )
-				BEGIN(INITIAL);
-			}
-}
-
-
-<PICKUPDEF>{
-	{WS}		/* separates name and definition */
-
-	{NOT_WS}.*	{
-			strcpy( (char *) nmdef, yytext );
-
-			/* Skip trailing whitespace. */
-			for ( i = strlen( (char *) nmdef ) - 1;
-			      i >= 0 && (nmdef[i] == ' ' || nmdef[i] == '\t');
-			      --i )
-				;
-
-			nmdef[i + 1] = '\0';
-
-			ndinstal( nmstr, nmdef );
-			didadef = true;
-			}
-
-	{NL}		{
-			if ( ! didadef )
-				synerr( _( "incomplete name definition" ) );
-			BEGIN(INITIAL);
-			++linenum;
-			}
-}
-
-
-<OPTION>{
-	{NL}		++linenum; BEGIN(INITIAL);
-	{WS}		option_sense = true;
-
-	"="		return '=';
-
-	no		option_sense = ! option_sense;
-
-	7bit		csize = option_sense ? 128 : 256;
-	8bit		csize = option_sense ? 256 : 128;
-
-	align		long_align = option_sense;
-	always-interactive	{
-			action_define( "YY_ALWAYS_INTERACTIVE", option_sense );
-			}
-	array		yytext_is_array = option_sense;
-	backup		backing_up_report = option_sense;
-	batch		interactive = ! option_sense;
-	"c++"		C_plus_plus = option_sense;
-	caseful|case-sensitive		caseins = ! option_sense;
-	caseless|case-insensitive	caseins = option_sense;
-	debug		ddebug = option_sense;
-	default		spprdflt = ! option_sense;
-	ecs		useecs = option_sense;
-	fast		{
-			useecs = usemecs = false;
-			use_read = fullspd = true;
-			}
-	full		{
-			useecs = usemecs = false;
-			use_read = fulltbl = true;
-			}
-	input		ACTION_IFDEF("YY_NO_INPUT", ! option_sense);
-	interactive	interactive = option_sense;
-	lex-compat	lex_compat = option_sense;
-	main		{
-			action_define( "YY_MAIN", option_sense );
-			do_yywrap = ! option_sense;
-			}
-	meta-ecs	usemecs = option_sense;
-	never-interactive	{
-			action_define( "YY_NEVER_INTERACTIVE", option_sense );
-			}
-	perf-report	performance_report += option_sense ? 1 : -1;
-	pointer		yytext_is_array = ! option_sense;
-	read		use_read = option_sense;
-	reject		reject_really_used = option_sense;
-	stack		action_define( "YY_STACK_USED", option_sense );
-	stdinit		do_stdinit = option_sense;
-	stdout		use_stdout = option_sense;
-	unput		ACTION_IFDEF("YY_NO_UNPUT", ! option_sense);
-	verbose		printstats = option_sense;
-	warn		nowarn = ! option_sense;
-	yylineno	do_yylineno = option_sense;
-	yymore		yymore_really_used = option_sense;
-	yywrap		do_yywrap = option_sense;
-
-	yy_push_state	ACTION_IFDEF("YY_NO_PUSH_STATE", ! option_sense);
-	yy_pop_state	ACTION_IFDEF("YY_NO_POP_STATE", ! option_sense);
-	yy_top_state	ACTION_IFDEF("YY_NO_TOP_STATE", ! option_sense);
-
-	yy_scan_buffer	ACTION_IFDEF("YY_NO_SCAN_BUFFER", ! option_sense);
-	yy_scan_bytes	ACTION_IFDEF("YY_NO_SCAN_BYTES", ! option_sense);
-	yy_scan_string	ACTION_IFDEF("YY_NO_SCAN_STRING", ! option_sense);
-
-	outfile		return OPT_OUTFILE;
-	prefix		return OPT_PREFIX;
-	yyclass		return OPT_YYCLASS;
-
-	\"[^"\n]*\"	{
-			strcpy( nmstr, yytext + 1 );
-			nmstr[strlen( nmstr ) - 1] = '\0';
-			return NAME;
-			}
-
-	(([a-mo-z]|n[a-np-z])[[:alpha:]\-+]*)|.	{
-			format_synerr( _( "unrecognized %%option: %s" ),
-				yytext );
-			BEGIN(RECOVER);
-			}
-}
-
-<RECOVER>.*{NL}		++linenum; BEGIN(INITIAL);
-
-
-<SECT2PROLOG>{
-	^"%{".*	++bracelevel; yyless( 2 );	/* eat only %{ */
-	^"%}".*	--bracelevel; yyless( 2 );	/* eat only %} */
-
-	^{WS}.*	ACTION_ECHO;	/* indented code in prolog */
-
-	^{NOT_WS}.*	{	/* non-indented code */
-			if ( bracelevel <= 0 )
-				{ /* not in %{ ... %} */
-				yyless( 0 );	/* put it all back */
-				yy_set_bol( 1 );
-				mark_prolog();
-				BEGIN(SECT2);
-				}
-			else
-				ACTION_ECHO;
-			}
-
-	.*		ACTION_ECHO;
-	{NL}	++linenum; ACTION_ECHO;
-
-	<<EOF>>		{
-			mark_prolog();
-			sectnum = 0;
-			yyterminate(); /* to stop the parser */
-			}
-}
-
-<SECT2>{
-	^{OPTWS}{NL}	++linenum; /* allow blank lines in section 2 */
-
-	^{OPTWS}"%{"	{
-			indented_code = false;
-			doing_codeblock = true;
-			bracelevel = 1;
-			BEGIN(PERCENT_BRACE_ACTION);
-			}
-
-	^{OPTWS}"<"	BEGIN(SC); return '<';
-	^{OPTWS}"^"	return '^';
-	\"		BEGIN(QUOTE); return '"';
-	"{"/[[:digit:]]	BEGIN(NUM); return '{';
-	"$"/([[:blank:]]|{NL})	return '$';
-
-	{WS}"%{"		{
-			bracelevel = 1;
-			BEGIN(PERCENT_BRACE_ACTION);
-
-			if ( in_rule )
-				{
-				doing_rule_action = true;
-				in_rule = false;
-				return '\n';
-				}
-			}
-	{WS}"|".*{NL}	continued_action = true; ++linenum; return '\n';
-
-	^{WS}"/*"	{
-			yyless( yyleng - 2 );	/* put back '/', '*' */
-			bracelevel = 0;
-			continued_action = false;
-			BEGIN(ACTION);
-			}
-
-	^{WS}		/* allow indented rules */
-
-	{WS}		{
-			/* This rule is separate from the one below because
-			 * otherwise we get variable trailing context, so
-			 * we can't build the scanner using -{f,F}.
-			 */
-			bracelevel = 0;
-			continued_action = false;
-			BEGIN(ACTION);
-
-			if ( in_rule )
-				{
-				doing_rule_action = true;
-				in_rule = false;
-				return '\n';
-				}
-			}
-
-	{OPTWS}{NL}	{
-			bracelevel = 0;
-			continued_action = false;
-			BEGIN(ACTION);
-			unput( '\n' );	/* so <ACTION> sees it */
-
-			if ( in_rule )
-				{
-				doing_rule_action = true;
-				in_rule = false;
-				return '\n';
-				}
-			}
-
-	^{OPTWS}"<<EOF>>"	|
-	"<<EOF>>"	return EOF_OP;
-
-	^"%%".*		{
-			sectnum = 3;
-			BEGIN(SECT3);
-			yyterminate(); /* to stop the parser */
-			}
-
-	"["({FIRST_CCL_CHAR}|{CCL_EXPR})({CCL_CHAR}|{CCL_EXPR})*	{
-			int cclval;
-
-			strcpy( nmstr, yytext );
-
-			/* Check to see if we've already encountered this
-			 * ccl.
-			 */
-			if ( (cclval = ccllookup( (Char *) nmstr )) != 0 )
-				{
-				if ( input() != ']' )
-					synerr( _( "bad character class" ) );
-
-				yylval = cclval;
-				++cclreuse;
-				return PREVCCL;
-				}
-			else
-				{
-				/* We fudge a bit.  We know that this ccl will
-				 * soon be numbered as lastccl + 1 by cclinit.
-				 */
-				cclinstal( (Char *) nmstr, lastccl + 1 );
-
-				/* Push back everything but the leading bracket
-				 * so the ccl can be rescanned.
-				 */
-				yyless( 1 );
-
-				BEGIN(FIRSTCCL);
-				return '[';
-				}
-			}
-
-	"{"{NAME}"}"	{
-			Char *nmdefptr;
-			Char *ndlookup();
-
-			strcpy( nmstr, yytext + 1 );
-			nmstr[yyleng - 2] = '\0';  /* chop trailing brace */
-
-			if ( (nmdefptr = ndlookup( nmstr )) == 0 )
-				format_synerr(
-					_( "undefined definition {%s}" ),
-						nmstr );
-
-			else
-				{ /* push back name surrounded by ()'s */
-				int len = strlen( (char *) nmdefptr );
-
-				if ( lex_compat || nmdefptr[0] == '^' ||
-				     (len > 0 && nmdefptr[len - 1] == '$') )
-					{ /* don't use ()'s after all */
-					PUT_BACK_STRING((char *) nmdefptr, 0);
-
-					if ( nmdefptr[0] == '^' )
-						BEGIN(CARETISBOL);
-					}
-
-				else
-					{
-					unput(')');
-					PUT_BACK_STRING((char *) nmdefptr, 0);
-					unput('(');
-					}
-				}
-			}
-
-	[/|*+?.(){}]	return (unsigned char) yytext[0];
-	.		RETURNCHAR;
-}
-
-
-<SC>{
-	[,*]		return (unsigned char) yytext[0];
-	">"		BEGIN(SECT2); return '>';
-	">"/^		BEGIN(CARETISBOL); return '>';
-	{SCNAME}	RETURNNAME;
-	.		{
-			format_synerr( _( "bad <start condition>: %s" ),
-				yytext );
-			}
-}
-
-<CARETISBOL>"^"		BEGIN(SECT2); return '^';
-
-
-<QUOTE>{
-	[^"\n]		RETURNCHAR;
-	\"		BEGIN(SECT2); return '"';
-
-	{NL}		{
-			synerr( _( "missing quote" ) );
-			BEGIN(SECT2);
-			++linenum;
-			return '"';
-			}
-}
-
-
-<FIRSTCCL>{
-	"^"/[^-\]\n]	BEGIN(CCL); return '^';
-	"^"/("-"|"]")	return '^';
-	.		BEGIN(CCL); RETURNCHAR;
-}
-
-<CCL>{
-	-/[^\]\n]	return '-';
-	[^\]\n]		RETURNCHAR;
-	"]"		BEGIN(SECT2); return ']';
-	.|{NL}		{
-			synerr( _( "bad character class" ) );
-			BEGIN(SECT2);
-			return ']';
-			}
-}
-
-<FIRSTCCL,CCL>{
-	"[:alnum:]"	BEGIN(CCL); return CCE_ALNUM;
-	"[:alpha:]"	BEGIN(CCL); return CCE_ALPHA;
-	"[:blank:]"	BEGIN(CCL); return CCE_BLANK;
-	"[:cntrl:]"	BEGIN(CCL); return CCE_CNTRL;
-	"[:digit:]"	BEGIN(CCL); return CCE_DIGIT;
-	"[:graph:]"	BEGIN(CCL); return CCE_GRAPH;
-	"[:lower:]"	BEGIN(CCL); return CCE_LOWER;
-	"[:print:]"	BEGIN(CCL); return CCE_PRINT;
-	"[:punct:]"	BEGIN(CCL); return CCE_PUNCT;
-	"[:space:]"	BEGIN(CCL); return CCE_SPACE;
-	"[:upper:]"	BEGIN(CCL); return CCE_UPPER;
-	"[:xdigit:]"	BEGIN(CCL); return CCE_XDIGIT;
-	{CCL_EXPR}	{
-			format_synerr(
-				_( "bad character class expression: %s" ),
-					yytext );
-			BEGIN(CCL); return CCE_ALNUM;
-			}
-}
-
-<NUM>{
-	[[:digit:]]+	{
-			yylval = myctoi( yytext );
-			return NUMBER;
-			}
-
-	","		return ',';
-	"}"		BEGIN(SECT2); return '}';
-
-	.		{
-			synerr( _( "bad character inside {}'s" ) );
-			BEGIN(SECT2);
-			return '}';
-			}
-
-	{NL}		{
-			synerr( _( "missing }" ) );
-			BEGIN(SECT2);
-			++linenum;
-			return '}';
-			}
-}
-
-
-<PERCENT_BRACE_ACTION>{
-	{OPTWS}"%}".*		bracelevel = 0;
-
-	<ACTION>"/*"		ACTION_ECHO; yy_push_state( COMMENT );
-
-	<CODEBLOCK,ACTION>{
-		"reject"	{
-			ACTION_ECHO;
-			CHECK_REJECT(yytext);
-			}
-		"yymore"	{
-			ACTION_ECHO;
-			CHECK_YYMORE(yytext);
-			}
-	}
-
-	{NAME}|{NOT_NAME}|.	ACTION_ECHO;
-	{NL}		{
-			++linenum;
-			ACTION_ECHO;
-			if ( bracelevel == 0 ||
-			     (doing_codeblock && indented_code) )
-				{
-				if ( doing_rule_action )
-					add_action( "\tYY_BREAK\n" );
-
-				doing_rule_action = doing_codeblock = false;
-				BEGIN(SECT2);
-				}
-			}
-}
-
-
-	/* Reject and YYmore() are checked for above, in PERCENT_BRACE_ACTION */
-<ACTION>{
-	"{"		ACTION_ECHO; ++bracelevel;
-	"}"		ACTION_ECHO; --bracelevel;
-	[^[:alpha:]_{}"'/\n]+	ACTION_ECHO;
-	{NAME}		ACTION_ECHO;
-	"'"([^'\\\n]|\\.)*"'"	ACTION_ECHO; /* character constant */
-	\"		ACTION_ECHO; BEGIN(ACTION_STRING);
-	{NL}		{
-			++linenum;
-			ACTION_ECHO;
-			if ( bracelevel == 0 )
-				{
-				if ( doing_rule_action )
-					add_action( "\tYY_BREAK\n" );
-
-				doing_rule_action = false;
-				BEGIN(SECT2);
-				}
-			}
-	.		ACTION_ECHO;
-}
-
-<ACTION_STRING>{
-	[^"\\\n]+	ACTION_ECHO;
-	\\.		ACTION_ECHO;
-	{NL}		++linenum; ACTION_ECHO;
-	\"		ACTION_ECHO; BEGIN(ACTION);
-	.		ACTION_ECHO;
-}
-
-<COMMENT,ACTION,ACTION_STRING><<EOF>>	{
-			synerr( _( "EOF encountered inside an action" ) );
-			yyterminate();
-			}
-
-
-<SECT2,QUOTE,FIRSTCCL,CCL>{ESCSEQ}	{
-			yylval = myesc( (Char *) yytext );
-
-			if ( YY_START == FIRSTCCL )
-				BEGIN(CCL);
-
-			return CHAR;
-			}
-
-
-<SECT3>{
-	.*(\n?)		ECHO;
-	<<EOF>>		sectnum = 0; yyterminate();
-}
-
-<*>.|\n			format_synerr( _( "bad character: %s" ), yytext );
-
-%%
-
-
-int yywrap()
-	{
-	if ( --num_input_files > 0 )
-		{
-		set_input_file( *++input_files );
-		return 0;
-		}
-
-	else
-		return 1;
-	}
-
-
-/* set_input_file - open the given file (if NULL, stdin) for scanning */
-
-void set_input_file( file )
-char *file;
-	{
-	if ( file && strcmp( file, "-" ) )
-		{
-		infilename = copy_string( file );
-		yyin = fopen( infilename, "r" );
-
-		if ( yyin == NULL )
-			lerrsf( _( "can't open %s" ), file );
-		}
-
-	else
-		{
-		yyin = stdin;
-		infilename = copy_string( "<stdin>" );
-		}
-
-	linenum = 1;
-	}
-
-
-/* Wrapper routines for accessing the scanner's malloc routines. */
-
-void *flex_alloc( size )
-size_t size;
-	{
-	return (void *) malloc( size );
-	}
-
-void *flex_realloc( ptr, size )
-void *ptr;
-size_t size;
-	{
-	return (void *) realloc( ptr, size );
-	}
-
-void flex_free( ptr )
-void *ptr;
-	{
-	if ( ptr )
-		free( ptr );
-	}
diff --git a/usr.bin/lex/sym.c b/usr.bin/lex/sym.c
deleted file mode 100644
index 2f43b50..0000000
--- a/usr.bin/lex/sym.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/* sym - symbol table routines */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Vern Paxson.
- * 
- * The United States Government has rights in this work pursuant
- * to contract no. DE-AC03-76SF00098 between the United States
- * Department of Energy and the University of California.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* $Header: /home/daffy/u0/vern/flex/RCS/sym.c,v 2.19 95/03/04 16:11:04 vern Exp $ */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "flexdef.h"
-
-
-/* declare functions that have forward references */
-
-int hashfunct PROTO((char[], int));
-
-
-struct hash_entry *ndtbl[NAME_TABLE_HASH_SIZE];
-struct hash_entry *sctbl[START_COND_HASH_SIZE];
-struct hash_entry *ccltab[CCL_HASH_SIZE];
-
-struct hash_entry *findsym();
-
-
-/* addsym - add symbol and definitions to symbol table
- *
- * -1 is returned if the symbol already exists, and the change not made.
- */
-
-int addsym( sym, str_def, int_def, table, table_size )
-char sym[];
-char *str_def;
-int int_def;
-hash_table table;
-int table_size;
-	{
-	int hash_val = hashfunct( sym, table_size );
-	struct hash_entry *sym_entry = table[hash_val];
-	struct hash_entry *new_entry;
-	struct hash_entry *successor;
-
-	while ( sym_entry )
-		{
-		if ( ! strcmp( sym, sym_entry->name ) )
-			{ /* entry already exists */
-			return -1;
-			}
-
-		sym_entry = sym_entry->next;
-		}
-
-	/* create new entry */
-	new_entry = (struct hash_entry *)
-		flex_alloc( sizeof( struct hash_entry ) );
-
-	if ( new_entry == NULL )
-		flexfatal( _( "symbol table memory allocation failed" ) );
-
-	if ( (successor = table[hash_val]) != 0 )
-		{
-		new_entry->next = successor;
-		successor->prev = new_entry;
-		}
-	else
-		new_entry->next = NULL;
-
-	new_entry->prev = NULL;
-	new_entry->name = sym;
-	new_entry->str_val = str_def;
-	new_entry->int_val = int_def;
-
-	table[hash_val] = new_entry;
-
-	return 0;
-	}
-
-
-/* cclinstal - save the text of a character class */
-
-void cclinstal( ccltxt, cclnum )
-Char ccltxt[];
-int cclnum;
-	{
-	/* We don't bother checking the return status because we are not
-	 * called unless the symbol is new.
-	 */
-	Char *copy_unsigned_string();
-
-	(void) addsym( (char *) copy_unsigned_string( ccltxt ),
-			(char *) 0, cclnum,
-			ccltab, CCL_HASH_SIZE );
-	}
-
-
-/* ccllookup - lookup the number associated with character class text
- *
- * Returns 0 if there's no CCL associated with the text.
- */
-
-int ccllookup( ccltxt )
-Char ccltxt[];
-	{
-	return findsym( (char *) ccltxt, ccltab, CCL_HASH_SIZE )->int_val;
-	}
-
-
-/* findsym - find symbol in symbol table */
-
-struct hash_entry *findsym( sym, table, table_size )
-char sym[];
-hash_table table;
-int table_size;
-	{
-	static struct hash_entry empty_entry =
-		{
-		(struct hash_entry *) 0, (struct hash_entry *) 0,
-		(char *) 0, (char *) 0, 0,
-		} ;
-	struct hash_entry *sym_entry =
-		table[hashfunct( sym, table_size )];
-
-	while ( sym_entry )
-		{
-		if ( ! strcmp( sym, sym_entry->name ) )
-			return sym_entry;
-		sym_entry = sym_entry->next;
-		}
-
-	return &empty_entry;
-	}
-
-
-/* hashfunct - compute the hash value for "str" and hash size "hash_size" */
-
-int hashfunct( str, hash_size )
-char str[];
-int hash_size;
-	{
-	int hashval;
-	int locstr;
-
-	hashval = 0;
-	locstr = 0;
-
-	while ( str[locstr] )
-		{
-		hashval = (hashval << 1) + (unsigned char) str[locstr++];
-		hashval %= hash_size;
-		}
-
-	return hashval;
-	}
-
-
-/* ndinstal - install a name definition */
-
-void ndinstal( name, definition )
-char name[];
-Char definition[];
-	{
-	char *copy_string();
-	Char *copy_unsigned_string();
-
-	if ( addsym( copy_string( name ),
-			(char *) copy_unsigned_string( definition ), 0,
-			ndtbl, NAME_TABLE_HASH_SIZE ) )
-		synerr( _( "name defined twice" ) );
-	}
-
-
-/* ndlookup - lookup a name definition
- *
- * Returns a nil pointer if the name definition does not exist.
- */
-
-Char *ndlookup( nd )
-char nd[];
-	{
-	return (Char *) findsym( nd, ndtbl, NAME_TABLE_HASH_SIZE )->str_val;
-	}
-
-
-/* scextend - increase the maximum number of start conditions */
-
-void scextend()
-	{
-	current_max_scs += MAX_SCS_INCREMENT;
-
-	++num_reallocs;
-
-	scset = reallocate_integer_array( scset, current_max_scs );
-	scbol = reallocate_integer_array( scbol, current_max_scs );
-	scxclu = reallocate_integer_array( scxclu, current_max_scs );
-	sceof = reallocate_integer_array( sceof, current_max_scs );
-	scname = reallocate_char_ptr_array( scname, current_max_scs );
-	}
-
-
-/* scinstal - make a start condition
- *
- * NOTE
- *    The start condition is "exclusive" if xcluflg is true.
- */
-
-void scinstal( str, xcluflg )
-char str[];
-int xcluflg;
-	{
-	char *copy_string();
-
-	/* Generate start condition definition, for use in BEGIN et al. */
-	action_define( str, lastsc );
-
-	if ( ++lastsc >= current_max_scs )
-		scextend();
-
-	scname[lastsc] = copy_string( str );
-
-	if ( addsym( scname[lastsc], (char *) 0, lastsc,
-			sctbl, START_COND_HASH_SIZE ) )
-		format_pinpoint_message(
-				_( "start condition %s declared twice" ),
-					str );
-
-	scset[lastsc] = mkstate( SYM_EPSILON );
-	scbol[lastsc] = mkstate( SYM_EPSILON );
-	scxclu[lastsc] = xcluflg;
-	sceof[lastsc] = false;
-	}
-
-
-/* sclookup - lookup the number associated with a start condition
- *
- * Returns 0 if no such start condition.
- */
-
-int sclookup( str )
-char str[];
-	{
-	return findsym( str, sctbl, START_COND_HASH_SIZE )->int_val;
-	}
diff --git a/usr.bin/lex/tblcmp.c b/usr.bin/lex/tblcmp.c
deleted file mode 100644
index d5d623d..0000000
--- a/usr.bin/lex/tblcmp.c
+++ /dev/null
@@ -1,889 +0,0 @@
-/* tblcmp - table compression routines */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Vern Paxson.
- * 
- * The United States Government has rights in this work pursuant
- * to contract no. DE-AC03-76SF00098 between the United States
- * Department of Energy and the University of California.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* $Header: /home/daffy/u0/vern/flex/RCS/tblcmp.c,v 2.11 94/11/05 17:08:28 vern Exp $ */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "flexdef.h"
-
-
-/* declarations for functions that have forward references */
-
-void mkentry PROTO((int*, int, int, int, int));
-void mkprot PROTO((int[], int, int));
-void mktemplate PROTO((int[], int, int));
-void mv2front PROTO((int));
-int tbldiff PROTO((int[], int, int[]));
-
-
-/* bldtbl - build table entries for dfa state
- *
- * synopsis
- *   int state[numecs], statenum, totaltrans, comstate, comfreq;
- *   bldtbl( state, statenum, totaltrans, comstate, comfreq );
- *
- * State is the statenum'th dfa state.  It is indexed by equivalence class and
- * gives the number of the state to enter for a given equivalence class.
- * totaltrans is the total number of transitions out of the state.  Comstate
- * is that state which is the destination of the most transitions out of State.
- * Comfreq is how many transitions there are out of State to Comstate.
- *
- * A note on terminology:
- *    "protos" are transition tables which have a high probability of
- * either being redundant (a state processed later will have an identical
- * transition table) or nearly redundant (a state processed later will have
- * many of the same out-transitions).  A "most recently used" queue of
- * protos is kept around with the hope that most states will find a proto
- * which is similar enough to be usable, and therefore compacting the
- * output tables.
- *    "templates" are a special type of proto.  If a transition table is
- * homogeneous or nearly homogeneous (all transitions go to the same
- * destination) then the odds are good that future states will also go
- * to the same destination state on basically the same character set.
- * These homogeneous states are so common when dealing with large rule
- * sets that they merit special attention.  If the transition table were
- * simply made into a proto, then (typically) each subsequent, similar
- * state will differ from the proto for two out-transitions.  One of these
- * out-transitions will be that character on which the proto does not go
- * to the common destination, and one will be that character on which the
- * state does not go to the common destination.  Templates, on the other
- * hand, go to the common state on EVERY transition character, and therefore
- * cost only one difference.
- */
-
-void bldtbl( state, statenum, totaltrans, comstate, comfreq )
-int state[], statenum, totaltrans, comstate, comfreq;
-	{
-	int extptr, extrct[2][CSIZE + 1];
-	int mindiff, minprot, i, d;
-
-	/* If extptr is 0 then the first array of extrct holds the result
-	 * of the "best difference" to date, which is those transitions
-	 * which occur in "state" but not in the proto which, to date,
-	 * has the fewest differences between itself and "state".  If
-	 * extptr is 1 then the second array of extrct hold the best
-	 * difference.  The two arrays are toggled between so that the
-	 * best difference to date can be kept around and also a difference
-	 * just created by checking against a candidate "best" proto.
-	 */
-
-	extptr = 0;
-
-	/* If the state has too few out-transitions, don't bother trying to
-	 * compact its tables.
-	 */
-
-	if ( (totaltrans * 100) < (numecs * PROTO_SIZE_PERCENTAGE) )
-		mkentry( state, numecs, statenum, JAMSTATE, totaltrans );
-
-	else
-		{
-		/* "checkcom" is true if we should only check "state" against
-		 * protos which have the same "comstate" value.
-		 */
-		int checkcom =
-			comfreq * 100 > totaltrans * CHECK_COM_PERCENTAGE;
-
-		minprot = firstprot;
-		mindiff = totaltrans;
-
-		if ( checkcom )
-			{
-			/* Find first proto which has the same "comstate". */
-			for ( i = firstprot; i != NIL; i = protnext[i] )
-				if ( protcomst[i] == comstate )
-					{
-					minprot = i;
-					mindiff = tbldiff( state, minprot,
-							extrct[extptr] );
-					break;
-					}
-			}
-
-		else
-			{
-			/* Since we've decided that the most common destination
-			 * out of "state" does not occur with a high enough
-			 * frequency, we set the "comstate" to zero, assuring
-			 * that if this state is entered into the proto list,
-			 * it will not be considered a template.
-			 */
-			comstate = 0;
-
-			if ( firstprot != NIL )
-				{
-				minprot = firstprot;
-				mindiff = tbldiff( state, minprot,
-						extrct[extptr] );
-				}
-			}
-
-		/* We now have the first interesting proto in "minprot".  If
-		 * it matches within the tolerances set for the first proto,
-		 * we don't want to bother scanning the rest of the proto list
-		 * to see if we have any other reasonable matches.
-		 */
-
-		if ( mindiff * 100 > totaltrans * FIRST_MATCH_DIFF_PERCENTAGE )
-			{
-			/* Not a good enough match.  Scan the rest of the
-			 * protos.
-			 */
-			for ( i = minprot; i != NIL; i = protnext[i] )
-				{
-				d = tbldiff( state, i, extrct[1 - extptr] );
-				if ( d < mindiff )
-					{
-					extptr = 1 - extptr;
-					mindiff = d;
-					minprot = i;
-					}
-				}
-			}
-
-		/* Check if the proto we've decided on as our best bet is close
-		 * enough to the state we want to match to be usable.
-		 */
-
-		if ( mindiff * 100 > totaltrans * ACCEPTABLE_DIFF_PERCENTAGE )
-			{
-			/* No good.  If the state is homogeneous enough,
-			 * we make a template out of it.  Otherwise, we
-			 * make a proto.
-			 */
-
-			if ( comfreq * 100 >=
-			     totaltrans * TEMPLATE_SAME_PERCENTAGE )
-				mktemplate( state, statenum, comstate );
-
-			else
-				{
-				mkprot( state, statenum, comstate );
-				mkentry( state, numecs, statenum,
-					JAMSTATE, totaltrans );
-				}
-			}
-
-		else
-			{ /* use the proto */
-			mkentry( extrct[extptr], numecs, statenum,
-				prottbl[minprot], mindiff );
-
-			/* If this state was sufficiently different from the
-			 * proto we built it from, make it, too, a proto.
-			 */
-
-			if ( mindiff * 100 >=
-			     totaltrans * NEW_PROTO_DIFF_PERCENTAGE )
-				mkprot( state, statenum, comstate );
-
-			/* Since mkprot added a new proto to the proto queue,
-			 * it's possible that "minprot" is no longer on the
-			 * proto queue (if it happened to have been the last
-			 * entry, it would have been bumped off).  If it's
-			 * not there, then the new proto took its physical
-			 * place (though logically the new proto is at the
-			 * beginning of the queue), so in that case the
-			 * following call will do nothing.
-			 */
-
-			mv2front( minprot );
-			}
-		}
-	}
-
-
-/* cmptmps - compress template table entries
- *
- * Template tables are compressed by using the 'template equivalence
- * classes', which are collections of transition character equivalence
- * classes which always appear together in templates - really meta-equivalence
- * classes.
- */
-
-void cmptmps()
-	{
-	int tmpstorage[CSIZE + 1];
-	int *tmp = tmpstorage, i, j;
-	int totaltrans, trans;
-
-	peakpairs = numtemps * numecs + tblend;
-
-	if ( usemecs )
-		{
-		/* Create equivalence classes based on data gathered on
-		 * template transitions.
-		 */
-		nummecs = cre8ecs( tecfwd, tecbck, numecs );
-		}
-
-	else
-		nummecs = numecs;
-
-	while ( lastdfa + numtemps + 1 >= current_max_dfas )
-		increase_max_dfas();
-
-	/* Loop through each template. */
-
-	for ( i = 1; i <= numtemps; ++i )
-		{
-		/* Number of non-jam transitions out of this template. */
-		totaltrans = 0;
-
-		for ( j = 1; j <= numecs; ++j )
-			{
-			trans = tnxt[numecs * i + j];
-
-			if ( usemecs )
-				{
-				/* The absolute value of tecbck is the
-				 * meta-equivalence class of a given
-				 * equivalence class, as set up by cre8ecs().
-				 */
-				if ( tecbck[j] > 0 )
-					{
-					tmp[tecbck[j]] = trans;
-
-					if ( trans > 0 )
-						++totaltrans;
-					}
-				}
-
-			else
-				{
-				tmp[j] = trans;
-
-				if ( trans > 0 )
-					++totaltrans;
-				}
-			}
-
-		/* It is assumed (in a rather subtle way) in the skeleton
-		 * that if we're using meta-equivalence classes, the def[]
-		 * entry for all templates is the jam template, i.e.,
-		 * templates never default to other non-jam table entries
-		 * (e.g., another template)
-		 */
-
-		/* Leave room for the jam-state after the last real state. */
-		mkentry( tmp, nummecs, lastdfa + i + 1, JAMSTATE, totaltrans );
-		}
-	}
-
-
-
-/* expand_nxt_chk - expand the next check arrays */
-
-void expand_nxt_chk()
-	{
-	int old_max = current_max_xpairs;
-
-	current_max_xpairs += MAX_XPAIRS_INCREMENT;
-
-	++num_reallocs;
-
-	nxt = reallocate_integer_array( nxt, current_max_xpairs );
-	chk = reallocate_integer_array( chk, current_max_xpairs );
-
-	zero_out( (char *) (chk + old_max),
-		(size_t) (MAX_XPAIRS_INCREMENT * sizeof( int )) );
-	}
-
-
-/* find_table_space - finds a space in the table for a state to be placed
- *
- * synopsis
- *     int *state, numtrans, block_start;
- *     int find_table_space();
- *
- *     block_start = find_table_space( state, numtrans );
- *
- * State is the state to be added to the full speed transition table.
- * Numtrans is the number of out-transitions for the state.
- *
- * find_table_space() returns the position of the start of the first block (in
- * chk) able to accommodate the state
- *
- * In determining if a state will or will not fit, find_table_space() must take
- * into account the fact that an end-of-buffer state will be added at [0],
- * and an action number will be added in [-1].
- */
-
-int find_table_space( state, numtrans )
-int *state, numtrans;
-	{
-	/* Firstfree is the position of the first possible occurrence of two
-	 * consecutive unused records in the chk and nxt arrays.
-	 */
-	int i;
-	int *state_ptr, *chk_ptr;
-	int *ptr_to_last_entry_in_state;
-
-	/* If there are too many out-transitions, put the state at the end of
-	 * nxt and chk.
-	 */
-	if ( numtrans > MAX_XTIONS_FULL_INTERIOR_FIT )
-		{
-		/* If table is empty, return the first available spot in
-		 * chk/nxt, which should be 1.
-		 */
-		if ( tblend < 2 )
-			return 1;
-
-		/* Start searching for table space near the end of
-		 * chk/nxt arrays.
-		 */
-		i = tblend - numecs;
-		}
-
-	else
-		/* Start searching for table space from the beginning
-		 * (skipping only the elements which will definitely not
-		 * hold the new state).
-		 */
-		i = firstfree;
-
-	while ( 1 )	/* loops until a space is found */
-		{
-		while ( i + numecs >= current_max_xpairs )
-			expand_nxt_chk();
-
-		/* Loops until space for end-of-buffer and action number
-		 * are found.
-		 */
-		while ( 1 )
-			{
-			/* Check for action number space. */
-			if ( chk[i - 1] == 0 )
-				{
-				/* Check for end-of-buffer space. */
-				if ( chk[i] == 0 )
-					break;
-
-				else
-					/* Since i != 0, there is no use
-					 * checking to see if (++i) - 1 == 0,
-					 * because that's the same as i == 0,
-					 * so we skip a space.
-					 */
-					i += 2;
-				}
-
-			else
-				++i;
-
-			while ( i + numecs >= current_max_xpairs )
-				expand_nxt_chk();
-			}
-
-		/* If we started search from the beginning, store the new
-		 * firstfree for the next call of find_table_space().
-		 */
-		if ( numtrans <= MAX_XTIONS_FULL_INTERIOR_FIT )
-			firstfree = i + 1;
-
-		/* Check to see if all elements in chk (and therefore nxt)
-		 * that are needed for the new state have not yet been taken.
-		 */
-
-		state_ptr = &state[1];
-		ptr_to_last_entry_in_state = &chk[i + numecs + 1];
-
-		for ( chk_ptr = &chk[i + 1];
-		      chk_ptr != ptr_to_last_entry_in_state; ++chk_ptr )
-			if ( *(state_ptr++) != 0 && *chk_ptr != 0 )
-				break;
-
-		if ( chk_ptr == ptr_to_last_entry_in_state )
-			return i;
-
-		else
-		++i;
-		}
-	}
-
-
-/* inittbl - initialize transition tables
- *
- * Initializes "firstfree" to be one beyond the end of the table.  Initializes
- * all "chk" entries to be zero.
- */
-void inittbl()
-	{
-	int i;
-
-	zero_out( (char *) chk, (size_t) (current_max_xpairs * sizeof( int )) );
-
-	tblend = 0;
-	firstfree = tblend + 1;
-	numtemps = 0;
-
-	if ( usemecs )
-		{
-		/* Set up doubly-linked meta-equivalence classes; these
-		 * are sets of equivalence classes which all have identical
-		 * transitions out of TEMPLATES.
-		 */
-
-		tecbck[1] = NIL;
-
-		for ( i = 2; i <= numecs; ++i )
-			{
-			tecbck[i] = i - 1;
-			tecfwd[i - 1] = i;
-			}
-
-		tecfwd[numecs] = NIL;
-		}
-	}
-
-
-/* mkdeftbl - make the default, "jam" table entries */
-
-void mkdeftbl()
-	{
-	int i;
-
-	jamstate = lastdfa + 1;
-
-	++tblend; /* room for transition on end-of-buffer character */
-
-	while ( tblend + numecs >= current_max_xpairs )
-		expand_nxt_chk();
-
-	/* Add in default end-of-buffer transition. */
-	nxt[tblend] = end_of_buffer_state;
-	chk[tblend] = jamstate;
-
-	for ( i = 1; i <= numecs; ++i )
-		{
-		nxt[tblend + i] = 0;
-		chk[tblend + i] = jamstate;
-		}
-
-	jambase = tblend;
-
-	base[jamstate] = jambase;
-	def[jamstate] = 0;
-
-	tblend += numecs;
-	++numtemps;
-	}
-
-
-/* mkentry - create base/def and nxt/chk entries for transition array
- *
- * synopsis
- *   int state[numchars + 1], numchars, statenum, deflink, totaltrans;
- *   mkentry( state, numchars, statenum, deflink, totaltrans );
- *
- * "state" is a transition array "numchars" characters in size, "statenum"
- * is the offset to be used into the base/def tables, and "deflink" is the
- * entry to put in the "def" table entry.  If "deflink" is equal to
- * "JAMSTATE", then no attempt will be made to fit zero entries of "state"
- * (i.e., jam entries) into the table.  It is assumed that by linking to
- * "JAMSTATE" they will be taken care of.  In any case, entries in "state"
- * marking transitions to "SAME_TRANS" are treated as though they will be
- * taken care of by wherever "deflink" points.  "totaltrans" is the total
- * number of transitions out of the state.  If it is below a certain threshold,
- * the tables are searched for an interior spot that will accommodate the
- * state array.
- */
-
-void mkentry( state, numchars, statenum, deflink, totaltrans )
-int *state;
-int numchars, statenum, deflink, totaltrans;
-	{
-	int minec, maxec, i, baseaddr;
-	int tblbase, tbllast;
-
-	if ( totaltrans == 0 )
-		{ /* there are no out-transitions */
-		if ( deflink == JAMSTATE )
-			base[statenum] = JAMSTATE;
-		else
-			base[statenum] = 0;
-
-		def[statenum] = deflink;
-		return;
-		}
-
-	for ( minec = 1; minec <= numchars; ++minec )
-		{
-		if ( state[minec] != SAME_TRANS )
-			if ( state[minec] != 0 || deflink != JAMSTATE )
-				break;
-		}
-
-	if ( totaltrans == 1 )
-		{
-		/* There's only one out-transition.  Save it for later to fill
-		 * in holes in the tables.
-		 */
-		stack1( statenum, minec, state[minec], deflink );
-		return;
-		}
-
-	for ( maxec = numchars; maxec > 0; --maxec )
-		{
-		if ( state[maxec] != SAME_TRANS )
-			if ( state[maxec] != 0 || deflink != JAMSTATE )
-				break;
-		}
-
-	/* Whether we try to fit the state table in the middle of the table
-	 * entries we have already generated, or if we just take the state
-	 * table at the end of the nxt/chk tables, we must make sure that we
-	 * have a valid base address (i.e., non-negative).  Note that
-	 * negative base addresses dangerous at run-time (because indexing
-	 * the nxt array with one and a low-valued character will access
-	 * memory before the start of the array.
-	 */
-
-	/* Find the first transition of state that we need to worry about. */
-	if ( totaltrans * 100 <= numchars * INTERIOR_FIT_PERCENTAGE )
-		{
-		/* Attempt to squeeze it into the middle of the tables. */
-		baseaddr = firstfree;
-
-		while ( baseaddr < minec )
-			{
-			/* Using baseaddr would result in a negative base
-			 * address below; find the next free slot.
-			 */
-			for ( ++baseaddr; chk[baseaddr] != 0; ++baseaddr )
-				;
-			}
-
-		while ( baseaddr + maxec - minec + 1 >= current_max_xpairs )
-			expand_nxt_chk();
-
-		for ( i = minec; i <= maxec; ++i )
-			if ( state[i] != SAME_TRANS &&
-			     (state[i] != 0 || deflink != JAMSTATE) &&
-			     chk[baseaddr + i - minec] != 0 )
-				{ /* baseaddr unsuitable - find another */
-				for ( ++baseaddr;
-				      baseaddr < current_max_xpairs &&
-				      chk[baseaddr] != 0; ++baseaddr )
-					;
-
-				while ( baseaddr + maxec - minec + 1 >=
-					current_max_xpairs )
-					expand_nxt_chk();
-
-				/* Reset the loop counter so we'll start all
-				 * over again next time it's incremented.
-				 */
-
-				i = minec - 1;
-				}
-		}
-
-	else
-		{
-		/* Ensure that the base address we eventually generate is
-		 * non-negative.
-		 */
-		baseaddr = MAX( tblend + 1, minec );
-		}
-
-	tblbase = baseaddr - minec;
-	tbllast = tblbase + maxec;
-
-	while ( tbllast + 1 >= current_max_xpairs )
-		expand_nxt_chk();
-
-	base[statenum] = tblbase;
-	def[statenum] = deflink;
-
-	for ( i = minec; i <= maxec; ++i )
-		if ( state[i] != SAME_TRANS )
-			if ( state[i] != 0 || deflink != JAMSTATE )
-				{
-				nxt[tblbase + i] = state[i];
-				chk[tblbase + i] = statenum;
-				}
-
-	if ( baseaddr == firstfree )
-		/* Find next free slot in tables. */
-		for ( ++firstfree; chk[firstfree] != 0; ++firstfree )
-			;
-
-	tblend = MAX( tblend, tbllast );
-	}
-
-
-/* mk1tbl - create table entries for a state (or state fragment) which
- *            has only one out-transition
- */
-
-void mk1tbl( state, sym, onenxt, onedef )
-int state, sym, onenxt, onedef;
-	{
-	if ( firstfree < sym )
-		firstfree = sym;
-
-	while ( chk[firstfree] != 0 )
-		if ( ++firstfree >= current_max_xpairs )
-			expand_nxt_chk();
-
-	base[state] = firstfree - sym;
-	def[state] = onedef;
-	chk[firstfree] = state;
-	nxt[firstfree] = onenxt;
-
-	if ( firstfree > tblend )
-		{
-		tblend = firstfree++;
-
-		if ( firstfree >= current_max_xpairs )
-			expand_nxt_chk();
-		}
-	}
-
-
-/* mkprot - create new proto entry */
-
-void mkprot( state, statenum, comstate )
-int state[], statenum, comstate;
-	{
-	int i, slot, tblbase;
-
-	if ( ++numprots >= MSP || numecs * numprots >= PROT_SAVE_SIZE )
-		{
-		/* Gotta make room for the new proto by dropping last entry in
-		 * the queue.
-		 */
-		slot = lastprot;
-		lastprot = protprev[lastprot];
-		protnext[lastprot] = NIL;
-		}
-
-	else
-		slot = numprots;
-
-	protnext[slot] = firstprot;
-
-	if ( firstprot != NIL )
-		protprev[firstprot] = slot;
-
-	firstprot = slot;
-	prottbl[slot] = statenum;
-	protcomst[slot] = comstate;
-
-	/* Copy state into save area so it can be compared with rapidly. */
-	tblbase = numecs * (slot - 1);
-
-	for ( i = 1; i <= numecs; ++i )
-		protsave[tblbase + i] = state[i];
-	}
-
-
-/* mktemplate - create a template entry based on a state, and connect the state
- *              to it
- */
-
-void mktemplate( state, statenum, comstate )
-int state[], statenum, comstate;
-	{
-	int i, numdiff, tmpbase, tmp[CSIZE + 1];
-	Char transset[CSIZE + 1];
-	int tsptr;
-
-	++numtemps;
-
-	tsptr = 0;
-
-	/* Calculate where we will temporarily store the transition table
-	 * of the template in the tnxt[] array.  The final transition table
-	 * gets created by cmptmps().
-	 */
-
-	tmpbase = numtemps * numecs;
-
-	if ( tmpbase + numecs >= current_max_template_xpairs )
-		{
-		current_max_template_xpairs += MAX_TEMPLATE_XPAIRS_INCREMENT;
-
-		++num_reallocs;
-
-		tnxt = reallocate_integer_array( tnxt,
-			current_max_template_xpairs );
-		}
-
-	for ( i = 1; i <= numecs; ++i )
-		if ( state[i] == 0 )
-			tnxt[tmpbase + i] = 0;
-		else
-			{
-			transset[tsptr++] = i;
-			tnxt[tmpbase + i] = comstate;
-			}
-
-	if ( usemecs )
-		mkeccl( transset, tsptr, tecfwd, tecbck, numecs, 0 );
-
-	mkprot( tnxt + tmpbase, -numtemps, comstate );
-
-	/* We rely on the fact that mkprot adds things to the beginning
-	 * of the proto queue.
-	 */
-
-	numdiff = tbldiff( state, firstprot, tmp );
-	mkentry( tmp, numecs, statenum, -numtemps, numdiff );
-	}
-
-
-/* mv2front - move proto queue element to front of queue */
-
-void mv2front( qelm )
-int qelm;
-	{
-	if ( firstprot != qelm )
-		{
-		if ( qelm == lastprot )
-			lastprot = protprev[lastprot];
-
-		protnext[protprev[qelm]] = protnext[qelm];
-
-		if ( protnext[qelm] != NIL )
-			protprev[protnext[qelm]] = protprev[qelm];
-
-		protprev[qelm] = NIL;
-		protnext[qelm] = firstprot;
-		protprev[firstprot] = qelm;
-		firstprot = qelm;
-		}
-	}
-
-
-/* place_state - place a state into full speed transition table
- *
- * State is the statenum'th state.  It is indexed by equivalence class and
- * gives the number of the state to enter for a given equivalence class.
- * Transnum is the number of out-transitions for the state.
- */
-
-void place_state( state, statenum, transnum )
-int *state, statenum, transnum;
-	{
-	int i;
-	int *state_ptr;
-	int position = find_table_space( state, transnum );
-
-	/* "base" is the table of start positions. */
-	base[statenum] = position;
-
-	/* Put in action number marker; this non-zero number makes sure that
-	 * find_table_space() knows that this position in chk/nxt is taken
-	 * and should not be used for another accepting number in another
-	 * state.
-	 */
-	chk[position - 1] = 1;
-
-	/* Put in end-of-buffer marker; this is for the same purposes as
-	 * above.
-	 */
-	chk[position] = 1;
-
-	/* Place the state into chk and nxt. */
-	state_ptr = &state[1];
-
-	for ( i = 1; i <= numecs; ++i, ++state_ptr )
-		if ( *state_ptr != 0 )
-			{
-			chk[position + i] = i;
-			nxt[position + i] = *state_ptr;
-			}
-
-	if ( position + numecs > tblend )
-		tblend = position + numecs;
-	}
-
-
-/* stack1 - save states with only one out-transition to be processed later
- *
- * If there's room for another state on the "one-transition" stack, the
- * state is pushed onto it, to be processed later by mk1tbl.  If there's
- * no room, we process the sucker right now.
- */
-
-void stack1( statenum, sym, nextstate, deflink )
-int statenum, sym, nextstate, deflink;
-	{
-	if ( onesp >= ONE_STACK_SIZE - 1 )
-		mk1tbl( statenum, sym, nextstate, deflink );
-
-	else
-		{
-		++onesp;
-		onestate[onesp] = statenum;
-		onesym[onesp] = sym;
-		onenext[onesp] = nextstate;
-		onedef[onesp] = deflink;
-		}
-	}
-
-
-/* tbldiff - compute differences between two state tables
- *
- * "state" is the state array which is to be extracted from the pr'th
- * proto.  "pr" is both the number of the proto we are extracting from
- * and an index into the save area where we can find the proto's complete
- * state table.  Each entry in "state" which differs from the corresponding
- * entry of "pr" will appear in "ext".
- *
- * Entries which are the same in both "state" and "pr" will be marked
- * as transitions to "SAME_TRANS" in "ext".  The total number of differences
- * between "state" and "pr" is returned as function value.  Note that this
- * number is "numecs" minus the number of "SAME_TRANS" entries in "ext".
- */
-
-int tbldiff( state, pr, ext )
-int state[], pr, ext[];
-	{
-	int i, *sp = state, *ep = ext, *protp;
-	int numdiff = 0;
-
-	protp = &protsave[numecs * (pr - 1)];
-
-	for ( i = numecs; i > 0; --i )
-		{
-		if ( *++protp == *++sp )
-			*++ep = SAME_TRANS;
-		else
-			{
-			*++ep = *sp;
-			++numdiff;
-			}
-		}
-
-	return numdiff;
-	}
diff --git a/usr.bin/lex/version.awk b/usr.bin/lex/version.awk
new file mode 100644
index 0000000..3d34093
--- /dev/null
+++ b/usr.bin/lex/version.awk
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+BEGIN {
+	FS = "[ \t\.\"]+"
+}
+
+{
+	if ($1 ~ /^#define$/ && $2 ~ /^VERSION$/) {
+		printf("-DFLEX_MAJOR_VERSION=%s\n", $3);
+		printf("-DFLEX_MINOR_VERSION=%s\n", $4);
+		printf("-DFLEX_SUBMINOR_VERSION=%s\n", $5);
+	}
+}
diff --git a/usr.bin/lex/version.h b/usr.bin/lex/version.h
deleted file mode 100644
index 5dbdf94..0000000
--- a/usr.bin/lex/version.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $FreeBSD$ */
-
-#define FLEX_VERSION "2.5.4"
diff --git a/usr.bin/lex/yylex.c b/usr.bin/lex/yylex.c
deleted file mode 100644
index e90c5d4f..0000000
--- a/usr.bin/lex/yylex.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* yylex - scanner front-end for flex */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Vern Paxson.
- * 
- * The United States Government has rights in this work pursuant
- * to contract no. DE-AC03-76SF00098 between the United States
- * Department of Energy and the University of California.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* $Header: /home/daffy/u0/vern/flex/RCS/yylex.c,v 2.13 95/03/04 16:10:41 vern Exp $ */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <ctype.h>
-#include "flexdef.h"
-#include "parse.h"
-
-
-/* yylex - scan for a regular expression token */
-
-int yylex()
-	{
-	int toktype;
-	static int beglin = false;
-	extern char *yytext;
-
-	if ( eofseen )
-		toktype = EOF;
-	else
-		toktype = flexscan();
-
-	if ( toktype == EOF || toktype == 0 )
-		{
-		eofseen = 1;
-
-		if ( sectnum == 1 )
-			{
-			synerr( _( "premature EOF" ) );
-			sectnum = 2;
-			toktype = SECTEND;
-			}
-
-		else
-			toktype = 0;
-		}
-
-	if ( trace )
-		{
-		if ( beglin )
-			{
-			fprintf( stderr, "%d\t", num_rules + 1 );
-			beglin = 0;
-			}
-
-		switch ( toktype )
-			{
-			case '<':
-			case '>':
-			case '^':
-			case '$':
-			case '"':
-			case '[':
-			case ']':
-			case '{':
-			case '}':
-			case '|':
-			case '(':
-			case ')':
-			case '-':
-			case '/':
-			case '\\':
-			case '?':
-			case '.':
-			case '*':
-			case '+':
-			case ',':
-				(void) putc( toktype, stderr );
-				break;
-
-			case '\n':
-				(void) putc( '\n', stderr );
-
-				if ( sectnum == 2 )
-				beglin = 1;
-
-				break;
-
-			case SCDECL:
-				fputs( "%s", stderr );
-				break;
-
-			case XSCDECL:
-				fputs( "%x", stderr );
-				break;
-
-			case SECTEND:
-				fputs( "%%\n", stderr );
-
-				/* We set beglin to be true so we'll start
-				 * writing out numbers as we echo rules.
-				 * flexscan() has already assigned sectnum.
-				 */
-				if ( sectnum == 2 )
-					beglin = 1;
-
-				break;
-
-			case NAME:
-				fprintf( stderr, "'%s'", nmstr );
-				break;
-
-			case CHAR:
-				switch ( yylval )
-					{
-					case '<':
-					case '>':
-					case '^':
-					case '$':
-					case '"':
-					case '[':
-					case ']':
-					case '{':
-					case '}':
-					case '|':
-					case '(':
-					case ')':
-					case '-':
-					case '/':
-					case '\\':
-					case '?':
-					case '.':
-					case '*':
-					case '+':
-					case ',':
-						fprintf( stderr, "\\%c",
-							yylval );
-						break;
-
-					default:
-						if ( ! isascii( yylval ) ||
-						     ! isprint( yylval ) )
-							fprintf( stderr,
-								"\\%.3o",
-							(unsigned int) yylval );
-						else
-							(void) putc( yylval,
-								stderr );
-					break;
-					}
-
-				break;
-
-			case NUMBER:
-				fprintf( stderr, "%d", yylval );
-				break;
-
-			case PREVCCL:
-				fprintf( stderr, "[%d]", yylval );
-				break;
-
-			case EOF_OP:
-				fprintf( stderr, "<<EOF>>" );
-				break;
-
-			case OPTION_OP:
-				fprintf( stderr, "%s ", yytext );
-				break;
-
-			case OPT_OUTFILE:
-			case OPT_PREFIX:
-			case CCE_ALNUM:
-			case CCE_ALPHA:
-			case CCE_BLANK:
-			case CCE_CNTRL:
-			case CCE_DIGIT:
-			case CCE_GRAPH:
-			case CCE_LOWER:
-			case CCE_PRINT:
-			case CCE_PUNCT:
-			case CCE_SPACE:
-			case CCE_UPPER:
-			case CCE_XDIGIT:
-				fprintf( stderr, "%s", yytext );
-				break;
-
-			case 0:
-				fprintf( stderr, _( "End Marker\n" ) );
-				break;
-
-			default:
-				fprintf( stderr,
-				_( "*Something Weird* - tok: %d val: %d\n" ),
-					toktype, yylval );
-				break;
-			}
-		}
-
-	return toktype;
-	}
diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1
index f3ad6df..be9d9cc 100644
--- a/usr.bin/lockf/lockf.1
+++ b/usr.bin/lockf/lockf.1
@@ -32,7 +32,7 @@
 .Nd execute a command while holding a file lock
 .Sh SYNOPSIS
 .Nm
-.Op Fl ks
+.Op Fl kns
 .Op Fl t Ar seconds
 .Ar file
 .Ar command
@@ -90,6 +90,18 @@ Causes
 .Nm
 to operate silently.
 Failure to acquire the lock is indicated only in the exit status.
+.It Fl n
+Causes
+.Nm
+to fail if the specified lock
+.Ar file
+does not exist. If
+.Fl n
+is not specified,
+.Nm
+will create
+.Ar file
+if necessary.
 .It Fl t Ar seconds
 Specifies a timeout for waiting for the lock.
 By default,
@@ -130,6 +142,10 @@ The
 utility
 was unable to create the lock file, e.g., because of insufficient access
 privileges.
+.It Dv EX_UNAVAILABLE
+The
+.Fl n
+option is specified and the specified lock file does not exist.
 .It Dv EX_USAGE
 There was an error on the
 .Nm
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index 368eed0..9a6141f 100644
--- a/usr.bin/lockf/lockf.c
+++ b/usr.bin/lockf/lockf.c
@@ -56,16 +56,20 @@ static volatile sig_atomic_t timed_out;
 int
 main(int argc, char **argv)
 {
-	int ch, silent, status, waitsec;
+	int ch, flags, silent, status, waitsec;
 	pid_t child;
 
 	silent = keep = 0;
+	flags = O_CREAT;
 	waitsec = -1;	/* Infinite. */
-	while ((ch = getopt(argc, argv, "skt:")) != -1) {
+	while ((ch = getopt(argc, argv, "sknt:")) != -1) {
 		switch (ch) {
 		case 'k':
 			keep = 1;
 			break;
+		case 'n':
+			flags &= ~O_CREAT;
+			break;
 		case 's':
 			silent = 1;
 			break;
@@ -118,13 +122,13 @@ main(int argc, char **argv)
 	 * avoiding the separate step of waiting for the lock.  This
 	 * yields fairness and improved performance.
 	 */
-	lockfd = acquire_lock(lockname, O_NONBLOCK);
+	lockfd = acquire_lock(lockname, flags | O_NONBLOCK);
 	while (lockfd == -1 && !timed_out && waitsec != 0) {
 		if (keep)
-			lockfd = acquire_lock(lockname, 0);
+			lockfd = acquire_lock(lockname, flags);
 		else {
 			wait_for_lock(lockname);
-			lockfd = acquire_lock(lockname, O_NONBLOCK);
+			lockfd = acquire_lock(lockname, flags | O_NONBLOCK);
 		}
 	}
 	if (waitsec > 0)
@@ -165,7 +169,7 @@ acquire_lock(const char *name, int flags)
 {
 	int fd;
 
-	if ((fd = open(name, O_RDONLY|O_CREAT|O_EXLOCK|flags, 0666)) == -1) {
+	if ((fd = open(name, flags|O_RDONLY|O_EXLOCK|flags, 0666)) == -1) {
 		if (errno == EAGAIN || errno == EINTR)
 			return (-1);
 		err(EX_CANTCREAT, "cannot open %s", name);
@@ -215,7 +219,7 @@ usage(void)
 {
 
 	fprintf(stderr,
-	    "usage: lockf [-ks] [-t seconds] file command [arguments]\n");
+	    "usage: lockf [-kns] [-t seconds] file command [arguments]\n");
 	exit(EX_USAGE);
 }
 
diff --git a/usr.bin/lsvfs/lsvfs.1 b/usr.bin/lsvfs/lsvfs.1
index ed4b44e..5bdb64e 100644
--- a/usr.bin/lsvfs/lsvfs.1
+++ b/usr.bin/lsvfs/lsvfs.1
@@ -2,7 +2,7 @@
 .\" Garrett A. Wollman, September 1994
 .\" This file is in the public domain.
 .\"
-.Dd March 16, 1995
+.Dd June 9, 2013
 .Dt LSVFS 1
 .Os
 .Sh NAME
@@ -36,6 +36,8 @@ and the
 .Fl t
 option to
 .Xr mount 8
+.It Num
+the filesystem type number.
 .It Refs
 the number of references to this VFS; i.e., the number of currently
 mounted file systems of this type
@@ -44,6 +46,7 @@ flag bits.
 .El
 .Sh SEE ALSO
 .Xr mount 2 ,
+.Xr getvfsbyname 3 ,
 .Xr mount 8
 .Sh HISTORY
 A
diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c
index 3107971..a0a6acb 100644
--- a/usr.bin/lsvfs/lsvfs.c
+++ b/usr.bin/lsvfs/lsvfs.c
@@ -17,9 +17,24 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 
-#define FMT "%-32.32s %5d %s\n"
-#define HDRFMT "%-32.32s %5.5s %s\n"
-#define DASHES "-------------------------------- ----- ---------------\n"
+#define FMT	"%-32.32s 0x%08x %5d  %s\n"
+#define HDRFMT	"%-32.32s %10s %5.5s  %s\n"
+#define DASHES	"-------------------------------- "	\
+		"---------- -----  ---------------\n"
+
+static struct flaglist {
+	int		flag;
+	const char	str[32]; /* must be longer than the longest one. */
+} fl[] = {
+	{ .flag = VFCF_STATIC, .str = "static", },
+	{ .flag = VFCF_NETWORK, .str = "network", },
+	{ .flag = VFCF_READONLY, .str = "read-only", },
+	{ .flag = VFCF_SYNTHETIC, .str = "synthetic", },
+	{ .flag = VFCF_LOOPBACK, .str = "loopback", },
+	{ .flag = VFCF_UNICODE, .str = "unicode", },
+	{ .flag = VFCF_JAIL, .str = "jail", },
+	{ .flag = VFCF_DELEGADMIN, .str = "delegated-administration", },
+};
 
 static const char *fmt_flags(int);
 
@@ -31,13 +46,14 @@ main(int argc, char **argv)
   size_t buflen;
   argc--, argv++;
 
-  printf(HDRFMT, "Filesystem", "Refs", "Flags");
+  printf(HDRFMT, "Filesystem", "Num", "Refs", "Flags");
   fputs(DASHES, stdout);
 
   if(argc) {
     for(; argc; argc--, argv++) {
       if (getvfsbyname(*argv, &vfc) == 0) {
-        printf(FMT, vfc.vfc_name, vfc.vfc_refcount, fmt_flags(vfc.vfc_flags));
+        printf(FMT, vfc.vfc_name, vfc.vfc_typenum, vfc.vfc_refcount,
+	    fmt_flags(vfc.vfc_flags));
       } else {
 	warnx("VFS %s unknown or not loaded", *argv);
         rv++;
@@ -54,8 +70,8 @@ main(int argc, char **argv)
     cnt = buflen / sizeof(struct xvfsconf);
 
     for (i = 0; i < cnt; i++) {
-      printf(FMT, xvfsp[i].vfc_name, xvfsp[i].vfc_refcount,
-             fmt_flags(xvfsp[i].vfc_flags));
+      printf(FMT, xvfsp[i].vfc_name, xvfsp[i].vfc_typenum,
+	    xvfsp[i].vfc_refcount, fmt_flags(xvfsp[i].vfc_flags));
     }
     free(xvfsp);
   }
@@ -66,34 +82,16 @@ main(int argc, char **argv)
 static const char *
 fmt_flags(int flags)
 {
-  /*
-   * NB: if you add new flags, don't forget to add them here vvvvvv too.
-   */
-  static char buf[sizeof
-    "static, network, read-only, synthetic, loopback, unicode, jail"];
-  size_t len;
-
-  buf[0] = '\0';
-
-  if(flags & VFCF_STATIC)
-    strlcat(buf, "static, ", sizeof(buf));
-  if(flags & VFCF_NETWORK)
-    strlcat(buf, "network, ", sizeof(buf));
-  if(flags & VFCF_READONLY)
-    strlcat(buf, "read-only, ", sizeof(buf));
-  if(flags & VFCF_SYNTHETIC)
-    strlcat(buf, "synthetic, ", sizeof(buf));
-  if(flags & VFCF_LOOPBACK)
-    strlcat(buf, "loopback, ", sizeof(buf));
-  if(flags & VFCF_UNICODE)
-    strlcat(buf, "unicode, ", sizeof(buf));
-  if(flags & VFCF_JAIL)
-    strlcat(buf, "jail, ", sizeof(buf));
-  if(flags & VFCF_DELEGADMIN)
-    strlcat(buf, "delegated-administration, ", sizeof(buf));
-  len = strlen(buf);
-  if (len > 2 && buf[len - 2] == ',')
-    buf[len - 2] = '\0';
+	static char buf[sizeof(struct flaglist) * sizeof(fl)];
+	int i;
 
-  return buf;
+	buf[0] = '\0';
+	for (i = 0; i < (int)nitems(fl); i++)
+		if (flags & fl[i].flag) {
+			strlcat(buf, fl[i].str, sizeof(buf));
+			strlcat(buf, ", ", sizeof(buf));
+		}
+	if (buf[0] != '\0')
+		buf[strlen(buf) - 2] = '\0';
+	return (buf);
 }
diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile
index 1f1ec5e..f0e22f8 100644
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@@ -8,8 +8,8 @@ PROG=	m4
 CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/lib
 DPADD=	${LIBY} ${LIBL} ${LIBM}
 LDADD=	-ly -ll -lm
-# clang needs 1 while with gcc we can use 2
-#WARNS=	1
+
+NO_WMISSING_VARIABLE_DECLARATIONS=
 
 SRCS=	eval.c expr.c look.c main.c misc.c gnum4.c trace.c parser.y tokenizer.l
 .PATH: ${.CURDIR}/lib
diff --git a/usr.bin/m4/TEST/ack.m4 b/usr.bin/m4/TEST/ack.m4
index c4bc39d..bf2a995 100644
--- a/usr.bin/m4/TEST/ack.m4
+++ b/usr.bin/m4/TEST/ack.m4
@@ -1,4 +1,4 @@
-#	$OpenBSD: ack.m4,v 1.2 1996/06/26 05:36:18 deraadt Exp $
+#	$OpenBSD: ack.m4,v 1.3 2003/06/03 02:56:11 millert Exp $
 #	$NetBSD: ack.m4,v 1.4 1995/09/28 05:37:54 tls Exp $
 #
 # Copyright (c) 1989, 1993
@@ -15,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
diff --git a/usr.bin/m4/TEST/hanoi.m4 b/usr.bin/m4/TEST/hanoi.m4
index b26ec6b..5be47d1 100644
--- a/usr.bin/m4/TEST/hanoi.m4
+++ b/usr.bin/m4/TEST/hanoi.m4
@@ -1,4 +1,4 @@
-#	$OpenBSD: hanoi.m4,v 1.2 1996/06/26 05:36:19 deraadt Exp $
+#	$OpenBSD: hanoi.m4,v 1.3 2003/06/03 02:56:11 millert Exp $
 #	$NetBSD: hanoi.m4,v 1.4 1995/09/28 05:37:56 tls Exp $
 #
 # Copyright (c) 1989, 1993
@@ -15,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
diff --git a/usr.bin/m4/TEST/hash.m4 b/usr.bin/m4/TEST/hash.m4
index 7aa2038..06357df 100644
--- a/usr.bin/m4/TEST/hash.m4
+++ b/usr.bin/m4/TEST/hash.m4
@@ -1,4 +1,4 @@
-#	$OpenBSD: hash.m4,v 1.2 1996/06/26 05:36:19 deraadt Exp $
+#	$OpenBSD: hash.m4,v 1.3 2003/06/03 02:56:11 millert Exp $
 #	$NetBSD: hash.m4,v 1.4 1995/09/28 05:37:58 tls Exp $
 #
 # Copyright (c) 1989, 1993
@@ -15,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
diff --git a/usr.bin/m4/TEST/sqroot.m4 b/usr.bin/m4/TEST/sqroot.m4
index 9b80109..1442ecf6 100644
--- a/usr.bin/m4/TEST/sqroot.m4
+++ b/usr.bin/m4/TEST/sqroot.m4
@@ -1,4 +1,4 @@
-#	$OpenBSD: sqroot.m4,v 1.2 1996/06/26 05:36:20 deraadt Exp $
+#	$OpenBSD: sqroot.m4,v 1.3 2003/06/03 02:56:11 millert Exp $
 #	$NetBSD: sqroot.m4,v 1.4 1995/09/28 05:38:01 tls Exp $
 #
 # Copyright (c) 1989, 1993
@@ -15,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
diff --git a/usr.bin/m4/TEST/string.m4 b/usr.bin/m4/TEST/string.m4
index ce12396..61fc28e 100644
--- a/usr.bin/m4/TEST/string.m4
+++ b/usr.bin/m4/TEST/string.m4
@@ -1,4 +1,4 @@
-#	$OpenBSD: string.m4,v 1.2 1996/06/26 05:36:20 deraadt Exp $
+#	$OpenBSD: string.m4,v 1.3 2003/06/03 02:56:11 millert Exp $
 #	$NetBSD: string.m4,v 1.4 1995/09/28 05:38:03 tls Exp $
 #
 # Copyright (c) 1989, 1993
@@ -15,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
diff --git a/usr.bin/m4/TEST/test.m4 b/usr.bin/m4/TEST/test.m4
index 61b8de6..25b01b8 100644
--- a/usr.bin/m4/TEST/test.m4
+++ b/usr.bin/m4/TEST/test.m4
@@ -1,4 +1,4 @@
-#	$OpenBSD: test.m4,v 1.2 1996/06/26 05:36:21 deraadt Exp $
+#	$OpenBSD: test.m4,v 1.3 2003/06/03 02:56:11 millert Exp $
 #	$NetBSD: test.m4,v 1.4 1995/09/28 05:38:05 tls Exp $
 #
 # Copyright (c) 1989, 1993
@@ -15,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 729cf18..fbd42aa 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eval.c,v 1.69 2011/03/24 11:23:08 espie Exp $	*/
+/*	$OpenBSD: eval.c,v 1.70 2012/04/12 17:00:11 espie Exp $	*/
 /*	$NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $	*/
 
 /*
diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index ccb2e77..7753c32 100644
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.51 2011/09/27 07:24:02 espie Exp $	*/
+/*	$OpenBSD: extern.h,v 1.52 2012/04/12 17:00:11 espie Exp $	*/
 /*	$NetBSD: extern.h,v 1.3 1996/01/13 23:25:24 pk Exp $	*/
 
 /*-
diff --git a/usr.bin/m4/lib/ohash_init.3 b/usr.bin/m4/lib/ohash_init.3
index 19213f3..e0b2320 100644
--- a/usr.bin/m4/lib/ohash_init.3
+++ b/usr.bin/m4/lib/ohash_init.3
@@ -31,9 +31,9 @@
 .Nm ohash_entries
 .Nd light-weight open hashing
 .Sh SYNOPSIS
-.Fd #include <stdint.h>
-.Fd #include <stddef.h>
-.Fd #include <ohash.h>
+.In stdint.h
+.In stddef.h
+.In ohash.h
 .Ft void
 .Fn ohash_init "struct ohash *h" "unsigned int size" "struct ohash_info *info"
 .Ft void
diff --git a/usr.bin/m4/lib/ohash_interval.3 b/usr.bin/m4/lib/ohash_interval.3
index 12e7620..8abe7a8 100644
--- a/usr.bin/m4/lib/ohash_interval.3
+++ b/usr.bin/m4/lib/ohash_interval.3
@@ -25,9 +25,9 @@
 .Nm ohash_qlookupi
 .Nd helper functions for open hashing
 .Sh SYNOPSIS
-.Fd #include <stdint.h>
-.Fd #include <stddef.h>
-.Fd #include <ohash.h>
+.In stdint.h
+.In stddef.h
+.In ohash.h
 .Ft uint32_t
 .Fn ohash_interval "const char *start" "const char **pend"
 .Ft "void *"
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 6d26111..d0669c1 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,5 +1,5 @@
-.\"	$NetBSD: m4.1,v 1.22 2010/05/14 17:14:28 joerg Exp $
-.\"	@(#) $OpenBSD: m4.1,v 1.56 2009/10/14 17:19:47 sthen Exp $
+.\"	$NetBSD: m4.1,v 1.23 2012/04/08 22:00:39 wiz Exp $
+.\"	@(#) $OpenBSD: m4.1,v 1.59 2010/10/21 13:20:51 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,14 +33,14 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 14, 2009
+.Dd October 21, 2010
 .Dt M4 1
 .Os
 .Sh NAME
 .Nm m4
 .Nd macro language processor
 .Sh SYNOPSIS
-.Nm m4
+.Nm
 .Op Fl gPs
 .Oo
 .Sm off
@@ -50,18 +50,16 @@
 .Op Fl d Ar flags
 .Op Fl I Ar dirname
 .Op Fl o Ar filename
-.Bk -words
 .Op Fl t Ar macro
 .Op Fl U Ns Ar name
 .Op Ar
-.Ek
 .Sh DESCRIPTION
 The
-.Nm m4
+.Nm
 utility is a macro processor that can be used as a front end to any
 language (e.g., C, ratfor, fortran, lex, and yacc).
 If no input files are given,
-.Nm m4
+.Nm
 reads from the standard input,
 otherwise files specified on the command line are
 processed in the given order.
@@ -69,7 +67,7 @@ Input files can be regular files, files in the m4 include paths, or a
 single dash
 .Pq Sq - ,
 denoting standard input.
-.Nm m4
+.Nm
 writes
 the processed text to the standard output, unless told otherwise.
 .Pp
@@ -77,7 +75,7 @@ Macro calls have the form name(argument1[, argument2, ..., argumentN]).
 .Pp
 There cannot be any space following the macro name and the open
 parenthesis
-.Sq \&( .
+.Pq Sq \&( .
 If the macro name is not followed by an open
 parenthesis it is processed with no arguments.
 .Pp
@@ -169,7 +167,7 @@ Undefine the symbol
 .Ar name .
 .El
 .Sh SYNTAX
-.Nm m4
+.Nm
 provides the following built-in macros.
 They may be redefined, losing their original meaning.
 Return values are null unless otherwise stated.
@@ -240,7 +238,7 @@ macro definitions (even for built-in macros).
 .It Fn divert num
 There are 10 output queues (numbered 0-9).
 At the end of processing
-.Nm m4
+.Nm
 concatenates all the queues in numerical order to produce the
 final output.
 Initially the output queue is 0.
@@ -259,7 +257,7 @@ Prints the first argument on the standard error output stream.
 .It Fn esyscmd cmd
 Passes its first argument to a shell and returns the shell's standard output.
 Note that the shell shares its standard input and standard error with
-.Nm m4 .
+.Nm .
 .It Fn eval expr
 Computes the first argument as an arithmetic expression using 32-bit
 arithmetic.
@@ -348,6 +346,9 @@ Multiple calls to
 get inserted in sequence at the final
 .Dv EOF .
 .It Fn maketemp template
+Like
+.Ic mkstemp .
+.It Fn mkstemp template
 Invokes
 .Xr mkstemp 3
 on the first argument, and returns the modified string.
@@ -431,10 +432,16 @@ Returns the current file's line number.
 .It Ic __file__
 Returns the current file's name.
 .El
+.Sh EXIT STATUS
+.Ex -std m4
+.Pp
+But note that the
+.Ic m4exit
+macro can modify the exit status.
 .Sh STANDARDS
 The
 .Nm
-utility is compliant with the
+utility is mostly compliant with the
 .St -p1003.1-2008
 specification.
 .Pp
@@ -456,6 +463,12 @@ and
 .Ic __file__
 are extensions to that specification.
 .Pp
+.Ic maketemp
+is not supposed to be a synonym for
+.Ic mkstemp ,
+but instead to be an insecure temporary file name creation function.
+The change causes no known compatibility issues.
+.Pp
 The output format of tracing and of
 .Ic dumpdef
 are not specified in any standard,
@@ -480,7 +493,7 @@ replaces the top-most definition only.
 Other implementations may erase all definitions on the stack instead.
 .Pp
 All built-ins do expand without arguments in many other
-.Nm m4 .
+.Nm .
 .Pp
 Many other
 .Nm
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index c8de97c..1cb0340 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.80 2011/09/27 07:24:02 espie Exp $	*/
+/*	$OpenBSD: main.c,v 1.81 2012/04/12 17:00:11 espie Exp $	*/
 /*	$NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $	*/
 
 /*-
diff --git a/usr.bin/m4/parser.y b/usr.bin/m4/parser.y
index 2239cf3..8e8ad8c 100644
--- a/usr.bin/m4/parser.y
+++ b/usr.bin/m4/parser.y
@@ -1,5 +1,5 @@
 %{
-/* $OpenBSD: parser.y,v 1.6 2008/08/21 21:00:14 espie Exp $ */
+/* $OpenBSD: parser.y,v 1.7 2012/04/12 17:00:11 espie Exp $ */
 /*
  * Copyright (c) 2004 Marc Espie <espie@cvs.openbsd.org>
  *
diff --git a/usr.bin/m4/tokenizer.l b/usr.bin/m4/tokenizer.l
index ca3612e..2b4b2db 100644
--- a/usr.bin/m4/tokenizer.l
+++ b/usr.bin/m4/tokenizer.l
@@ -1,6 +1,6 @@
 %option nounput noinput
 %{
-/* $OpenBSD: tokenizer.l,v 1.7 2010/03/22 20:40:44 espie Exp $ */
+/* $OpenBSD: tokenizer.l,v 1.8 2012/04/12 17:00:11 espie Exp $ */
 /*
  * Copyright (c) 2004 Marc Espie <espie@cvs.openbsd.org>
  *
@@ -31,6 +31,8 @@ extern int32_t yylval;
 int32_t number(void);
 int32_t parse_radix(void);
 extern int yylex(void);
+
+#define	YY_DECL	int yylex(void)
 %}
 
 delim 	[ \t\n]
diff --git a/usr.bin/mail/popen.c b/usr.bin/mail/popen.c
index c4d1746..60a0936 100644
--- a/usr.bin/mail/popen.c
+++ b/usr.bin/mail/popen.c
@@ -316,7 +316,7 @@ sigchild(int signo __unused)
 	int status;
 	struct child *cp;
 
-	while ((pid = waitpid((pid_t)-1, &status, WNOHANG)) > 0) {
+	while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
 		cp = findchild(pid);
 		if (cp->free)
 			delchild(cp);
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 5442eaa..4605bb3 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -111,4 +111,11 @@ CFLAGS+=	-DDEFSHELLNAME=\"${MAKE_SHELL}\"
 .error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"."
 .endif
 
+.if defined(MK_BMAKE) && ${MK_BMAKE} != "no"
+# if we are here we don't want this called 'make'
+PROG=	fmake
+fmake.1: make.1
+	cp ${.ALLSRC} ${.TARGET}
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index bc1d6a0..6fee0ec 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -2128,7 +2128,7 @@ Job_CatchChildren(Boolean block)
 	}
 
 	for (;;) {
-		pid = waitpid((pid_t)-1, &status,
+		pid = waitpid(-1, &status,
 		    (block ? 0 : WNOHANG) | WUNTRACED);
 		if (pid <= 0)
 			break;
@@ -2628,7 +2628,7 @@ Job_AbortAll(void)
 	/*
 	 * Catch as many children as want to report in at first, then give up
 	 */
-	while (waitpid((pid_t)-1, &foo, WNOHANG) > 0)
+	while (waitpid(-1, &foo, WNOHANG) > 0)
 		;
 }
 
diff --git a/usr.bin/mkcsmapper/Makefile b/usr.bin/mkcsmapper/Makefile
index 5d58a0c..6dbb0ec 100644
--- a/usr.bin/mkcsmapper/Makefile
+++ b/usr.bin/mkcsmapper/Makefile
@@ -5,5 +5,7 @@
 PROG=	mkcsmapper
 LDFLAGS+= -L${.CURDIR}/../../lib/libc
 
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
 .include "${.CURDIR}/Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/usr.bin/mkcsmapper/ldef.h b/usr.bin/mkcsmapper/ldef.h
index 70c3122..d585703 100644
--- a/usr.bin/mkcsmapper/ldef.h
+++ b/usr.bin/mkcsmapper/ldef.h
@@ -36,6 +36,6 @@ typedef struct {
 } linear_zone_t;
 
 extern int	 debug;
-extern int	 line_number;
+extern int	 linenumber;
 extern int	 yyerror(const char *);
 extern int	 yylex(void);
diff --git a/usr.bin/mkcsmapper/lex.l b/usr.bin/mkcsmapper/lex.l
index d8ab1b6..33b7f8e 100644
--- a/usr.bin/mkcsmapper/lex.l
+++ b/usr.bin/mkcsmapper/lex.l
@@ -41,7 +41,9 @@
 #include "ldef.h"
 #include "yacc.h"
 
-int line_number = 1;
+#define YY_DECL int yylex(void)
+
+int linenumber = 1;
 %}
 %option	noinput
 %option	nounput
@@ -51,11 +53,11 @@ int line_number = 1;
 %%
 
 [ \t]+	{ }
-#.*[\n]|"//".*[\n]|[\n]	{ line_number++; return (R_LN); }
+#.*[\n]|"//".*[\n]|[\n]	{ linenumber++; return (R_LN); }
 
 "/*"		{ BEGIN COMMENT; }
 <COMMENT>"*/"	{ BEGIN 0; }
-<COMMENT>[\n]	{ line_number++; }
+<COMMENT>[\n]	{ linenumber++; }
 <COMMENT>.	{ }
 <COMMENT><<EOF>>	{
 		yyerror("unexpected file end (unterminated comment)\n");
diff --git a/usr.bin/mkcsmapper/yacc.y b/usr.bin/mkcsmapper/yacc.y
index 5d1a06b..18497ce 100644
--- a/usr.bin/mkcsmapper/yacc.y
+++ b/usr.bin/mkcsmapper/yacc.y
@@ -203,7 +203,7 @@ static void
 warning(const char *s)
 {
 
-	fprintf(stderr, "%s in %d\n", s, line_number);
+	fprintf(stderr, "%s in %d\n", s, linenumber);
 }
 
 int
diff --git a/usr.bin/mkesdb/Makefile b/usr.bin/mkesdb/Makefile
index d4bd03f..69aed65 100644
--- a/usr.bin/mkesdb/Makefile
+++ b/usr.bin/mkesdb/Makefile
@@ -5,5 +5,7 @@
 PROG=	mkesdb
 LDFLAGS+= -L${.OBJDIR}/../../lib/libc
 
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
 .include "${.CURDIR}/Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/usr.bin/mkesdb/ldef.h b/usr.bin/mkesdb/ldef.h
index 0c5e76a..45b4e60 100644
--- a/usr.bin/mkesdb/ldef.h
+++ b/usr.bin/mkesdb/ldef.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-extern int	 line_number;
+extern int	 linenumber;
 extern int	 yyerror(const char *);
 extern int	 yylex(void);
 
diff --git a/usr.bin/mkesdb/lex.l b/usr.bin/mkesdb/lex.l
index 3e852b0..c9d9cc1 100644
--- a/usr.bin/mkesdb/lex.l
+++ b/usr.bin/mkesdb/lex.l
@@ -43,7 +43,9 @@
 #include "ldef.h"
 #include "yacc.h"
 
-int line_number = 1;
+#define YY_DECL int yylex(void)
+
+int linenumber = 1;
 %}
 %option	noinput
 %option	nounput
@@ -53,11 +55,11 @@ int line_number = 1;
 %%
 
 [ \t]+	{ }
-#.*[\n]|"//".*[\n]|[\n]	{ line_number++; return (R_LN); }
+#.*[\n]|"//".*[\n]|[\n]	{ linenumber++; return (R_LN); }
 
 "/*"		{ BEGIN COMMENT; }
 <COMMENT>"*/"	{ BEGIN 0; }
-<COMMENT>[\n]	{ line_number++; }
+<COMMENT>[\n]	{ linenumber++; }
 <COMMENT>.	{ }
 <COMMENT><<EOF>>	{
 		yyerror("unexpected file end (unterminated comment)\n");
diff --git a/usr.bin/mkesdb/yacc.y b/usr.bin/mkesdb/yacc.y
index 0c01b61..6d77b15 100644
--- a/usr.bin/mkesdb/yacc.y
+++ b/usr.bin/mkesdb/yacc.y
@@ -114,7 +114,7 @@ int
 yyerror(const char *s)
 {
 
-	fprintf(stderr, "%s in %d\n", s, line_number);
+	fprintf(stderr, "%s in %d\n", s, linenumber);
 
 	return (0);
 }
diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index e75fe99..83850c4 100644
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@@ -5,4 +5,6 @@ PROG=	mklocale
 SRCS=	yacc.y lex.l y.tab.h
 CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc/locale
 
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/mklocale/lex.l b/usr.bin/mklocale/lex.l
index d931df7..08fa54a 100644
--- a/usr.bin/mklocale/lex.l
+++ b/usr.bin/mklocale/lex.l
@@ -47,6 +47,8 @@ __FBSDID("$FreeBSD$");
 #include "ldef.h"
 #include "y.tab.h"
 #include "extern.h"
+
+#define	YY_DECL	int yylex(void)
 %}
 
 ODIGIT	[0-7]
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index a04cc9a..af235f1 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -603,13 +603,8 @@ tcp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 			warn("sysctl: net.inet.tcp.stats");
 			return;
 		}
-	} else {
-		u_long tcpstat_p[sizeof(struct tcpstat)/sizeof(uint64_t)];
- 
-		kread(off, &tcpstat_p, sizeof(tcpstat_p));
-		kread_counters(tcpstat_p, (uint64_t *)&tcpstat,
-		    sizeof(struct tcpstat)/sizeof(uint64_t));
-	}
+	} else
+		kread_counters(off, &tcpstat, len);
 
 	printf ("%s:\n", name);
 
@@ -743,7 +738,7 @@ udp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 {
 	struct udpstat udpstat, zerostat;
 	size_t len = sizeof udpstat;
-	u_long delivered;
+	uint64_t delivered;
 
 #ifdef INET6
 	if (udp_done != 0)
@@ -761,23 +756,23 @@ udp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 			return;
 		}
 	} else
-		kread(off, &udpstat, len);
+		kread_counters(off, &udpstat, len);
 
 	printf("%s:\n", name);
 #define	p(f, m) if (udpstat.f || sflag <= 1) \
-    printf(m, udpstat.f, plural(udpstat.f))
+    printf("\t%ju " m, (uintmax_t)udpstat.f, plural(udpstat.f))
 #define	p1a(f, m) if (udpstat.f || sflag <= 1) \
-    printf(m, udpstat.f)
-	p(udps_ipackets, "\t%lu datagram%s received\n");
-	p1a(udps_hdrops, "\t%lu with incomplete header\n");
-	p1a(udps_badlen, "\t%lu with bad data length field\n");
-	p1a(udps_badsum, "\t%lu with bad checksum\n");
-	p1a(udps_nosum, "\t%lu with no checksum\n");
-	p1a(udps_noport, "\t%lu dropped due to no socket\n");
+    printf("\t%ju " m, (uintmax_t)udpstat.f)
+	p(udps_ipackets, "datagram%s received\n");
+	p1a(udps_hdrops, "with incomplete header\n");
+	p1a(udps_badlen, "with bad data length field\n");
+	p1a(udps_badsum, "with bad checksum\n");
+	p1a(udps_nosum, "with no checksum\n");
+	p1a(udps_noport, "dropped due to no socket\n");
 	p(udps_noportbcast,
-	    "\t%lu broadcast/multicast datagram%s undelivered\n");
-	p1a(udps_fullsock, "\t%lu dropped due to full socket buffers\n");
-	p1a(udpps_pcbhashmiss, "\t%lu not for hashed pcb\n");
+	    "broadcast/multicast datagram%s undelivered\n");
+	p1a(udps_fullsock, "dropped due to full socket buffers\n");
+	p1a(udpps_pcbhashmiss, "not for hashed pcb\n");
 	delivered = udpstat.udps_ipackets -
 		    udpstat.udps_hdrops -
 		    udpstat.udps_badlen -
@@ -786,11 +781,11 @@ udp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 		    udpstat.udps_noportbcast -
 		    udpstat.udps_fullsock;
 	if (delivered || sflag <= 1)
-		printf("\t%lu delivered\n", delivered);
-	p(udps_opackets, "\t%lu datagram%s output\n");
+		printf("\t%ju delivered\n", (uint64_t)delivered);
+	p(udps_opackets, "datagram%s output\n");
 	/* the next statistic is cumulative in udps_noportbcast */
 	p(udps_filtermcast,
-	    "\t%lu time%s multicast source filter matched\n");
+	    "time%s multicast source filter matched\n");
 #undef p
 #undef p1a
 }
@@ -816,7 +811,7 @@ carp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 	} else {
 		if (off == 0)
 			return;
-		kread(off, &carpstat, len);
+		kread_counters(off, &carpstat, len);
 	}
 
 	printf("%s:\n", name);
@@ -863,13 +858,8 @@ ip_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 			warn("sysctl: net.inet.ip.stats");
 			return;
 		}
-	} else {
-		u_long ipstat_p[sizeof(struct ipstat)/sizeof(uint64_t)];
-
-		kread(off, &ipstat_p, sizeof(ipstat_p));
-		kread_counters(ipstat_p, (uint64_t *)&ipstat,
-		    sizeof(struct ipstat)/sizeof(uint64_t));
-	}
+	} else
+		kread_counters(off, &ipstat, len);
 
 	printf("%s:\n", name);
 
@@ -933,23 +923,23 @@ arp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 			return;
 		}
 	} else
-		kread(off, &arpstat, len);
+		kread_counters(off, &arpstat, len);
 
 	printf("%s:\n", name);
 
 #define	p(f, m) if (arpstat.f || sflag <= 1) \
-    printf(m, arpstat.f, plural(arpstat.f))
+    printf("\t%ju " m, (uintmax_t)arpstat.f, plural(arpstat.f))
 #define	p2(f, m) if (arpstat.f || sflag <= 1) \
-    printf(m, arpstat.f, pluralies(arpstat.f))
-
-	p(txrequests, "\t%lu ARP request%s sent\n");
-	p2(txreplies, "\t%lu ARP repl%s sent\n");
-	p(rxrequests, "\t%lu ARP request%s received\n");
-	p2(rxreplies, "\t%lu ARP repl%s received\n");
-	p(received, "\t%lu ARP packet%s received\n");
-	p(dropped, "\t%lu total packet%s dropped due to no ARP entry\n");
-	p(timeouts, "\t%lu ARP entry%s timed out\n");
-	p(dupips, "\t%lu Duplicate IP%s seen\n");
+    printf("\t%ju " m, (uintmax_t)arpstat.f, pluralies(arpstat.f))
+
+	p(txrequests, "ARP request%s sent\n");
+	p2(txreplies, "ARP repl%s sent\n");
+	p(rxrequests, "ARP request%s received\n");
+	p2(rxreplies, "ARP repl%s received\n");
+	p(received, "ARP packet%s received\n");
+	p(dropped, "total packet%s dropped due to no ARP entry\n");
+	p(timeouts, "ARP entry%s timed out\n");
+	p(dupips, "Duplicate IP%s seen\n");
 #undef p
 #undef p2
 }
@@ -1020,7 +1010,7 @@ icmp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 			return;
 		}
 	} else
-		kread(off, &icmpstat, len);
+		kread_counters(off, &icmpstat, len);
 
 	printf("%s:\n", name);
 
@@ -1227,7 +1217,7 @@ pim_stats(u_long off __unused, const char *name, int af1 __unused,
 	} else {
 		if (off == 0)
 			return;
-		kread(off, &pimstat, len);
+		kread_counters(off, &pimstat, len);
 	}
 
 	printf("%s:\n", name);
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index 9f51d06..78383ac 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -376,7 +376,7 @@ ip6_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 			return;
 		}
 	} else
-		kread(off, &ip6stat, len);
+		kread_counters(off, &ip6stat, len);
 
 	printf("%s:\n", name);
 
@@ -408,7 +408,7 @@ ip6_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 	p(ip6s_cantfrag, "\t%ju datagram%s that can't be fragmented\n");
 	p(ip6s_badscope, "\t%ju packet%s that violated scope rules\n");
 	p(ip6s_notmember, "\t%ju multicast packet%s which we don't join\n");
-	for (first = 1, i = 0; i < 256; i++)
+	for (first = 1, i = 0; i < IP6S_HDRCNT; i++)
 		if (ip6stat.ip6s_nxthist[i] != 0) {
 			if (first) {
 				printf("\tInput histogram:\n");
@@ -419,7 +419,7 @@ ip6_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 		}
 	printf("\tMbuf statistics:\n");
 	printf("\t\t%ju one mbuf\n", (uintmax_t)ip6stat.ip6s_m1);
-	for (first = 1, i = 0; i < 32; i++) {
+	for (first = 1, i = 0; i < IP6S_M2MMAX; i++) {
 		char ifbuf[IFNAMSIZ];
 		if (ip6stat.ip6s_m2m[i] != 0) {
 			if (first) {
@@ -445,7 +445,7 @@ ip6_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 #define	PRINT_SCOPESTAT(s,i) do {\
 		switch(i) { /* XXX hardcoding in each case */\
 		case 1:\
-			p(s, "\t\t%ju node-local%s\n");\
+			p(s, "\t\t%ju interface-local%s\n");\
 			break;\
 		case 2:\
 			p(s,"\t\t%ju link-local%s\n");\
@@ -464,7 +464,7 @@ ip6_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 
 	p(ip6s_sources_none,
 	  "\t%ju failure%s of source address selection\n");
-	for (first = 1, i = 0; i < 16; i++) {
+	for (first = 1, i = 0; i < IP6S_SCOPECNT; i++) {
 		if (ip6stat.ip6s_sources_sameif[i]) {
 			if (first) {
 				printf("\tsource addresses on an outgoing I/F\n");
@@ -473,7 +473,7 @@ ip6_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 			PRINT_SCOPESTAT(ip6s_sources_sameif[i], i);
 		}
 	}
-	for (first = 1, i = 0; i < 16; i++) {
+	for (first = 1, i = 0; i < IP6S_SCOPECNT; i++) {
 		if (ip6stat.ip6s_sources_otherif[i]) {
 			if (first) {
 				printf("\tsource addresses on a non-outgoing I/F\n");
@@ -482,7 +482,7 @@ ip6_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 			PRINT_SCOPESTAT(ip6s_sources_otherif[i], i);
 		}
 	}
-	for (first = 1, i = 0; i < 16; i++) {
+	for (first = 1, i = 0; i < IP6S_SCOPECNT; i++) {
 		if (ip6stat.ip6s_sources_samescope[i]) {
 			if (first) {
 				printf("\tsource addresses of same scope\n");
@@ -491,7 +491,7 @@ ip6_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 			PRINT_SCOPESTAT(ip6s_sources_samescope[i], i);
 		}
 	}
-	for (first = 1, i = 0; i < 16; i++) {
+	for (first = 1, i = 0; i < IP6S_SCOPECNT; i++) {
 		if (ip6stat.ip6s_sources_otherscope[i]) {
 			if (first) {
 				printf("\tsource addresses of a different scope\n");
@@ -500,7 +500,7 @@ ip6_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 			PRINT_SCOPESTAT(ip6s_sources_otherscope[i], i);
 		}
 	}
-	for (first = 1, i = 0; i < 16; i++) {
+	for (first = 1, i = 0; i < IP6S_SCOPECNT; i++) {
 		if (ip6stat.ip6s_sources_deprecated[i]) {
 			if (first) {
 				printf("\tdeprecated source addresses\n");
@@ -511,7 +511,7 @@ ip6_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 	}
 
 	printf("\tSource addresses selection rule applied:\n");
-	for (i = 0; i < 16; i++) {
+	for (i = 0; i < IP6S_RULESMAX; i++) {
 		if (ip6stat.ip6s_sources_rule[i])
 			printf("\t\t%ju %s\n",
 			       (uintmax_t)ip6stat.ip6s_sources_rule[i],
@@ -858,7 +858,7 @@ icmp6_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 			return;
 		}
 	} else
-		kread(off, &icmp6stat, len);
+		kread_counters(off, &icmp6stat, len);
 
 	printf("%s:\n", name);
 
@@ -1052,7 +1052,7 @@ rip6_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 			return;
 		}
 	} else
-		kread(off, &rip6stat, len);
+		kread_counters(off, &rip6stat, len);
 
 	printf("%s:\n", name);
 
@@ -1120,12 +1120,17 @@ inet6print(struct in6_addr *in6, int port, const char *proto, int numeric)
 char *
 inet6name(struct in6_addr *in6p)
 {
-	char *cp;
+	struct sockaddr_in6 sin6;
+	char hbuf[NI_MAXHOST], *cp;
 	static char line[50];
-	struct hostent *hp;
 	static char domain[MAXHOSTNAMELEN];
 	static int first = 1;
+	int flags, error;
 
+	if (IN6_IS_ADDR_UNSPECIFIED(in6p)) {
+		strcpy(line, "*");
+		return (line);
+	}
 	if (first && !numeric_addr) {
 		first = 0;
 		if (gethostname(domain, MAXHOSTNAMELEN) == 0 &&
@@ -1134,24 +1139,26 @@ inet6name(struct in6_addr *in6p)
 		else
 			domain[0] = 0;
 	}
-	cp = 0;
-	if (!numeric_addr && !IN6_IS_ADDR_UNSPECIFIED(in6p)) {
-		hp = gethostbyaddr((char *)in6p, sizeof(*in6p), AF_INET6);
-		if (hp) {
-			if ((cp = strchr(hp->h_name, '.')) &&
-			    !strcmp(cp + 1, domain))
-				*cp = 0;
-			cp = hp->h_name;
-		}
-	}
-	if (IN6_IS_ADDR_UNSPECIFIED(in6p))
-		strcpy(line, "*");
-	else if (cp)
-		strcpy(line, cp);
-	else
+	memset(&sin6, 0, sizeof(sin6));
+	memcpy(&sin6.sin6_addr, in6p, sizeof(*in6p));
+	sin6.sin6_family = AF_INET6;
+	/* XXX: in6p.s6_addr[2] can contain scopeid. */ 
+	in6_fillscopeid(&sin6);
+	flags = (numeric_addr) ? NI_NUMERICHOST : 0;
+	error = getnameinfo((struct sockaddr *)&sin6, sizeof(sin6), hbuf,
+	    sizeof(hbuf), NULL, 0, flags);
+	if (error == 0) {
+		if ((flags & NI_NUMERICHOST) == 0 &&
+		    (cp = strchr(hbuf, '.')) &&
+		    !strcmp(cp + 1, domain))
+			*cp = 0;
+		strcpy(line, hbuf);
+	} else {
+		/* XXX: this should not happen. */
 		sprintf(line, "%s",
-			inet_ntop(AF_INET6, (void *)in6p, ntop_buf,
+			inet_ntop(AF_INET6, (void *)&sin6.sin6_addr, ntop_buf,
 				sizeof(ntop_buf)));
+	}
 	return (line);
 }
 #endif /*INET6*/
diff --git a/usr.bin/netstat/ipsec.c b/usr.bin/netstat/ipsec.c
index 7b16f57..b4014ad 100644
--- a/usr.bin/netstat/ipsec.c
+++ b/usr.bin/netstat/ipsec.c
@@ -166,84 +166,18 @@ static struct val2str ipsec_compnames[] = {
 	{ -1, NULL },
 };
 
-static void ipsec_hist(const u_quad_t *hist, size_t histmax,
-		       const struct val2str *name, const char *title);
 static void print_ipsecstats(const struct ipsecstat *ipsecstat);
 
-
-/*
- * Dump IPSEC statistics structure.
- */
-static void
-ipsec_hist(const u_quad_t *hist, size_t histmax, const struct val2str *name,
-	   const char *title)
-{
-	int first;
-	size_t proto;
-	const struct val2str *p;
-
-	first = 1;
-	for (proto = 0; proto < histmax; proto++) {
-		if (hist[proto] <= 0)
-			continue;
-		if (first) {
-			printf("\t%s histogram:\n", title);
-			first = 0;
-		}
-		for (p = name; p && p->str; p++) {
-			if (p->val == (int)proto)
-				break;
-		}
-		if (p && p->str) {
-			printf("\t\t%s: %ju\n", p->str, (uintmax_t)hist[proto]);
-		} else {
-			printf("\t\t#%ld: %ju\n", (long)proto,
-			    (uintmax_t)hist[proto]);
-		}
-	}
-}
-
 static void
 print_ipsecstats(const struct ipsecstat *ipsecstat)
 {
 #define	p(f, m) if (ipsecstat->f || sflag <= 1) \
     printf(m, (uintmax_t)ipsecstat->f, plural(ipsecstat->f))
-#define	pes(f, m) if (ipsecstat->f || sflag <= 1) \
-    printf(m, (uintmax_t)ipsecstat->f, plurales(ipsecstat->f))
-#define	hist(f, n, t) \
-    ipsec_hist((f), sizeof(f)/sizeof(f[0]), (n), (t));
-
-	p(in_success, "\t%ju inbound packet%s processed successfully\n");
-	p(in_polvio, "\t%ju inbound packet%s violated process security "
-	    "policy\n");
-	p(in_nosa, "\t%ju inbound packet%s with no SA available\n");
-	p(in_inval, "\t%ju invalid inbound packet%s\n");
-	p(in_nomem, "\t%ju inbound packet%s failed due to insufficient memory\n");
-	p(in_badspi, "\t%ju inbound packet%s failed getting SPI\n");
-	p(in_ahreplay, "\t%ju inbound packet%s failed on AH replay check\n");
-	p(in_espreplay, "\t%ju inbound packet%s failed on ESP replay check\n");
-	p(in_ahauthsucc, "\t%ju inbound packet%s considered authentic\n");
-	p(in_ahauthfail, "\t%ju inbound packet%s failed on authentication\n");
-	hist(ipsecstat->in_ahhist, ipsec_ahnames, "AH input");
-	hist(ipsecstat->in_esphist, ipsec_espnames, "ESP input");
-	hist(ipsecstat->in_comphist, ipsec_compnames, "IPComp input");
-
-	p(out_success, "\t%ju outbound packet%s processed successfully\n");
-	p(out_polvio, "\t%ju outbound packet%s violated process security "
-	    "policy\n");
-	p(out_nosa, "\t%ju outbound packet%s with no SA available\n");
-	p(out_inval, "\t%ju invalid outbound packet%s\n");
-	p(out_nomem, "\t%ju outbound packet%s failed due to insufficient memory\n");
-	p(out_noroute, "\t%ju outbound packet%s with no route\n");
-	hist(ipsecstat->out_ahhist, ipsec_ahnames, "AH output");
-	hist(ipsecstat->out_esphist, ipsec_espnames, "ESP output");
-	hist(ipsecstat->out_comphist, ipsec_compnames, "IPComp output");
-	p(spdcachelookup, "\t%ju SPD cache lookup%s\n");
-	pes(spdcachemiss, "\t%ju SPD cache miss%s\n");
-#undef pes
-#undef hist
 	p(ips_in_polvio, "\t%ju inbound packet%s violated process "
 		"security policy\n");
+	p(ips_in_nomem, "\t%ju inbound packet%s failed due to "
+		"insufficient memory\n");
+	p(ips_in_inval, "\t%ju invalid inbound packet%s\n");
 	p(ips_out_polvio, "\t%ju outbound packet%s violated process "
 		"security policy\n");
 	p(ips_out_nosa, "\t%ju outbound packet%s with no SA available\n");
@@ -268,13 +202,13 @@ ipsec_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 	if (off == 0)
 		return;
 	printf ("%s:\n", name);
-	kread(off, (char *)&ipsecstat, sizeof(ipsecstat));
+	kread_counters(off, (char *)&ipsecstat, sizeof(ipsecstat));
 
 	print_ipsecstats(&ipsecstat);
 }
 
 
-static void ipsec_hist_new(const u_int32_t *hist, size_t histmax,
+static void ipsec_hist_new(const uint64_t *hist, size_t histmax,
 			   const struct val2str *name, const char *title);
 static void print_ahstats(const struct ahstat *ahstat);
 static void print_espstats(const struct espstat *espstat);
@@ -284,7 +218,7 @@ static void print_ipcompstats(const struct ipcompstat *ipcompstat);
  * Dump IPSEC statistics structure.
  */
 static void
-ipsec_hist_new(const u_int32_t *hist, size_t histmax,
+ipsec_hist_new(const uint64_t *hist, size_t histmax,
 	       const struct val2str *name, const char *title)
 {
 	int first;
@@ -304,10 +238,11 @@ ipsec_hist_new(const u_int32_t *hist, size_t histmax,
 				break;
 		}
 		if (p && p->str) {
-			printf("\t\t%s: %u\n", p->str, hist[proto]);
+			printf("\t\t%s: %ju\n", p->str,
+			    (uintmax_t)hist[proto]);
 		} else {
-			printf("\t\t#%lu: %u\n", (unsigned long)proto,
-			       hist[proto]);
+			printf("\t\t#%lu: %ju\n", (unsigned long)proto,
+			    (uintmax_t)hist[proto]);
 		}
 	}
 }
@@ -315,36 +250,33 @@ ipsec_hist_new(const u_int32_t *hist, size_t histmax,
 static void
 print_ahstats(const struct ahstat *ahstat)
 {
-#define	p32(f, m) if (ahstat->f || sflag <= 1) \
-    printf("\t%u" m, (unsigned int)ahstat->f, plural(ahstat->f))
-#define	p64(f, m) if (ahstat->f || sflag <= 1) \
+#define	p(f, m) if (ahstat->f || sflag <= 1) \
     printf("\t%ju" m, (uintmax_t)ahstat->f, plural(ahstat->f))
 #define	hist(f, n, t) \
     ipsec_hist_new((f), sizeof(f)/sizeof(f[0]), (n), (t));
 
-	p32(ahs_hdrops, " packet%s shorter than header shows\n");
-	p32(ahs_nopf, " packet%s dropped; protocol family not supported\n");
-	p32(ahs_notdb, " packet%s dropped; no TDB\n");
-	p32(ahs_badkcr, " packet%s dropped; bad KCR\n");
-	p32(ahs_qfull, " packet%s dropped; queue full\n");
-	p32(ahs_noxform, " packet%s dropped; no transform\n");
-	p32(ahs_wrap, " replay counter wrap%s\n");
-	p32(ahs_badauth, " packet%s dropped; bad authentication detected\n");
-	p32(ahs_badauthl, " packet%s dropped; bad authentication length\n");
-	p32(ahs_replay, " possible replay packet%s detected\n");
-	p32(ahs_input, " packet%s in\n");
-	p32(ahs_output, " packet%s out\n");
-	p32(ahs_invalid, " packet%s dropped; invalid TDB\n");
-	p64(ahs_ibytes, " byte%s in\n");
-	p64(ahs_obytes, " byte%s out\n");
-	p32(ahs_toobig, " packet%s dropped; larger than IP_MAXPACKET\n");
-	p32(ahs_pdrops, " packet%s blocked due to policy\n");
-	p32(ahs_crypto, " crypto processing failure%s\n");
-	p32(ahs_tunnel, " tunnel sanity check failure%s\n");
+	p(ahs_hdrops, " packet%s shorter than header shows\n");
+	p(ahs_nopf, " packet%s dropped; protocol family not supported\n");
+	p(ahs_notdb, " packet%s dropped; no TDB\n");
+	p(ahs_badkcr, " packet%s dropped; bad KCR\n");
+	p(ahs_qfull, " packet%s dropped; queue full\n");
+	p(ahs_noxform, " packet%s dropped; no transform\n");
+	p(ahs_wrap, " replay counter wrap%s\n");
+	p(ahs_badauth, " packet%s dropped; bad authentication detected\n");
+	p(ahs_badauthl, " packet%s dropped; bad authentication length\n");
+	p(ahs_replay, " possible replay packet%s detected\n");
+	p(ahs_input, " packet%s in\n");
+	p(ahs_output, " packet%s out\n");
+	p(ahs_invalid, " packet%s dropped; invalid TDB\n");
+	p(ahs_ibytes, " byte%s in\n");
+	p(ahs_obytes, " byte%s out\n");
+	p(ahs_toobig, " packet%s dropped; larger than IP_MAXPACKET\n");
+	p(ahs_pdrops, " packet%s blocked due to policy\n");
+	p(ahs_crypto, " crypto processing failure%s\n");
+	p(ahs_tunnel, " tunnel sanity check failure%s\n");
 	hist(ahstat->ahs_hist, ipsec_ahnames, "AH output");
 
-#undef p32
-#undef p64
+#undef p
 #undef hist
 }
 
@@ -356,7 +288,7 @@ ah_stats(u_long off, const char *name, int family __unused, int proto __unused)
 	if (off == 0)
 		return;
 	printf ("%s:\n", name);
-	kread(off, (char *)&ahstat, sizeof(ahstat));
+	kread_counters(off, (char *)&ahstat, sizeof(ahstat));
 
 	print_ahstats(&ahstat);
 }
@@ -364,37 +296,34 @@ ah_stats(u_long off, const char *name, int family __unused, int proto __unused)
 static void
 print_espstats(const struct espstat *espstat)
 {
-#define	p32(f, m) if (espstat->f || sflag <= 1) \
-    printf("\t%u" m, (unsigned int)espstat->f, plural(espstat->f))
-#define	p64(f, m) if (espstat->f || sflag <= 1) \
+#define	p(f, m) if (espstat->f || sflag <= 1) \
     printf("\t%ju" m, (uintmax_t)espstat->f, plural(espstat->f))
 #define	hist(f, n, t) \
     ipsec_hist_new((f), sizeof(f)/sizeof(f[0]), (n), (t));
 
-	p32(esps_hdrops, " packet%s shorter than header shows\n");
-	p32(esps_nopf, " packet%s dropped; protocol family not supported\n");
-	p32(esps_notdb, " packet%s dropped; no TDB\n");
-	p32(esps_badkcr, " packet%s dropped; bad KCR\n");
-	p32(esps_qfull, " packet%s dropped; queue full\n");
-	p32(esps_noxform, " packet%s dropped; no transform\n");
-	p32(esps_badilen, " packet%s dropped; bad ilen\n");
-	p32(esps_wrap, " replay counter wrap%s\n");
-	p32(esps_badenc, " packet%s dropped; bad encryption detected\n");
-	p32(esps_badauth, " packet%s dropped; bad authentication detected\n");
-	p32(esps_replay, " possible replay packet%s detected\n");
-	p32(esps_input, " packet%s in\n");
-	p32(esps_output, " packet%s out\n");
-	p32(esps_invalid, " packet%s dropped; invalid TDB\n");
-	p64(esps_ibytes, " byte%s in\n");
-	p64(esps_obytes, " byte%s out\n");
-	p32(esps_toobig, " packet%s dropped; larger than IP_MAXPACKET\n");
-	p32(esps_pdrops, " packet%s blocked due to policy\n");
-	p32(esps_crypto, " crypto processing failure%s\n");
-	p32(esps_tunnel, " tunnel sanity check failure%s\n");
+	p(esps_hdrops, " packet%s shorter than header shows\n");
+	p(esps_nopf, " packet%s dropped; protocol family not supported\n");
+	p(esps_notdb, " packet%s dropped; no TDB\n");
+	p(esps_badkcr, " packet%s dropped; bad KCR\n");
+	p(esps_qfull, " packet%s dropped; queue full\n");
+	p(esps_noxform, " packet%s dropped; no transform\n");
+	p(esps_badilen, " packet%s dropped; bad ilen\n");
+	p(esps_wrap, " replay counter wrap%s\n");
+	p(esps_badenc, " packet%s dropped; bad encryption detected\n");
+	p(esps_badauth, " packet%s dropped; bad authentication detected\n");
+	p(esps_replay, " possible replay packet%s detected\n");
+	p(esps_input, " packet%s in\n");
+	p(esps_output, " packet%s out\n");
+	p(esps_invalid, " packet%s dropped; invalid TDB\n");
+	p(esps_ibytes, " byte%s in\n");
+	p(esps_obytes, " byte%s out\n");
+	p(esps_toobig, " packet%s dropped; larger than IP_MAXPACKET\n");
+	p(esps_pdrops, " packet%s blocked due to policy\n");
+	p(esps_crypto, " crypto processing failure%s\n");
+	p(esps_tunnel, " tunnel sanity check failure%s\n");
 	hist(espstat->esps_hist, ipsec_espnames, "ESP output");
 
-#undef p32
-#undef p64
+#undef p
 #undef hist
 }
 
@@ -406,7 +335,7 @@ esp_stats(u_long off, const char *name, int family __unused, int proto __unused)
 	if (off == 0)
 		return;
 	printf ("%s:\n", name);
-	kread(off, (char *)&espstat, sizeof(espstat));
+	kread_counters(off, (char *)&espstat, sizeof(espstat));
 
 	print_espstats(&espstat);
 }
@@ -414,42 +343,31 @@ esp_stats(u_long off, const char *name, int family __unused, int proto __unused)
 static void
 print_ipcompstats(const struct ipcompstat *ipcompstat)
 {
-	uint32_t version;
-#define	p32(f, m) if (ipcompstat->f || sflag <= 1) \
-    printf("\t%u" m, (unsigned int)ipcompstat->f, plural(ipcompstat->f))
-#define	p64(f, m) if (ipcompstat->f || sflag <= 1) \
+#define	p(f, m) if (ipcompstat->f || sflag <= 1) \
     printf("\t%ju" m, (uintmax_t)ipcompstat->f, plural(ipcompstat->f))
 #define	hist(f, n, t) \
     ipsec_hist_new((f), sizeof(f)/sizeof(f[0]), (n), (t));
 
-#ifndef IPCOMPSTAT_VERSION
-	version = 0;
-#else
-	version = ipcompstat->version;
-#endif
-	p32(ipcomps_hdrops, " packet%s shorter than header shows\n");
-	p32(ipcomps_nopf, " packet%s dropped; protocol family not supported\n");
-	p32(ipcomps_notdb, " packet%s dropped; no TDB\n");
-	p32(ipcomps_badkcr, " packet%s dropped; bad KCR\n");
-	p32(ipcomps_qfull, " packet%s dropped; queue full\n");
-	p32(ipcomps_noxform, " packet%s dropped; no transform\n");
-	p32(ipcomps_wrap, " replay counter wrap%s\n");
-	p32(ipcomps_input, " packet%s in\n");
-	p32(ipcomps_output, " packet%s out\n");
-	p32(ipcomps_invalid, " packet%s dropped; invalid TDB\n");
-	p64(ipcomps_ibytes, " byte%s in\n");
-	p64(ipcomps_obytes, " byte%s out\n");
-	p32(ipcomps_toobig, " packet%s dropped; larger than IP_MAXPACKET\n");
-	p32(ipcomps_pdrops, " packet%s blocked due to policy\n");
-	p32(ipcomps_crypto, " crypto processing failure%s\n");
+	p(ipcomps_hdrops, " packet%s shorter than header shows\n");
+	p(ipcomps_nopf, " packet%s dropped; protocol family not supported\n");
+	p(ipcomps_notdb, " packet%s dropped; no TDB\n");
+	p(ipcomps_badkcr, " packet%s dropped; bad KCR\n");
+	p(ipcomps_qfull, " packet%s dropped; queue full\n");
+	p(ipcomps_noxform, " packet%s dropped; no transform\n");
+	p(ipcomps_wrap, " replay counter wrap%s\n");
+	p(ipcomps_input, " packet%s in\n");
+	p(ipcomps_output, " packet%s out\n");
+	p(ipcomps_invalid, " packet%s dropped; invalid TDB\n");
+	p(ipcomps_ibytes, " byte%s in\n");
+	p(ipcomps_obytes, " byte%s out\n");
+	p(ipcomps_toobig, " packet%s dropped; larger than IP_MAXPACKET\n");
+	p(ipcomps_pdrops, " packet%s blocked due to policy\n");
+	p(ipcomps_crypto, " crypto processing failure%s\n");
 	hist(ipcompstat->ipcomps_hist, ipsec_compnames, "COMP output");
-	if (version >= 1) {
-	p32(ipcomps_threshold, " packet%s sent uncompressed; size < compr. algo. threshold\n");
-	p32(ipcomps_uncompr, " packet%s sent uncompressed; compression was useless\n");
-	}
+	p(ipcomps_threshold, " packet%s sent uncompressed; size < compr. algo. threshold\n");
+	p(ipcomps_uncompr, " packet%s sent uncompressed; compression was useless\n");
 
-#undef p32
-#undef p64
+#undef p
 #undef hist
 }
 
@@ -462,7 +380,7 @@ ipcomp_stats(u_long off, const char *name, int family __unused,
 	if (off == 0)
 		return;
 	printf ("%s:\n", name);
-	kread(off, (char *)&ipcompstat, sizeof(ipcompstat));
+	kread_counters(off, (char *)&ipcompstat, sizeof(ipcompstat));
 
 	print_ipcompstats(&ipcompstat);
 }
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index ce4ff95..4efa280 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -112,78 +112,58 @@ static struct nlist nl[] = {
 	{ .n_name = "_mif6table" },
 #define	N_PFKEYSTAT	20
 	{ .n_name = "_pfkeystat" },
-#define	N_MBSTAT	21
-	{ .n_name = "_mbstat" },
-#define	N_MBTYPES	22
-	{ .n_name = "_mbtypes" },
-#define	N_NMBCLUSTERS	23
-	{ .n_name = "_nmbclusters" },
-#define	N_NMBUFS	24
-	{ .n_name = "_nmbufs" },
-#define	N_MBHI		25
-	{ .n_name = "_mbuf_hiwm" },
-#define	N_CLHI		26
-	{ .n_name = "_clust_hiwm" },
-#define	N_NCPUS		27
-	{ .n_name = "_smp_cpus" },
-#define	N_PAGESZ	28
-	{ .n_name = "_pagesize" },
-#define	N_MBPSTAT	29
-	{ .n_name = "_mb_statpcpu" },
-#define	N_RTTRASH	30
+#define	N_RTTRASH	21
 	{ .n_name = "_rttrash" },
-#define	N_MBLO		31
-	{ .n_name = "_mbuf_lowm" },
-#define	N_CLLO		32
-	{ .n_name = "_clust_lowm" },
-#define	N_CARPSTAT	33
+#define	N_CARPSTAT	22
 	{ .n_name = "_carpstats" },
-#define	N_PFSYNCSTAT	34
+#define	N_PFSYNCSTAT	23
 	{ .n_name = "_pfsyncstats" },
-#define	N_AHSTAT	35
+#define	N_AHSTAT	24
 	{ .n_name = "_ahstat" },
-#define	N_ESPSTAT	36
+#define	N_ESPSTAT	25
 	{ .n_name = "_espstat" },
-#define	N_IPCOMPSTAT	37
+#define	N_IPCOMPSTAT	26
 	{ .n_name = "_ipcompstat" },
-#define	N_TCPSTAT	38
-	{ .n_name = "_tcpstatp" },
-#define	N_UDPSTAT	39
+#define	N_TCPSTAT	27
+	{ .n_name = "_tcpstat" },
+#define	N_UDPSTAT	28
 	{ .n_name = "_udpstat" },
-#define	N_IPSTAT	40
-	{ .n_name = "_ipstatp" },
-#define	N_ICMPSTAT	41
+#define	N_IPSTAT	29
+	{ .n_name = "_ipstat" },
+#define	N_ICMPSTAT	30
 	{ .n_name = "_icmpstat" },
-#define	N_IGMPSTAT	42
+#define	N_IGMPSTAT	31
 	{ .n_name = "_igmpstat" },
-#define	N_PIMSTAT	43
+#define	N_PIMSTAT	32
 	{ .n_name = "_pimstat" },
-#define	N_TCBINFO	44
+#define	N_TCBINFO	33
 	{ .n_name = "_tcbinfo" },
-#define	N_UDBINFO	45
+#define	N_UDBINFO	34
 	{ .n_name = "_udbinfo" },
-#define	N_DIVCBINFO	46
+#define	N_DIVCBINFO	35
 	{ .n_name = "_divcbinfo" },
-#define	N_RIPCBINFO	47
+#define	N_RIPCBINFO	36
 	{ .n_name = "_ripcbinfo" },
-#define	N_UNP_COUNT	48
+#define	N_UNP_COUNT	37
 	{ .n_name = "_unp_count" },
-#define	N_UNP_GENCNT	49
+#define	N_UNP_GENCNT	38
 	{ .n_name = "_unp_gencnt" },
-#define	N_UNP_DHEAD	50
+#define	N_UNP_DHEAD	39
 	{ .n_name = "_unp_dhead" },
-#define	N_UNP_SHEAD	51
+#define	N_UNP_SHEAD	40
 	{ .n_name = "_unp_shead" },
-#define	N_RIP6STAT	52
+#define	N_RIP6STAT	41
 	{ .n_name = "_rip6stat" },
-#define	N_SCTPSTAT	53
+#define	N_SCTPSTAT	42
 	{ .n_name = "_sctpstat" },
-#define	N_MFCTABLESIZE	54
+#define	N_MFCTABLESIZE	43
 	{ .n_name = "_mfctablesize" },
-#define N_ARPSTAT       55
+#define	N_ARPSTAT       44
 	{ .n_name = "_arpstat" },
-#define	N_UNP_SPHEAD	56
+#define	N_UNP_SPHEAD	45
 	{ .n_name = "unp_sphead" },
+#define	N_SFSTAT	46
+	{ .n_name = "_sfstat"},
 	{ .n_name = NULL },
 };
 
@@ -363,10 +343,12 @@ main(int argc, char *argv[])
 {
 	struct protox *tp = NULL;  /* for printing cblocks & stats */
 	int ch;
+	int fib = -1;
+	char *endptr;
 
 	af = AF_UNSPEC;
 
-	while ((ch = getopt(argc, argv, "AaBbdf:ghI:iLlM:mN:np:Qq:rSTsuWw:xz"))
+	while ((ch = getopt(argc, argv, "AaBbdF:f:ghI:iLlM:mN:np:Qq:rSTsuWw:xz"))
 	    != -1)
 		switch(ch) {
 		case 'A':
@@ -384,6 +366,12 @@ main(int argc, char *argv[])
 		case 'd':
 			dflag = 1;
 			break;
+		case 'F':
+			fib = strtol(optarg, &endptr, 0);
+			if (*endptr != '\0' ||
+			    (fib == 0 && (errno == EINVAL || errno == ERANGE)))
+				errx(1, "%s: invalid fib", optarg);
+			break;
 		case 'f':
 			if (strcmp(optarg, "ipx") == 0)
 				af = AF_IPX;
@@ -535,7 +523,7 @@ main(int argc, char *argv[])
 	if (mflag) {
 		if (!live) {
 			if (kread(0, NULL, 0) == 0)
-				mbpr(kvmd, nl[N_MBSTAT].n_value);
+				mbpr(kvmd, nl[N_SFSTAT].n_value);
 		} else
 			mbpr(NULL, 0);
 		exit(0);
@@ -571,7 +559,7 @@ main(int argc, char *argv[])
 		if (sflag)
 			rt_stats(nl[N_RTSTAT].n_value, nl[N_RTTRASH].n_value);
 		else
-			routepr(nl[N_RTREE].n_value);
+			routepr(nl[N_RTREE].n_value, fib);
 		exit(0);
 	}
 	if (gflag) {
@@ -753,15 +741,21 @@ kread(u_long addr, void *buf, size_t size)
  * Read an array of N counters in kernel memory into array of N uint64_t's.
  */
 int
-kread_counters(u_long *addr, uint64_t *rval, size_t count)
+kread_counters(u_long addr, void *buf, size_t size)
 {
+	uint64_t *c = buf;
 
 	if (kvmd_init() < 0)
 		return (-1);
 
-	for (u_int i = 0; i < count; i++, addr++, rval++)
-		*rval = kvm_counter_u64_fetch(kvmd, *addr);
+	if (kread(addr, buf, size) < 0)
+		return (-1);
 
+	while (size != 0) {
+		*c = kvm_counter_u64_fetch(kvmd, *c);
+		size -= sizeof(*c);
+		c++;
+	}
 	return (0);
 }
 
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 401a03c..d32304d 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
+#include <sys/sf_buf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
@@ -81,7 +82,7 @@ mbpr(void *kvmd, u_long mbaddr)
 	uintmax_t jumbo16_failures, jumbo16_sleeps, jumbo16_size;
 	uintmax_t bytes_inuse, bytes_incache, bytes_total;
 	int nsfbufs, nsfbufspeak, nsfbufsused;
-	struct mbstat mbstat;
+	struct sfstat sfstat;
 	size_t mlen;
 	int error;
 
@@ -308,20 +309,21 @@ mbpr(void *kvmd, u_long mbaddr)
 		    &mlen, NULL, 0))
 			printf("%d/%d/%d sfbufs in use (current/peak/max)\n",
 			    nsfbufsused, nsfbufspeak, nsfbufs);
-		mlen = sizeof(mbstat);
-		if (sysctlbyname("kern.ipc.mbstat", &mbstat, &mlen, NULL, 0)) {
-			warn("kern.ipc.mbstat");
+		mlen = sizeof(sfstat);
+		if (sysctlbyname("kern.ipc.sfstat", &sfstat, &mlen, NULL, 0)) {
+			warn("kern.ipc.sfstat");
 			goto out;
 		}
 	} else {
-		if (kread(mbaddr, (char *)&mbstat, sizeof mbstat) != 0)
+		if (kread_counters(mbaddr, (char *)&sfstat, sizeof sfstat) != 0)
 			goto out;
 	}
-	printf("%lu requests for sfbufs denied\n", mbstat.sf_allocfail);
-	printf("%lu requests for sfbufs delayed\n", mbstat.sf_allocwait);
-	printf("%lu requests for I/O initiated by sendfile\n",
-	    mbstat.sf_iocnt);
-	printf("%lu calls to protocol drain routines\n", mbstat.m_drain);
+	printf("%ju requests for sfbufs denied\n",
+	    (uintmax_t)sfstat.sf_allocfail);
+	printf("%ju requests for sfbufs delayed\n",
+	    (uintmax_t)sfstat.sf_allocwait);
+	printf("%ju requests for I/O initiated by sendfile\n",
+	    (uintmax_t)sfstat.sf_iocnt);
 out:
 	memstat_mtl_free(mtlp);
 }
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index 4d55cb6..7cade4e 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -350,29 +350,29 @@ mrt_stats(u_long mstaddr)
 			return;
 		}
 	} else
-		kread(mstaddr, (char *)&mrtstat, sizeof(mrtstat));
+		kread_counters(mstaddr, &mrtstat, len);
 
 	printf("IPv4 multicast forwarding:\n");
 
 #define	p(f, m) if (mrtstat.f || sflag <= 1) \
-	printf(m, mrtstat.f, plural(mrtstat.f))
+	printf(m, (uintmax_t)mrtstat.f, plural(mrtstat.f))
 #define	p2(f, m) if (mrtstat.f || sflag <= 1) \
-	printf(m, mrtstat.f, plurales(mrtstat.f))
+	printf(m, (uintmax_t)mrtstat.f, plurales(mrtstat.f))
 
-	p(mrts_mfc_lookups, "\t%lu multicast forwarding cache lookup%s\n");
-	p2(mrts_mfc_misses, "\t%lu multicast forwarding cache miss%s\n");
-	p(mrts_upcalls, "\t%lu upcall%s to multicast routing daemon\n");
-	p(mrts_upq_ovflw, "\t%lu upcall queue overflow%s\n");
+	p(mrts_mfc_lookups, "\t%ju multicast forwarding cache lookup%s\n");
+	p2(mrts_mfc_misses, "\t%ju multicast forwarding cache miss%s\n");
+	p(mrts_upcalls, "\t%ju upcall%s to multicast routing daemon\n");
+	p(mrts_upq_ovflw, "\t%ju upcall queue overflow%s\n");
 	p(mrts_upq_sockfull,
-	    "\t%lu upcall%s dropped due to full socket buffer\n");
-	p(mrts_cache_cleanups, "\t%lu cache cleanup%s\n");
-	p(mrts_no_route, "\t%lu datagram%s with no route for origin\n");
-	p(mrts_bad_tunnel, "\t%lu datagram%s arrived with bad tunneling\n");
-	p(mrts_cant_tunnel, "\t%lu datagram%s could not be tunneled\n");
-	p(mrts_wrong_if, "\t%lu datagram%s arrived on wrong interface\n");
-	p(mrts_drop_sel, "\t%lu datagram%s selectively dropped\n");
-	p(mrts_q_overflow, "\t%lu datagram%s dropped due to queue overflow\n");
-	p(mrts_pkt2large, "\t%lu datagram%s dropped for being too large\n");
+	    "\t%ju upcall%s dropped due to full socket buffer\n");
+	p(mrts_cache_cleanups, "\t%ju cache cleanup%s\n");
+	p(mrts_no_route, "\t%ju datagram%s with no route for origin\n");
+	p(mrts_bad_tunnel, "\t%ju datagram%s arrived with bad tunneling\n");
+	p(mrts_cant_tunnel, "\t%ju datagram%s could not be tunneled\n");
+	p(mrts_wrong_if, "\t%ju datagram%s arrived on wrong interface\n");
+	p(mrts_drop_sel, "\t%ju datagram%s selectively dropped\n");
+	p(mrts_q_overflow, "\t%ju datagram%s dropped due to queue overflow\n");
+	p(mrts_pkt2large, "\t%ju datagram%s dropped for being too large\n");
 
 #undef	p2
 #undef	p
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index c52340a..0a37994 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -28,7 +28,7 @@
 .\"	@(#)netstat.1	8.8 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd March 10, 2013
+.Dd May 17, 2013
 .Dt NETSTAT 1
 .Os
 .Sh NAME
@@ -217,14 +217,29 @@ states.
 .Nm
 .Fl r
 .Op Fl AanW
+.Op Fl F Ar fibnum
 .Op Fl f Ar address_family
 .Op Fl M Ar core
 .Op Fl N Ar system
 .Ek
 .Xc
-Display the contents of all routing tables,
-or a routing table for a particular
-.Ar address_family .
+Display the contents of routing tables.
+When
+.Fl f
+is specified, a routing table for a particular
+.Ar address_family
+is displayed.
+When
+.Fl F
+is specified, a routing table with the number
+.Ar fibnum
+is displayed.
+If the specified
+.Ar fibnum
+is -1 or
+.Fl F
+is not specified,
+the default routing table is displayed.
 If
 .Fl A
 is also present,
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index 32bea79..02b8a17 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -60,7 +60,7 @@ extern int	af;	/* address family */
 extern int	live;	/* true if we are examining a live system */
 
 int	kread(u_long addr, void *buf, size_t size);
-int	kread_counters(u_long *addr, uint64_t *rval, size_t count);
+int	kread_counters(u_long addr, void *buf, size_t size);
 const char *plural(uintmax_t);
 const char *plurales(uintmax_t);
 const char *pluralies(uintmax_t);
@@ -135,7 +135,7 @@ char	*atalk_print(struct sockaddr *, int);
 char	*atalk_print2(struct sockaddr *, struct sockaddr *, int);
 char	*ipx_print(struct sockaddr *);
 char	*ns_print(struct sockaddr *);
-void	routepr(u_long);
+void	routepr(u_long, int);
 
 void	ipxprotopr(u_long, const char *, int, int);
 void	spx_stats(u_long, const char *, int, int);
diff --git a/usr.bin/netstat/pfkey.c b/usr.bin/netstat/pfkey.c
index 0d48e5d..da81485 100644
--- a/usr.bin/netstat/pfkey.c
+++ b/usr.bin/netstat/pfkey.c
@@ -119,7 +119,7 @@ pfkey_stats(u_long off, const char *name, int family __unused,
 	if (off == 0)
 		return;
 	printf ("%s:\n", name);
-	kread(off, (char *)&pfkeystat, sizeof(pfkeystat));
+	kread_counters(off, (char *)&pfkeystat, sizeof(pfkeystat));
 
 #define	p(f, m) if (pfkeystat.f || sflag <= 1) \
     printf(m, (uintmax_t)pfkeystat.f, plural(pfkeystat.f))
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index dd91330..1de12cc 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -143,17 +143,20 @@ static void domask(char *, in_addr_t, u_long);
  * Print routing tables.
  */
 void
-routepr(u_long rtree)
+routepr(u_long rtree, int fibnum)
 {
 	struct radix_node_head **rnhp, *rnh, head;
 	size_t intsize;
-	int fam, fibnum, numfibs;
+	int fam, numfibs;
 
 	intsize = sizeof(int);
-	if (sysctlbyname("net.my_fibnum", &fibnum, &intsize, NULL, 0) == -1)
+	if (fibnum == -1 &&
+	    sysctlbyname("net.my_fibnum", &fibnum, &intsize, NULL, 0) == -1)
 		fibnum = 0;
 	if (sysctlbyname("net.fibs", &numfibs, &intsize, NULL, 0) == -1)
 		numfibs = 1;
+	if (fibnum < 0 || fibnum > numfibs - 1)
+		errx(EX_USAGE, "%d: invalid fib", fibnum);
 	rt_tables = calloc(numfibs * (AF_MAX+1),
 	    sizeof(struct radix_node_head *));
 	if (rt_tables == NULL)
@@ -166,7 +169,10 @@ routepr(u_long rtree)
 	if (clock_gettime(CLOCK_UPTIME, &uptime) < 0)
 		err(EX_OSERR, "clock_gettime() failed");
 
-	printf("Routing tables\n");
+	printf("Routing tables");
+	if (fibnum)
+		printf(" (fib: %d)", fibnum);
+	printf("\n");
 
 	if (Aflag == 0 && NewTree)
 		ntreestuff();
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 2b0340d..5ec048f 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -28,7 +28,7 @@
 .\"     From: @(#)nfsstat.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd November 14, 2012
+.Dd May 1, 2013
 .Dt NFSSTAT 1
 .Os
 .Sh NAME
@@ -48,6 +48,10 @@ The
 command displays statistics kept about
 .Tn NFS
 client and server activity.
+For the NFSv4 server, the statistics are for operations within the Compound
+RPCs and not the count of RPCs.
+If you wish to compare RPC counts between NFSv3 and NFSv4, you must use
+statistics in the client(s).
 .Pp
 The options are as follows:
 .Bl -tag -width indent
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 4a3228a..bd18186 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -133,6 +133,9 @@ main(int argc, char **argv)
 						printf("%s on %s\n%s\n",
 						    mntbuf->f_mntfromname,
 						    mntbuf->f_mntonname, buf);
+					else if (errno == EPERM)
+						errx(1, "Only priviledged users"
+						    " can use the -m option");
 				}
 				mntbuf++;
 			}
diff --git a/usr.bin/nslookup/Makefile b/usr.bin/nslookup/Makefile
index b3ba117..4ed0e92 100644
--- a/usr.bin/nslookup/Makefile
+++ b/usr.bin/nslookup/Makefile
@@ -12,13 +12,13 @@ PROG=		nslookup
 .PATH: ${SRCDIR}
 SRCS+=		dighost.c nslookup.c
 
-CFLAGS+=	-I${SRCDIR}/include
+CFLAGS+=	-I${SRCDIR}/include -ledit
 CFLAGS+=	-I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include
 
-DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
-LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
+DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} ${LIBEDIT}
+LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} ${LIBEDIT}
 
-WARNS?=		1
+WARNS?=		0
 
 MANFILTER=	sed -e "s@^host \[server\]@\\\fBhost\\\fR \\\fI[server]\\\fR@"
 
diff --git a/usr.bin/nsupdate/Makefile b/usr.bin/nsupdate/Makefile
index d5cb8f0..593d589 100644
--- a/usr.bin/nsupdate/Makefile
+++ b/usr.bin/nsupdate/Makefile
@@ -12,12 +12,12 @@ PROG=		nsupdate
 .PATH: ${SRCDIR}
 SRCS+=		nsupdate.c
 
-CFLAGS+=	-I${SRCDIR}/include
+CFLAGS+=	-I${SRCDIR}/include -ledit
 CFLAGS+=	-I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include
 CFLAGS+=	-DSESSION_KEYFILE=\"/var/run/named/session.key\"
 
-DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
-LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
+DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} ${LIBEDIT}
+LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} ${LIBEDIT}
 
 WARNS?=		1
 
diff --git a/usr.bin/patch/Makefile b/usr.bin/patch/Makefile
index 382a05f..a5f15c7 100644
--- a/usr.bin/patch/Makefile
+++ b/usr.bin/patch/Makefile
@@ -1,17 +1,7 @@
 #	$OpenBSD: Makefile,v 1.4 2005/05/16 15:22:46 espie Exp $
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
-.if ${MK_BSD_PATCH} == "yes"
 PROG=	patch
-.else
-PROG=	bsdpatch
-CLEANFILES+= bsdpatch.1
-
-bsdpatch.1: patch.1
-	cp ${.ALLSRC} ${.TARGET}
-.endif
 
 SRCS=	backupfile.c inp.c mkpath.c patch.c pch.c util.c
 
diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c
index d008c0f..956482c 100644
--- a/usr.bin/patch/patch.c
+++ b/usr.bin/patch/patch.c
@@ -239,8 +239,10 @@ main(int argc, char *argv[])
 		if (!skip_rest_of_patch)
 			scan_input(filearg[0]);
 
-		/* from here on, open no standard i/o files, because malloc */
-		/* might misfire and we can't catch it easily */
+		/*
+		 * from here on, open no standard i/o files, because
+		 * malloc might misfire and we can't catch it easily
+		 */
 
 		/* apply each hunk of patch */
 		hunk = 0;
diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c
index 4c06bbf..eca12ad 100644
--- a/usr.bin/patch/pch.c
+++ b/usr.bin/patch/pch.c
@@ -101,13 +101,17 @@ void
 open_patch_file(const char *filename)
 {
 	struct stat filestat;
+	int nr, nw;
 
 	if (filename == NULL || *filename == '\0' || strEQ(filename, "-")) {
 		pfp = fopen(TMPPATNAME, "w");
 		if (pfp == NULL)
 			pfatal("can't create %s", TMPPATNAME);
-		while (fgets(buf, buf_size, stdin) != NULL)
-			fputs(buf, pfp);
+		while ((nr = fread(buf, 1, buf_size, stdin)) > 0) {
+			nw = fwrite(buf, 1, nr, pfp);
+			if (nr != nw)
+				pfatal("write error to %s", TMPPATNAME);
+		}
 		if (ferror(pfp) || fclose(pfp))
 			pfatal("can't write %s", TMPPATNAME);
 		filename = TMPPATNAME;
@@ -1200,7 +1204,7 @@ pgets(bool do_indent)
 					indent++;
 			}
 		}
-		strncpy(buf, line, len - skipped);
+		memcpy(buf, line, len - skipped);
 		buf[len - skipped] = '\0';
 	}
 	return len;
@@ -1512,15 +1516,12 @@ posix_name(const struct file_name *names, bool assume_exists)
 	return path ? savestr(path) : NULL;
 }
 
-/*
- * Choose the name of the file to be patched based the "best" one
- * available.
- */
 static char *
-best_name(const struct file_name *names, bool assume_exists)
+compare_names(const struct file_name *names, bool assume_exists, int phase)
 {
 	size_t min_components, min_baselen, min_len, tmp;
 	char *best = NULL;
+	char *path;
 	int i;
 
 	/*
@@ -1532,41 +1533,43 @@ best_name(const struct file_name *names, bool assume_exists)
 	 */
 	min_components = min_baselen = min_len = SIZE_MAX;
 	for (i = INDEX_FILE; i >= OLD_FILE; i--) {
-		if (names[i].path == NULL ||
-		    (!names[i].exists && !assume_exists))
+		path = names[i].path;
+		if (path == NULL ||
+		    (phase == 1 && !names[i].exists && !assume_exists) ||
+		    (phase == 2 && checked_in(path) == NULL))
 			continue;
-		if ((tmp = num_components(names[i].path)) > min_components)
+		if ((tmp = num_components(path)) > min_components)
 			continue;
-		min_components = tmp;
-		if ((tmp = strlen(basename(names[i].path))) > min_baselen)
+		if (tmp < min_components) {
+			min_components = tmp;
+			best = path;
+		}
+		if ((tmp = strlen(basename(path))) > min_baselen)
 			continue;
-		min_baselen = tmp;
-		if ((tmp = strlen(names[i].path)) > min_len)
+		if (tmp < min_baselen) {
+			min_baselen = tmp;
+			best = path;
+		}
+		if ((tmp = strlen(path)) > min_len)
 			continue;
 		min_len = tmp;
-		best = names[i].path;
+		best = path;
 	}
+	return best;
+}
+
+/*
+ * Choose the name of the file to be patched based the "best" one
+ * available.
+ */
+static char *
+best_name(const struct file_name *names, bool assume_exists)
+{
+	char *best;
+
+	best = compare_names(names, assume_exists, 1);
 	if (best == NULL) {
-		/*
-		 * No files found, look for something we can checkout from
-		 * RCS/SCCS dirs.  Logic is identical to that above...
-		 */
-		min_components = min_baselen = min_len = SIZE_MAX;
-		for (i = INDEX_FILE; i >= OLD_FILE; i--) {
-			if (names[i].path == NULL ||
-			    checked_in(names[i].path) == NULL)
-				continue;
-			if ((tmp = num_components(names[i].path)) > min_components)
-				continue;
-			min_components = tmp;
-			if ((tmp = strlen(basename(names[i].path))) > min_baselen)
-				continue;
-			min_baselen = tmp;
-			if ((tmp = strlen(names[i].path)) > min_len)
-				continue;
-			min_len = tmp;
-			best = names[i].path;
-		}
+		best = compare_names(names, assume_exists, 2);
 		/*
 		 * Still no match?  Check to see if the diff could be creating
 		 * a new file.
diff --git a/usr.bin/patch/util.c b/usr.bin/patch/util.c
index 28a3cb0..c19918b 100644
--- a/usr.bin/patch/util.c
+++ b/usr.bin/patch/util.c
@@ -412,7 +412,7 @@ checked_in(char *file)
 void
 version(void)
 {
-	fprintf(stderr, "patch 2.0-12u8 FreeBSD\n");
+	fprintf(stderr, "patch 2.0-12u9 FreeBSD\n");
 	my_exit(EXIT_SUCCESS);
 }
 
diff --git a/usr.bin/procstat/procstat.1 b/usr.bin/procstat/procstat.1
index 38681f8..faa296c 100644
--- a/usr.bin/procstat/procstat.1
+++ b/usr.bin/procstat/procstat.1
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 11, 2012
+.Dd April 20, 2013
 .Dt PROCSTAT 1
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Op Fl C
 .Op Fl w Ar interval
 .Op Fl b | c | e | f | i | j | k | l | s | t | v | x
-.Op Fl a | Ar pid ...
+.Op Fl a | Ar pid | Ar core ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -47,6 +47,8 @@ utility displays detailed information about the processes identified by the
 arguments, or if the
 .Fl a
 flag is used, all processes.
+It can also display information extracted from a process core file, if
+the core file is specified as the argument.
 .Pp
 By default, basic process statistics are printed; one of the following
 options may be specified in order to select more detailed process information
diff --git a/usr.bin/procstat/procstat.c b/usr.bin/procstat/procstat.c
index 934e292..3c1dafa 100644
--- a/usr.bin/procstat/procstat.c
+++ b/usr.bin/procstat/procstat.c
@@ -50,7 +50,7 @@ usage(void)
 	fprintf(stderr, "usage: procstat [-h] [-C] [-M core] [-N system] "
 	    "[-w interval] \n");
 	fprintf(stderr, "                [-b | -c | -e | -f | -i | -j | -k | "
-	    "-l | -s | -t | -v | -x] [-a | pid ...]\n");
+	    "-l | -s | -t | -v | -x] [-a | pid | core ...]\n");
 	exit(EX_USAGE);
 }
 
@@ -59,11 +59,11 @@ procstat(struct procstat *prstat, struct kinfo_proc *kipp)
 {
 
 	if (bflag)
-		procstat_bin(kipp);
+		procstat_bin(prstat, kipp);
 	else if (cflag)
-		procstat_args(kipp);
+		procstat_args(prstat, kipp);
 	else if (eflag)
-		procstat_env(kipp);
+		procstat_env(prstat, kipp);
 	else if (fflag)
 		procstat_files(prstat, kipp);
 	else if (iflag)
@@ -71,17 +71,17 @@ procstat(struct procstat *prstat, struct kinfo_proc *kipp)
 	else if (jflag)
 		procstat_threads_sigs(prstat, kipp);
 	else if (kflag)
-		procstat_kstack(kipp, kflag);
+		procstat_kstack(prstat, kipp, kflag);
 	else if (lflag)
-		procstat_rlimit(kipp);
+		procstat_rlimit(prstat, kipp);
 	else if (sflag)
-		procstat_cred(kipp);
+		procstat_cred(prstat, kipp);
 	else if (tflag)
-		procstat_threads(kipp);
+		procstat_threads(prstat, kipp);
 	else if (vflag)
-		procstat_vm(kipp);
+		procstat_vm(prstat, kipp);
 	else if (xflag)
-		procstat_auxv(kipp);
+		procstat_auxv(prstat, kipp);
 	else
 		procstat_basic(kipp);
 }
@@ -116,7 +116,7 @@ main(int argc, char *argv[])
 	int ch, interval, tmp;
 	int i;
 	struct kinfo_proc *p;
-	struct procstat *prstat;
+	struct procstat *prstat, *cprstat;
 	long l;
 	pid_t pid;
 	char *dummy;
@@ -255,19 +255,32 @@ main(int argc, char *argv[])
 		}
 		for (i = 0; i < argc; i++) {
 			l = strtol(argv[i], &dummy, 10);
-			if (*dummy != '\0')
-				usage();
-			if (l < 0)
-				usage();
-			pid = l;
-
-			p = procstat_getprocs(prstat, KERN_PROC_PID, pid, &cnt);
-			if (p == NULL)
-				errx(1, "procstat_getprocs()");
-			if (cnt != 0)
-				procstat(prstat, p);
-			procstat_freeprocs(prstat, p);
-
+			if (*dummy == '\0') {
+				if (l < 0)
+					usage();
+				pid = l;
+
+				p = procstat_getprocs(prstat, KERN_PROC_PID, pid, &cnt);
+				if (p == NULL)
+					errx(1, "procstat_getprocs()");
+				if (cnt != 0)
+					procstat(prstat, p);
+				procstat_freeprocs(prstat, p);
+			} else {
+				cprstat = procstat_open_core(argv[i]);
+				if (cprstat == NULL) {
+					warnx("procstat_open()");
+					continue;
+				}
+				p = procstat_getprocs(cprstat, KERN_PROC_PID,
+				    -1, &cnt);
+				if (p == NULL)
+					errx(1, "procstat_getprocs()");
+				if (cnt != 0)
+					procstat(cprstat, p);
+				procstat_freeprocs(cprstat, p);
+				procstat_close(cprstat);
+			}
 			/* Suppress header after first process. */
 			hflag = 1;
 		}
diff --git a/usr.bin/procstat/procstat.h b/usr.bin/procstat/procstat.h
index e65436d..57c9cb5 100644
--- a/usr.bin/procstat/procstat.h
+++ b/usr.bin/procstat/procstat.h
@@ -34,18 +34,19 @@ extern int	hflag, nflag, Cflag;
 struct kinfo_proc;
 void	kinfo_proc_sort(struct kinfo_proc *kipp, int count);
 
-void	procstat_args(struct kinfo_proc *kipp);
-void	procstat_auxv(struct kinfo_proc *kipp);
+void	procstat_args(struct procstat *prstat, struct kinfo_proc *kipp);
+void	procstat_auxv(struct procstat *prstat, struct kinfo_proc *kipp);
 void	procstat_basic(struct kinfo_proc *kipp);
-void	procstat_bin(struct kinfo_proc *kipp);
-void	procstat_cred(struct kinfo_proc *kipp);
-void	procstat_env(struct kinfo_proc *kipp);
+void	procstat_bin(struct procstat *prstat, struct kinfo_proc *kipp);
+void	procstat_cred(struct procstat *prstat, struct kinfo_proc *kipp);
+void	procstat_env(struct procstat *prstat, struct kinfo_proc *kipp);
 void	procstat_files(struct procstat *prstat, struct kinfo_proc *kipp);
-void	procstat_kstack(struct kinfo_proc *kipp, int kflag);
-void	procstat_rlimit(struct kinfo_proc *kipp);
+void	procstat_kstack(struct procstat *prstat, struct kinfo_proc *kipp,
+    int kflag);
+void	procstat_rlimit(struct procstat *prstat, struct kinfo_proc *kipp);
 void	procstat_sigs(struct procstat *prstat, struct kinfo_proc *kipp);
-void	procstat_threads(struct kinfo_proc *kipp);
+void	procstat_threads(struct procstat *prstat, struct kinfo_proc *kipp);
 void	procstat_threads_sigs(struct procstat *prstat, struct kinfo_proc *kipp);
-void	procstat_vm(struct kinfo_proc *kipp);
+void	procstat_vm(struct procstat *prstat, struct kinfo_proc *kipp);
 
 #endif /* !PROCSTAT_H */
diff --git a/usr.bin/procstat/procstat_args.c b/usr.bin/procstat/procstat_args.c
index b13aa72..342b60f 100644
--- a/usr.bin/procstat/procstat_args.c
+++ b/usr.bin/procstat/procstat_args.c
@@ -40,52 +40,40 @@
 
 #include "procstat.h"
 
-static char args[ARG_MAX];
-
 static void
-do_args(struct kinfo_proc *kipp, int env)
+do_args(struct procstat *procstat, struct kinfo_proc *kipp, int env)
 {
-	int error, name[4];
-	size_t len;
-	char *cp;
+	int i;
+	char **args;
 
-	if (!hflag)
+	if (!hflag) {
 		printf("%5s %-16s %-53s\n", "PID", "COMM",
 		    env ? "ENVIRONMENT" : "ARGS");
-
-	name[0] = CTL_KERN;
-	name[1] = KERN_PROC;
-	name[2] = env ? KERN_PROC_ENV : KERN_PROC_ARGS;
-	name[3] = kipp->ki_pid;
-	len = sizeof(args);
-	error = sysctl(name, 4, args, &len, NULL, 0);
-	if (error < 0 && errno != ESRCH && errno != EPERM) {
-		warn("sysctl: kern.proc.%s: %d: %d", env ? "env" : "args",
-		    kipp->ki_pid, errno);
-		return;
 	}
-	if (error < 0)
+
+	args = env ? procstat_getenvv(procstat, kipp, 0) :
+	    procstat_getargv(procstat, kipp, 0);
+
+	printf("%5d %-16s", kipp->ki_pid, kipp->ki_comm);
+
+	if (args == NULL) {
+		printf(" -\n");
 		return;
-	if (len == 0 || strlen(args) == 0) {
-		strcpy(args, "-");
-		len = strlen(args) + 1;
 	}
 
-	printf("%5d ", kipp->ki_pid);
-	printf("%-16s ", kipp->ki_comm);
-	for (cp = args; cp < args + len; cp += strlen(cp) + 1)
-		printf("%s%s", cp != args ? " " : "", cp);
+	for (i = 0; args[i] != NULL; i++)
+		printf(" %s", args[i]);
 	printf("\n");
 }
 
 void
-procstat_args(struct kinfo_proc *kipp)
+procstat_args(struct procstat *procstat, struct kinfo_proc *kipp)
 {
-	do_args(kipp, 0);
+	do_args(procstat, kipp, 0);
 }
 
 void
-procstat_env(struct kinfo_proc *kipp)
+procstat_env(struct procstat *procstat, struct kinfo_proc *kipp)
 {
-	do_args(kipp, 1);
+	do_args(procstat, kipp, 1);
 }
diff --git a/usr.bin/procstat/procstat_auxv.c b/usr.bin/procstat/procstat_auxv.c
index b78e13a..aa62594 100644
--- a/usr.bin/procstat/procstat_auxv.c
+++ b/usr.bin/procstat/procstat_auxv.c
@@ -43,113 +43,26 @@
 
 #include "procstat.h"
 
-#define PROC_AUXV_MAX	256
-
-static Elf_Auxinfo auxv[PROC_AUXV_MAX];
-static char prefix[256];
-
-#if __ELF_WORD_SIZE == 64
-static Elf32_Auxinfo auxv32[PROC_AUXV_MAX];
-
-static const char *elf32_sv_names[] = {
-	"Linux ELF32",
-	"FreeBSD ELF32",
-};
-
-static int
-is_elf32(pid_t pid)
-{
-	int error, name[4];
-	size_t len, i;
-	static char sv_name[256];
-
-	name[0] = CTL_KERN;
-	name[1] = KERN_PROC;
-	name[2] = KERN_PROC_SV_NAME;
-	name[3] = pid;
-	len = sizeof(sv_name);
-	error = sysctl(name, 4, sv_name, &len, NULL, 0);
-	if (error != 0 || len == 0)
-		return (0);
-	for (i = 0; i < sizeof(elf32_sv_names) / sizeof(*elf32_sv_names); i++) {
-		if (strncmp(sv_name, elf32_sv_names[i], sizeof(sv_name)) == 0)
-			return (1);
-	}
-	return (0);
-}
-
-static size_t
-retrieve_auxv32(pid_t pid)
-{
-	int name[4];
-	size_t len, i;
-	void *ptr;
-
-	name[0] = CTL_KERN;
-	name[1] = KERN_PROC;
-	name[2] = KERN_PROC_AUXV;
-	name[3] = pid;
-	len = sizeof(auxv32);
-	if (sysctl(name, 4, auxv32, &len, NULL, 0) == -1) {
-		if (errno != ESRCH && errno != EPERM)
-			warn("sysctl: kern.proc.auxv: %d: %d", pid, errno);
-		return (0);
-	}
-	for (i = 0; i < len; i++) {
-		/*
-		 * XXX: We expect that values for a_type on a 32-bit platform
-		 * are directly mapped to those on 64-bit one, which is not
-		 * necessarily true.
-		 */
-		auxv[i].a_type = auxv32[i].a_type;
-		ptr = &auxv32[i].a_un;
-		auxv[i].a_un.a_val = *((uint32_t *)ptr);
-	}
-	return (len);
-}
-#endif /* __ELF_WORD_SIZE == 64 */
-
 #define	PRINT(name, spec, val)		\
 	printf("%s %-16s " #spec "\n", prefix, #name, (val))
 #define	PRINT_UNKNOWN(type, val)	\
 	printf("%s %16ld %#lx\n", prefix, (long)type, (u_long)(val))
 
-static size_t
-retrieve_auxv(pid_t pid)
-{
-	int name[4];
-	size_t len;
-
-#if __ELF_WORD_SIZE == 64
-	if (is_elf32(pid))
-		return (retrieve_auxv32(pid));
-#endif
-	name[0] = CTL_KERN;
-	name[1] = KERN_PROC;
-	name[2] = KERN_PROC_AUXV;
-	name[3] = pid;
-	len = sizeof(auxv);
-	if (sysctl(name, 4, auxv, &len, NULL, 0) == -1) {
-		if (errno != ESRCH && errno != EPERM)
-			warn("sysctl: kern.proc.auxv: %d: %d", pid, errno);
-		return (0);
-	}
-	return (len);
-}
-
 void
-procstat_auxv(struct kinfo_proc *kipp)
+procstat_auxv(struct procstat *procstat, struct kinfo_proc *kipp)
 {
-	size_t len, i;
+	Elf_Auxinfo *auxv;
+	u_int count, i;
+	static char prefix[256];
 
 	if (!hflag)
 		printf("%5s %-16s %-16s %-16s\n", "PID", "COMM", "AUXV", "VALUE");
-	len = retrieve_auxv(kipp->ki_pid);
-	if (len == 0)
+	auxv = procstat_getauxv(procstat, kipp, &count);
+	if (auxv == NULL)
 		return;
 	snprintf(prefix, sizeof(prefix), "%5d %-16s", kipp->ki_pid,
 	    kipp->ki_comm);
-	for (i = 0; i < len; i++) {
+	for (i = 0; i < count; i++) {
 		switch(auxv[i].a_type) {
 		case AT_NULL:
 			return;
@@ -242,5 +155,6 @@ procstat_auxv(struct kinfo_proc *kipp)
 		}
 	}
 	printf("\n");
+	procstat_freeauxv(procstat, auxv);
 }
 
diff --git a/usr.bin/procstat/procstat_bin.c b/usr.bin/procstat/procstat_bin.c
index 718103d..dc88c38 100644
--- a/usr.bin/procstat/procstat_bin.c
+++ b/usr.bin/procstat/procstat_bin.c
@@ -40,40 +40,19 @@
 #include "procstat.h"
 
 void
-procstat_bin(struct kinfo_proc *kipp)
+procstat_bin(struct procstat *prstat, struct kinfo_proc *kipp)
 {
-	char pathname[PATH_MAX];
-	int error, osrel, name[4];
-	size_t len;
+	int osrel;
+	static char pathname[PATH_MAX];
 
 	if (!hflag)
 		printf("%5s %-16s %8s %s\n", "PID", "COMM", "OSREL", "PATH");
 
-	name[0] = CTL_KERN;
-	name[1] = KERN_PROC;
-	name[2] = KERN_PROC_PATHNAME;
-	name[3] = kipp->ki_pid;
-
-	len = sizeof(pathname);
-	error = sysctl(name, 4, pathname, &len, NULL, 0);
-	if (error < 0 && errno != ESRCH) {
-		warn("sysctl: kern.proc.pathname: %d", kipp->ki_pid);
-		return;
-	}
-	if (error < 0)
+	if (procstat_getpathname(prstat, kipp, pathname, sizeof(pathname)) != 0)
 		return;
-	if (len == 0 || strlen(pathname) == 0)
+	if (strlen(pathname) == 0)
 		strcpy(pathname, "-");
-
-	name[2] = KERN_PROC_OSREL;
-
-	len = sizeof(osrel);
-	error = sysctl(name, 4, &osrel, &len, NULL, 0);
-	if (error < 0 && errno != ESRCH) {
-		warn("sysctl: kern.proc.osrel: %d", kipp->ki_pid);
-		return;
-	}
-	if (error < 0)
+	if (procstat_getosrel(prstat, kipp, &osrel) != 0)
 		return;
 
 	printf("%5d ", kipp->ki_pid);
diff --git a/usr.bin/procstat/procstat_cred.c b/usr.bin/procstat/procstat_cred.c
index 250747d..f9a2241 100644
--- a/usr.bin/procstat/procstat_cred.c
+++ b/usr.bin/procstat/procstat_cred.c
@@ -38,16 +38,14 @@
 
 #include "procstat.h"
 
-static const char *get_umask(struct kinfo_proc *kipp);
+static const char *get_umask(struct procstat *procstat,
+    struct kinfo_proc *kipp);
 
 void
-procstat_cred(struct kinfo_proc *kipp)
+procstat_cred(struct procstat *procstat, struct kinfo_proc *kipp)
 {
-	int i;
-	int mib[4];
-	int ngroups;
-	size_t len;
-	gid_t *groups = NULL;
+	unsigned int i, ngroups;
+	gid_t *groups;
 
 	if (!hflag)
 		printf("%5s %-16s %5s %5s %5s %5s %5s %5s %5s %5s %-15s\n",
@@ -62,34 +60,18 @@ procstat_cred(struct kinfo_proc *kipp)
 	printf("%5d ", kipp->ki_groups[0]);
 	printf("%5d ", kipp->ki_rgid);
 	printf("%5d ", kipp->ki_svgid);
-	printf("%5s ", get_umask(kipp));
+	printf("%5s ", get_umask(procstat, kipp));
 	printf("%s", kipp->ki_cr_flags & CRED_FLAG_CAPMODE ? "C" : "-");
 	printf("     ");
 
+	groups = NULL;
 	/*
 	 * We may have too many groups to fit in kinfo_proc's statically
-	 * sized storage.  If that occurs, attempt to retrieve them via
-	 * sysctl.
+	 * sized storage.  If that occurs, attempt to retrieve them using
+	 * libprocstat.
 	 */
-	if (kipp->ki_cr_flags & KI_CRF_GRP_OVERFLOW) {
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_PROC;
-		mib[2] = KERN_PROC_GROUPS;
-		mib[3] = kipp->ki_pid;
-
-		ngroups = sysconf(_SC_NGROUPS_MAX) + 1;
-		len = ngroups * sizeof(gid_t);
-		if((groups = malloc(len)) == NULL)
-			err(-1, "malloc");
-
-		if (sysctl(mib, 4, groups, &len, NULL, 0) == -1) {
-			warn("sysctl: kern.proc.groups: %d "
-			    "group list truncated", kipp->ki_pid);
-			free(groups);
-			groups = NULL;
-		}
-		ngroups = len / sizeof(gid_t);
-	}
+	if (kipp->ki_cr_flags & KI_CRF_GRP_OVERFLOW)
+		groups = procstat_getgroups(procstat, kipp, &ngroups);
 	if (groups == NULL) {
 		ngroups = kipp->ki_ngroups;
 		groups = kipp->ki_groups;
@@ -97,27 +79,18 @@ procstat_cred(struct kinfo_proc *kipp)
 	for (i = 0; i < ngroups; i++)
 		printf("%s%d", (i > 0) ? "," : "", groups[i]);
 	if (groups != kipp->ki_groups)
-		free(groups);
+		procstat_freegroups(procstat, groups);
 
 	printf("\n");
 }
 
 static const char *
-get_umask(struct kinfo_proc *kipp)
+get_umask(struct procstat *procstat, struct kinfo_proc *kipp)
 {
-	int error;
-	int mib[4];
-	size_t len;
 	u_short fd_cmask;
 	static char umask[4];
 
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_PROC;
-	mib[2] = KERN_PROC_UMASK;
-	mib[3] = kipp->ki_pid;
-	len = sizeof(fd_cmask);
-	error = sysctl(mib, 4, &fd_cmask, &len, NULL, 0);
-	if (error == 0) {
+	if (procstat_getumask(procstat, kipp, &fd_cmask) == 0) {
 		snprintf(umask, 4, "%03o", fd_cmask);
 		return (umask);
 	} else {
diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c
index a3137db..d65c1ae 100644
--- a/usr.bin/procstat/procstat_files.c
+++ b/usr.bin/procstat/procstat_files.c
@@ -133,7 +133,7 @@ print_address(struct sockaddr_storage *ss)
 }
 
 static struct cap_desc {
-	cap_rights_t	 cd_right;
+	uint64_t	 cd_right;
 	const char	*cd_desc;
 } cap_desc[] = {
 	/* General file I/O. */
@@ -244,14 +244,14 @@ static const u_int	cap_desc_count = sizeof(cap_desc) /
 			    sizeof(cap_desc[0]);
 
 static u_int
-width_capability(cap_rights_t rights)
+width_capability(cap_rights_t *rightsp)
 {
 	u_int count, i, width;
 
 	count = 0;
 	width = 0;
 	for (i = 0; i < cap_desc_count; i++) {
-		if ((cap_desc[i].cd_right & ~rights) == 0) {
+		if (cap_rights_is_set(rightsp, cap_desc[i].cd_right)) {
 			width += strlen(cap_desc[i].cd_desc);
 			if (count)
 				width++;
@@ -262,20 +262,20 @@ width_capability(cap_rights_t rights)
 }
 
 static void
-print_capability(cap_rights_t rights, u_int capwidth)
+print_capability(cap_rights_t *rightsp, u_int capwidth)
 {
 	u_int count, i, width;
 
 	count = 0;
 	width = 0;
-	for (i = width_capability(rights); i < capwidth; i++) {
-		if (rights || i != 0)
+	for (i = width_capability(rightsp); i < capwidth; i++) {
+		if (i != 0)
 			printf(" ");
 		else
 			printf("-");
 	}
 	for (i = 0; i < cap_desc_count; i++) {
-		if ((cap_desc[i].cd_right & ~rights) == 0) {
+		if (cap_rights_is_set(rightsp, cap_desc[i].cd_right)) {
 			printf("%s%s", count ? "," : "", cap_desc[i].cd_desc);
 			width += strlen(cap_desc[i].cd_desc);
 			if (count)
@@ -306,7 +306,7 @@ procstat_files(struct procstat *procstat, struct kinfo_proc *kipp)
 	head = procstat_getfiles(procstat, kipp, 0);
 	if (head != NULL && Cflag) {
 		STAILQ_FOREACH(fst, head, next) {
-			width = width_capability(fst->fs_cap_rights);
+			width = width_capability(&fst->fs_cap_rights);
 			if (width > capwidth)
 				capwidth = width;
 		}
@@ -332,19 +332,19 @@ procstat_files(struct procstat *procstat, struct kinfo_proc *kipp)
 		printf("%5d ", kipp->ki_pid);
 		printf("%-16s ", kipp->ki_comm);
 		if (fst->fs_uflags & PS_FST_UFLAG_CTTY)
-			printf("ctty ");
+			printf(" ctty ");
 		else if (fst->fs_uflags & PS_FST_UFLAG_CDIR)
-			printf(" cwd ");
+			printf("  cwd ");
 		else if (fst->fs_uflags & PS_FST_UFLAG_JAIL)
-			printf("jail ");
+			printf(" jail ");
 		else if (fst->fs_uflags & PS_FST_UFLAG_RDIR)
-			printf("root ");
+			printf(" root ");
 		else if (fst->fs_uflags & PS_FST_UFLAG_TEXT)
-			printf("text ");
+			printf(" text ");
 		else if (fst->fs_uflags & PS_FST_UFLAG_TRACE)
 			printf("trace ");
 		else
-			printf("%4d ", fst->fs_fd);
+			printf("%5d ", fst->fs_fd);
 
 		switch (fst->fs_type) {
 		case PS_FST_TYPE_VNODE:
@@ -460,7 +460,7 @@ procstat_files(struct procstat *procstat, struct kinfo_proc *kipp)
 				printf("%7c ", '-');
 		}
 		if (Cflag) {
-			print_capability(fst->fs_cap_rights, capwidth);
+			print_capability(&fst->fs_cap_rights, capwidth);
 			printf(" ");
 		}
 		switch (fst->fs_type) {
diff --git a/usr.bin/procstat/procstat_kstack.c b/usr.bin/procstat/procstat_kstack.c
index d887262..8ffa4f9 100644
--- a/usr.bin/procstat/procstat_kstack.c
+++ b/usr.bin/procstat/procstat_kstack.c
@@ -125,76 +125,35 @@ kinfo_kstack_sort(struct kinfo_kstack *kkstp, int count)
 
 
 void
-procstat_kstack(struct kinfo_proc *kipp, int kflag)
+procstat_kstack(struct procstat *procstat, struct kinfo_proc *kipp, int kflag)
 {
 	struct kinfo_kstack *kkstp, *kkstp_free;
 	struct kinfo_proc *kip, *kip_free;
 	char trace[KKST_MAXLEN];
-	int error, name[4];
 	unsigned int i, j;
-	size_t kip_len, kstk_len;
+	unsigned int kip_count, kstk_count;
 
 	if (!hflag)
 		printf("%5s %6s %-16s %-16s %-29s\n", "PID", "TID", "COMM",
 		    "TDNAME", "KSTACK");
 
-	name[0] = CTL_KERN;
-	name[1] = KERN_PROC;
-	name[2] = KERN_PROC_KSTACK;
-	name[3] = kipp->ki_pid;
-
-	kstk_len = 0;
-	error = sysctl(name, 4, NULL, &kstk_len, NULL, 0);
-	if (error < 0 && errno != ESRCH && errno != EPERM && errno != ENOENT) {
-		warn("sysctl: kern.proc.kstack: %d", kipp->ki_pid);
-		return;
-	}
-	if (error < 0 && errno == ENOENT) {
-		warnx("sysctl: kern.proc.kstack unavailable");
-		errx(-1, "options DDB or options STACK required in kernel");
-	}
-	if (error < 0)
-		return;
-
-	kkstp = kkstp_free = malloc(kstk_len);
+	kkstp = kkstp_free = procstat_getkstack(procstat, kipp, &kstk_count);
 	if (kkstp == NULL)
-		err(-1, "malloc");
-
-	if (sysctl(name, 4, kkstp, &kstk_len, NULL, 0) < 0) {
-		warn("sysctl: kern.proc.pid: %d", kipp->ki_pid);
-		free(kkstp);
 		return;
-	}
 
 	/*
 	 * We need to re-query for thread information, so don't use *kipp.
 	 */
-	name[0] = CTL_KERN;
-	name[1] = KERN_PROC;
-	name[2] = KERN_PROC_PID | KERN_PROC_INC_THREAD;
-	name[3] = kipp->ki_pid;
-
-	kip_len = 0;
-	error = sysctl(name, 4, NULL, &kip_len, NULL, 0);
-	if (error < 0 && errno != ESRCH) {
-		warn("sysctl: kern.proc.pid: %d", kipp->ki_pid);
-		return;
-	}
-	if (error < 0)
-		return;
-
-	kip = kip_free = malloc(kip_len);
-	if (kip == NULL)
-		err(-1, "malloc");
+	kip = kip_free = procstat_getprocs(procstat,
+	    KERN_PROC_PID | KERN_PROC_INC_THREAD, kipp->ki_pid, &kip_count);
 
-	if (sysctl(name, 4, kip, &kip_len, NULL, 0) < 0) {
-		warn("sysctl: kern.proc.pid: %d", kipp->ki_pid);
-		free(kip);
+	if (kip == NULL) {
+		procstat_freekstack(procstat, kkstp_free);
 		return;
 	}
 
-	kinfo_kstack_sort(kkstp, kstk_len / sizeof(*kkstp));
-	for (i = 0; i < kstk_len / sizeof(*kkstp); i++) {
+	kinfo_kstack_sort(kkstp, kstk_count);
+	for (i = 0; i < kstk_count; i++) {
 		kkstp = &kkstp_free[i];
 
 		/*
@@ -202,7 +161,7 @@ procstat_kstack(struct kinfo_proc *kipp, int kflag)
 		 * display the per-thread command line.
 		 */
 		kipp = NULL;
-		for (j = 0; j < kip_len / sizeof(*kipp); j++) {
+		for (j = 0; j < kip_count; j++) {
 			kipp = &kip_free[j];
 			if (kkstp->kkst_tid == kipp->ki_tid)
 				break;
@@ -242,6 +201,6 @@ procstat_kstack(struct kinfo_proc *kipp, int kflag)
 		kstack_cleanup(kkstp->kkst_trace, trace, kflag);
 		printf("%-29s\n", trace);
 	}
-	free(kip_free);
-	free(kkstp_free);
+	procstat_freekstack(procstat, kkstp_free);
+	procstat_freeprocs(procstat, kip_free);
 }
diff --git a/usr.bin/procstat/procstat_rlimit.c b/usr.bin/procstat/procstat_rlimit.c
index 68230e5..f3ed5fc 100644
--- a/usr.bin/procstat/procstat_rlimit.c
+++ b/usr.bin/procstat/procstat_rlimit.c
@@ -86,31 +86,18 @@ humanize_rlimit(int indx, rlim_t limit)
 }
 
 void
-procstat_rlimit(struct kinfo_proc *kipp)
+procstat_rlimit(struct procstat *prstat, struct kinfo_proc *kipp)
 {
 	struct rlimit rlimit;
-	int error, i, name[5];
-	size_t len;
+	int i;
 
 	if (!hflag) {
 		printf("%5s %-16s %-16s %16s %16s\n",
 		    "PID", "COMM", "RLIMIT", "SOFT     ", "HARD     ");
 	}
-	len = sizeof(struct rlimit);
-	name[0] = CTL_KERN;
-	name[1] = KERN_PROC;
-	name[2] = KERN_PROC_RLIMIT;
-	name[3] = kipp->ki_pid;
 	for (i = 0; i < RLIM_NLIMITS; i++) {
-		name[4] = i;
-		error = sysctl(name, 5, &rlimit, &len, NULL, 0);
-		if (error < 0 && errno != ESRCH) {
-			warn("sysctl: kern.proc.rlimit: %d", kipp->ki_pid);
+		if (procstat_getrlimit(prstat, kipp, i, &rlimit) == -1)
 			return;
-		}
-		if (error < 0 || len != sizeof(struct rlimit))
-			return;
-
 		printf("%5d %-16s %-16s ", kipp->ki_pid, kipp->ki_comm,
 		    rlimit_param[i].name);
 		printf("%16s ", humanize_rlimit(i, rlimit.rlim_cur));
diff --git a/usr.bin/procstat/procstat_sigs.c b/usr.bin/procstat/procstat_sigs.c
index 70df250..49e2b19 100644
--- a/usr.bin/procstat/procstat_sigs.c
+++ b/usr.bin/procstat/procstat_sigs.c
@@ -86,48 +86,24 @@ procstat_sigs(struct procstat *prstat __unused, struct kinfo_proc *kipp)
 }
 
 void
-procstat_threads_sigs(struct procstat *prstat __unused, struct kinfo_proc *kipp)
+procstat_threads_sigs(struct procstat *procstat, struct kinfo_proc *kipp)
 {
 	struct kinfo_proc *kip;
 	pid_t pid;
-	int error, name[4], j;
-	unsigned int i;
-	size_t len;
+	int j;
+	unsigned int count, i;
 
 	pid = kipp->ki_pid;
 	if (!hflag)
 		printf("%5s %6s %-16s %-7s %4s\n", "PID", "TID", "COMM",
 		     "SIG", "FLAGS");
 
-	/*
-	 * We need to re-query for thread information, so don't use *kipp.
-	 */
-	name[0] = CTL_KERN;
-	name[1] = KERN_PROC;
-	name[2] = KERN_PROC_PID | KERN_PROC_INC_THREAD;
-	name[3] = pid;
-
-	len = 0;
-	error = sysctl(name, 4, NULL, &len, NULL, 0);
-	if (error < 0 && errno != ESRCH) {
-		warn("sysctl: kern.proc.pid: %d", pid);
-		return;
-	}
-	if (error < 0)
-		return;
-
-	kip = malloc(len);
+	kip = procstat_getprocs(procstat, KERN_PROC_PID | KERN_PROC_INC_THREAD,
+	    pid, &count);
 	if (kip == NULL)
-		err(-1, "malloc");
-
-	if (sysctl(name, 4, kip, &len, NULL, 0) < 0) {
-		warn("sysctl: kern.proc.pid: %d", pid);
-		free(kip);
 		return;
-	}
-
-	kinfo_proc_sort(kip, len / sizeof(*kipp));
-	for (i = 0; i < len / sizeof(*kipp); i++) {
+	kinfo_proc_sort(kip, count);
+	for (i = 0; i < count; i++) {
 		kipp = &kip[i];
 		for (j = 1; j <= _SIG_MAXSIG; j++) {
 			printf("%5d ", pid);
@@ -140,5 +116,5 @@ procstat_threads_sigs(struct procstat *prstat __unused, struct kinfo_proc *kipp)
 			printf("\n");
 		}
 	}
-	free(kip);
+	procstat_freeprocs(procstat, kip);
 }
diff --git a/usr.bin/procstat/procstat_threads.c b/usr.bin/procstat/procstat_threads.c
index ffd659c..6bd88da 100644
--- a/usr.bin/procstat/procstat_threads.c
+++ b/usr.bin/procstat/procstat_threads.c
@@ -40,47 +40,22 @@
 #include "procstat.h"
 
 void
-procstat_threads(struct kinfo_proc *kipp)
+procstat_threads(struct procstat *procstat, struct kinfo_proc *kipp)
 {
 	struct kinfo_proc *kip;
-	int error, name[4];
-	unsigned int i;
+	unsigned int count, i;
 	const char *str;
-	size_t len;
 
 	if (!hflag)
 		printf("%5s %6s %-16s %-16s %2s %4s %-7s %-9s\n", "PID",
 		    "TID", "COMM", "TDNAME", "CPU", "PRI", "STATE", "WCHAN");
 
-	/*
-	 * We need to re-query for thread information, so don't use *kipp.
-	 */
-	name[0] = CTL_KERN;
-	name[1] = KERN_PROC;
-	name[2] = KERN_PROC_PID | KERN_PROC_INC_THREAD;
-	name[3] = kipp->ki_pid;
-
-	len = 0;
-	error = sysctl(name, 4, NULL, &len, NULL, 0);
-	if (error < 0 && errno != ESRCH) {
-		warn("sysctl: kern.proc.pid: %d", kipp->ki_pid);
-		return;
-	}
-	if (error < 0)
-		return;
-
-	kip = malloc(len);
+	kip = procstat_getprocs(procstat, KERN_PROC_PID | KERN_PROC_INC_THREAD,
+	    kipp->ki_pid, &count);
 	if (kip == NULL)
-		err(-1, "malloc");
-
-	if (sysctl(name, 4, kip, &len, NULL, 0) < 0) {
-		warn("sysctl: kern.proc.pid: %d", kipp->ki_pid);
-		free(kip);
 		return;
-	}
-
-	kinfo_proc_sort(kip, len / sizeof(*kipp));
-	for (i = 0; i < len / sizeof(*kipp); i++) {
+	kinfo_proc_sort(kip, count);
+	for (i = 0; i < count; i++) {
 		kipp = &kip[i];
 		printf("%5d ", kipp->ki_pid);
 		printf("%6d ", kipp->ki_tid);
@@ -139,5 +114,5 @@ procstat_threads(struct kinfo_proc *kipp)
 		}
 		printf("\n");
 	}
-	free(kip);
+	procstat_freeprocs(procstat, kip);
 }
diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c
index 66f29ae..d44b9c2 100644
--- a/usr.bin/procstat/procstat_vm.c
+++ b/usr.bin/procstat/procstat_vm.c
@@ -41,7 +41,7 @@
 #include "procstat.h"
 
 void
-procstat_vm(struct kinfo_proc *kipp)
+procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp)
 {
 	struct kinfo_vmentry *freep, *kve;
 	int ptrwidth;
@@ -54,7 +54,7 @@ procstat_vm(struct kinfo_proc *kipp)
 		    "PID", ptrwidth, "START", ptrwidth, "END", "PRT", "RES",
 		    "PRES", "REF", "SHD", "FL", "TP", "PATH");
 
-	freep = kinfo_getvmmap(kipp->ki_pid, &cnt);
+	freep = procstat_getvmmap(procstat, kipp, &cnt);
 	if (freep == NULL)
 		return;
 	for (i = 0; i < cnt; i++) {
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index 5f1334f..8c985f0 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -1,6 +1,7 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
+/*-
+ * Copyright (c) 1983, 1993 The Regents of the University of California.
+ * Copyright (c) 2013 Mariusz Zaborski <oshogbo@FreeBSD.org>
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -42,6 +43,7 @@ static char sccsid[] = "@(#)rwho.c	8.1 (Berkeley) 6/6/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/capability.h>
 #include <sys/param.h>
 #include <sys/file.h>
 
@@ -49,6 +51,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dirent.h>
 #include <err.h>
+#include <errno.h>
 #include <langinfo.h>
 #include <locale.h>
 #include <stdio.h>
@@ -58,22 +61,21 @@ __FBSDID("$FreeBSD$");
 #include <timeconv.h>
 #include <unistd.h>
 
-static DIR	*dirp;
+#define	NUSERS		1000
+#define	WHDRSIZE	(ssize_t)(sizeof(wd) - sizeof(wd.wd_we))
+/*
+ * this macro should be shared with ruptime.
+ */
+#define	down(w,now)	((now) - (w)->wd_recvtime > 11 * 60)
 
+static DIR	*dirp;
 static struct	whod wd;
-#define	NUSERS	1000
+static int	nusers;
 static struct	myutmp {
 	char    myhost[sizeof(wd.wd_hostname)];
 	int	myidle;
 	struct	outmp myutmp;
 } myutmp[NUSERS];
-static int	nusers;
-
-#define	WHDRSIZE	(ssize_t)(sizeof (wd) - sizeof (wd.wd_we))
-/*
- * this macro should be shared with ruptime.
- */
-#define	down(w,now)	((now) - (w)->wd_recvtime > 11 * 60)
 
 static time_t	now;
 static int	aflg;
@@ -88,17 +90,21 @@ main(int argc, char *argv[])
 	struct dirent *dp;
 	int width;
 	ssize_t cc;
-	register struct whod *w = &wd;
-	register struct whoent *we;
-	register struct myutmp *mp;
+	struct whod *w;
+	struct whoent *we;
+	struct myutmp *mp;
+	cap_rights_t rights;
 	int f, n, i;
 	int d_first;
+	int dfd;
+	time_t ct;
 
+	w = &wd;
 	(void) setlocale(LC_TIME, "");
 	d_first = (*nl_langinfo(D_MD_ORDER) == 'd');
 
-	while ((ch = getopt(argc, argv, "a")) != -1)
-		switch((char)ch) {
+	while ((ch = getopt(argc, argv, "a")) != -1) {
+		switch ((char)ch) {
 		case 'a':
 			aflg = 1;
 			break;
@@ -106,52 +112,75 @@ main(int argc, char *argv[])
 		default:
 			usage();
 		}
+	}
 	argc -= optind;
 	argv += optind;
 
 	if (argc != 0)
 		usage();
 
-	if (chdir(_PATH_RWHODIR) || (dirp = opendir(".")) == NULL)
-		err(1, "%s", _PATH_RWHODIR);
+	if (chdir(_PATH_RWHODIR) < 0)
+		err(1, "chdir(%s)", _PATH_RWHODIR);
+	if ((dirp = opendir(".")) == NULL)
+		err(1, "opendir(%s)", _PATH_RWHODIR);
+	dfd = dirfd(dirp);
 	mp = myutmp;
-	(void)time(&now);
-	while ((dp = readdir(dirp))) {
-		if (dp->d_ino == 0 || strncmp(dp->d_name, "whod.", 5))
+	cap_rights_init(&rights, CAP_READ, CAP_LOOKUP);
+	if (cap_rights_limit(dfd, &rights) < 0 && errno != ENOSYS)
+		err(1, "cap_rights_limit failed: %s", _PATH_RWHODIR);
+	/*
+	 * Cache files required for time(3) and localtime(3) before entering
+	 * capability mode.
+	 */
+	(void) time(&ct);
+	(void) localtime(&ct);
+	if (cap_enter() < 0 && errno != ENOSYS)
+		err(1, "cap_enter");
+	(void) time(&now);
+	cap_rights_init(&rights, CAP_READ);
+	while ((dp = readdir(dirp)) != NULL) {
+		if (dp->d_ino == 0 || strncmp(dp->d_name, "whod.", 5) != 0)
 			continue;
-		f = open(dp->d_name, O_RDONLY);
+		f = openat(dfd, dp->d_name, O_RDONLY);
 		if (f < 0)
 			continue;
-		cc = read(f, (char *)&wd, sizeof (struct whod));
+		if (cap_rights_limit(f, &rights) < 0 && errno != ENOSYS)
+			err(1, "cap_rights_limit failed: %s", dp->d_name);
+		cc = read(f, (char *)&wd, sizeof(struct whod));
 		if (cc < WHDRSIZE) {
 			(void) close(f);
 			continue;
 		}
-		if (down(w,now)) {
+		if (down(w, now) != 0) {
 			(void) close(f);
 			continue;
 		}
 		cc -= WHDRSIZE;
 		we = w->wd_we;
-		for (n = cc / sizeof (struct whoent); n > 0; n--) {
-			if (aflg == 0 && we->we_idle >= 60*60) {
+		for (n = cc / sizeof(struct whoent); n > 0; n--) {
+			if (aflg == 0 && we->we_idle >= 60 * 60) {
 				we++;
 				continue;
 			}
 			if (nusers >= NUSERS)
 				errx(1, "too many users");
-			mp->myutmp = we->we_utmp; mp->myidle = we->we_idle;
+			mp->myutmp = we->we_utmp;
+			mp->myidle = we->we_idle;
 			(void) strcpy(mp->myhost, w->wd_hostname);
-			nusers++; we++; mp++;
+			nusers++;
+			we++;
+			mp++;
 		}
 		(void) close(f);
 	}
-	qsort((char *)myutmp, nusers, sizeof (struct myutmp), utmpcmp);
+	qsort((char *)myutmp, nusers, sizeof(struct myutmp), utmpcmp);
 	mp = myutmp;
 	width = 0;
 	for (i = 0; i < nusers; i++) {
 		/* append one for the blank and use 8 for the out_line */
-		int j = strlen(mp->myhost) + 1 + sizeof(mp->myutmp.out_line);
+		int j;
+
+		j = strlen(mp->myhost) + 1 + sizeof(mp->myutmp.out_line);
 		if (j > width)
 			width = j;
 		mp++;
@@ -159,31 +188,29 @@ main(int argc, char *argv[])
 	mp = myutmp;
 	for (i = 0; i < nusers; i++) {
 		char buf[BUFSIZ], cbuf[80];
-		time_t t = _int_to_time(mp->myutmp.out_time);
+		time_t t;
 
-		strftime(cbuf, sizeof(cbuf),
-			 d_first ? "%e %b %R" : "%b %e %R",
-			 localtime(&t));
-		(void)sprintf(buf, "%s:%-.*s", mp->myhost,
-		   (int)sizeof(mp->myutmp.out_line), mp->myutmp.out_line);
+		t = _int_to_time(mp->myutmp.out_time);
+		strftime(cbuf, sizeof(cbuf), d_first ? "%e %b %R" : "%b %e %R",
+		    localtime(&t));
+		(void) sprintf(buf, "%s:%-.*s", mp->myhost,
+		    (int)sizeof(mp->myutmp.out_line), mp->myutmp.out_line);
 		printf("%-*.*s %-*s %s",
-		   (int)sizeof(mp->myutmp.out_name),
-		   (int)sizeof(mp->myutmp.out_name),
-		   mp->myutmp.out_name,
-		   width,
-		   buf,
-		   cbuf);
+		    (int)sizeof(mp->myutmp.out_name),
+		    (int)sizeof(mp->myutmp.out_name),
+		    mp->myutmp.out_name, width, buf, cbuf);
 		mp->myidle /= 60;
-		if (mp->myidle) {
-			if (aflg) {
-				if (mp->myidle >= 100*60)
-					mp->myidle = 100*60 - 1;
+		if (mp->myidle != 0) {
+			if (aflg != 0) {
+				if (mp->myidle >= 100 * 60)
+					mp->myidle = 100 * 60 - 1;
 				if (mp->myidle >= 60)
 					printf(" %2d", mp->myidle / 60);
 				else
 					printf("   ");
-			} else
+			} else {
 				printf(" ");
+			}
 			printf(":%02d", mp->myidle % 60);
 		}
 		printf("\n");
@@ -196,6 +223,7 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
+
 	fprintf(stderr, "usage: rwho [-a]\n");
 	exit(1);
 }
@@ -208,12 +236,12 @@ utmpcmp(const void *u1, const void *u2)
 	int rc;
 
 	rc = strncmp(MYUTMP(u1)->myutmp.out_name, MYUTMP(u2)->myutmp.out_name,
-		sizeof(MYUTMP(u2)->myutmp.out_name));
-	if (rc)
+	    sizeof(MYUTMP(u2)->myutmp.out_name));
+	if (rc != 0)
 		return (rc);
 	rc = strcmp(MYUTMP(u1)->myhost, MYUTMP(u2)->myhost);
-	if (rc)
+	if (rc != 0)
 		return (rc);
-	return (strncmp(MYUTMP(u1)->myutmp.out_line, MYUTMP(u2)->myutmp.out_line,
-		sizeof(MYUTMP(u2)->myutmp.out_line)));
+	return (strncmp(MYUTMP(u1)->myutmp.out_line,
+	    MYUTMP(u2)->myutmp.out_line, sizeof(MYUTMP(u2)->myutmp.out_line)));
 }
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index a142482..9b8efcd 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -178,7 +178,7 @@ and
 options first appeared in
 .Nx 2.0
 and were ported to
-.Fx 10.0 .
+.Fx 9.2 .
 .Sh BUGS
 The
 .Nm
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 049d2ea..2062c68 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -1,4 +1,5 @@
 /*-
+ * Copyright (c) 2013 Johann 'Myrkraverk' Oskarsson.
  * Copyright (c) 1992 Diomidis Spinellis.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -57,6 +58,7 @@ static const char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/3/94";
 #include <locale.h>
 #include <regex.h>
 #include <stddef.h>
+#define _WITH_GETLINE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -307,8 +309,9 @@ int
 mf_fgets(SPACE *sp, enum e_spflag spflag)
 {
 	struct stat sb;
-	size_t len;
-	char *p;
+	ssize_t len;
+	static char *p = NULL;
+	static size_t plen = 0;
 	int c;
 	static int firstfile;
 
@@ -424,13 +427,13 @@ mf_fgets(SPACE *sp, enum e_spflag spflag)
 	 * We are here only when infile is open and we still have something
 	 * to read from it.
 	 *
-	 * Use fgetln so that we can handle essentially infinite input data.
-	 * Can't use the pointer into the stdio buffer as the process space
-	 * because the ungetc() can cause it to move.
+	 * Use getline() so that we can handle essentially infinite input
+	 * data.  The p and plen are static so each invocation gives
+	 * getline() the same buffer which is expanded as needed.
 	 */
-	p = fgetln(infile, &len);
-	if (ferror(infile))
-		errx(1, "%s: %s", fname, strerror(errno ? errno : EIO));
+	len = getline(&p, &plen, infile);
+	if (len == -1)
+		err(1, "%s", fname);
 	if (len != 0 && p[len - 1] == '\n')
 		len--;
 	cspace(sp, p, len, spflag);
diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c
index 121aec8..3def9d0 100644
--- a/usr.bin/sort/bwstring.c
+++ b/usr.bin/sort/bwstring.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/bwstring.h b/usr.bin/sort/bwstring.h
index 7359523..93098f3 100644
--- a/usr.bin/sort/bwstring.h
+++ b/usr.bin/sort/bwstring.h
@@ -2,7 +2,7 @@
 
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/coll.c b/usr.bin/sort/coll.c
index a619fcf..b3c80f6 100644
--- a/usr.bin/sort/coll.c
+++ b/usr.bin/sort/coll.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/coll.h b/usr.bin/sort/coll.h
index a3ceaaf..9299742 100644
--- a/usr.bin/sort/coll.h
+++ b/usr.bin/sort/coll.h
@@ -2,7 +2,7 @@
 
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c
index 2d185e4..d989008 100644
--- a/usr.bin/sort/file.c
+++ b/usr.bin/sort/file.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/file.h b/usr.bin/sort/file.h
index 8e95fdb..ae33a2a 100644
--- a/usr.bin/sort/file.h
+++ b/usr.bin/sort/file.h
@@ -2,7 +2,7 @@
 
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/mem.c b/usr.bin/sort/mem.c
index 999aea2..93cb019 100644
--- a/usr.bin/sort/mem.c
+++ b/usr.bin/sort/mem.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/mem.h b/usr.bin/sort/mem.h
index 13ba4a9..44eb544 100644
--- a/usr.bin/sort/mem.h
+++ b/usr.bin/sort/mem.h
@@ -2,7 +2,7 @@
 
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/radixsort.c b/usr.bin/sort/radixsort.c
index b370723..fde2b6f 100644
--- a/usr.bin/sort/radixsort.c
+++ b/usr.bin/sort/radixsort.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/usr.bin/sort/radixsort.h b/usr.bin/sort/radixsort.h
index 5276d71..ff881a3 100644
--- a/usr.bin/sort/radixsort.h
+++ b/usr.bin/sort/radixsort.h
@@ -1,7 +1,7 @@
 /*	$FreeBSD$	*/
 
 /*-
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/usr.bin/sort/sort.1.in b/usr.bin/sort/sort.1.in
index 6dd7657..887621f 100644
--- a/usr.bin/sort/sort.1.in
+++ b/usr.bin/sort/sort.1.in
@@ -612,7 +612,7 @@ command first appeared in
 .Sh AUTHORS
 Gabor Kovesdan <gabor@FreeBSD.org>,
 .Pp
-Oleg Moskalenko <oleg.moskalenko@citrix.com>
+Oleg Moskalenko <mom040267@gmail.com>
 .Sh NOTES
 This implementation of
 .Nm
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index 7e0ab69..d811a86 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/sort.h b/usr.bin/sort/sort.h
index a37f922..e339ff7 100644
--- a/usr.bin/sort/sort.h
+++ b/usr.bin/sort/sort.h
@@ -2,7 +2,7 @@
 
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/vsort.c b/usr.bin/sort/vsort.c
index 593e54c..5d15f9a 100644
--- a/usr.bin/sort/vsort.c
+++ b/usr.bin/sort/vsort.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/usr.bin/sort/vsort.h b/usr.bin/sort/vsort.h
index facd075..17f58e5 100644
--- a/usr.bin/sort/vsort.h
+++ b/usr.bin/sort/vsort.h
@@ -1,7 +1,7 @@
 /*	$FreeBSD$	*/
 
 /*-
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
  * All rights reserved.
  *
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#if !defined(__VSORT_H__)
-#define _VSORT_H__
+#ifndef _VSORT_H_
+#define _VSORT_H_
 
 #include "bwstring.h"
 
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index 308b016..2ba86b2 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -28,7 +28,7 @@
 .\"	@(#)split.1	8.3 (Berkeley) 4/16/94
 .\" $FreeBSD$
 .\"
-.Dd September 2, 2010
+.Dd May 9, 2013
 .Dt SPLIT 1
 .Os
 .Sh NAME
@@ -36,10 +36,12 @@
 .Nd split a file into pieces
 .Sh SYNOPSIS
 .Nm
+.Fl d
 .Op Fl l Ar line_count
 .Op Fl a Ar suffix_length
 .Op Ar file Op Ar prefix
 .Nm
+.Fl d
 .Fl b Ar byte_count Ns
 .Oo
 .Sm off
@@ -49,10 +51,12 @@
 .Op Fl a Ar suffix_length
 .Op Ar file Op Ar prefix
 .Nm
+.Fl d
 .Fl n Ar chunk_count
 .Op Fl a Ar suffix_length
 .Op Ar file Op Ar prefix
 .Nm
+.Fl d
 .Fl p Ar pattern
 .Op Fl a Ar suffix_length
 .Op Ar file Op Ar prefix
@@ -108,6 +112,8 @@ or
 is appended to the number, the file is split into
 .Ar byte_count
 gigabyte pieces.
+.It Fl d
+Use a numeric suffix instead of a alphabetic suffix.
 .It Fl l Ar line_count
 Create split files
 .Ar line_count
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index be4befe..572af59 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -51,6 +51,7 @@ static const char sccsid[] = "@(#)split.c	8.2 (Berkeley) 4/16/94";
 #include <inttypes.h>
 #include <limits.h>
 #include <locale.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -70,6 +71,7 @@ static char	 bfr[MAXBSIZE];		/* I/O buffer. */
 static char	 fname[MAXPATHLEN];	/* File name prefix. */
 static regex_t	 rgx;
 static int	 pflag;
+static bool	 dflag;
 static long	 sufflen = 2;		/* File name suffix length. */
 
 static void newfile(void);
@@ -88,7 +90,8 @@ main(int argc, char **argv)
 
 	setlocale(LC_ALL, "");
 
-	while ((ch = getopt(argc, argv, "0123456789a:b:l:n:p:")) != -1)
+	dflag = false;
+	while ((ch = getopt(argc, argv, "0123456789a:b:dl:n:p:")) != -1)
 		switch (ch) {
 		case '0': case '1': case '2': case '3': case '4':
 		case '5': case '6': case '7': case '8': case '9':
@@ -131,6 +134,9 @@ main(int argc, char **argv)
 				errx(EX_USAGE, "%s: offset too large", optarg);
 			bytecnt = (off_t)(bytecnti * scale);
 			break;
+		case 'd':		/* Decimal suffix */
+			dflag = true;
+			break;
 		case 'l':		/* Line count. */
 			if (numlines != 0)
 				usage();
@@ -348,6 +354,8 @@ newfile(void)
 	long i, maxfiles, tfnum;
 	static long fnum;
 	static char *fpnt;
+	char beg, end;
+	int pattlen;
 
 	if (ofd == -1) {
 		if (fname[0] == '\0') {
@@ -359,10 +367,22 @@ newfile(void)
 		ofd = fileno(stdout);
 	}
 
-	/* maxfiles = 26^sufflen, but don't use libm. */
+	if (dflag) {
+		beg = '0';
+		end = '9';
+	}
+	else {
+		beg = 'a';
+		end = 'z';
+	}
+	pattlen = end - beg + 1;
+
+	/* maxfiles = pattlen^sufflen, but don't use libm. */
 	for (maxfiles = 1, i = 0; i < sufflen; i++)
-		if ((maxfiles *= 26) <= 0)
+		if (LONG_MAX / pattlen < maxfiles)
 			errx(EX_USAGE, "suffix is too long (max %ld)", i);
+		else
+			maxfiles *= pattlen;
 
 	if (fnum == maxfiles)
 		errx(EX_DATAERR, "too many files");
@@ -371,8 +391,8 @@ newfile(void)
 	tfnum = fnum;
 	i = sufflen - 1;
 	do {
-		fpnt[i] = tfnum % 26 + 'a';
-		tfnum /= 26;
+		fpnt[i] = tfnum % pattlen + beg;
+		tfnum /= pattlen;
 	} while (i-- > 0);
 	fpnt[sufflen] = '\0';
 
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index d9180e3..9eb24d3 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -28,7 +28,7 @@
 .\"	@(#)su.1	8.2 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd June 6, 2011
+.Dd August 11, 2013
 .Dt SU 1
 .Os
 .Sh NAME
@@ -37,8 +37,8 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl
-.Op Fl flms
 .Op Fl c Ar class
+.Op Fl flms
 .Op Ar login Op Ar args
 .Sh DESCRIPTION
 The
@@ -85,6 +85,11 @@ are also normally retained unless the target login has a user ID of 0.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl c Ar class
+Use the settings of the specified login class.
+The login class must be defined in
+.Xr login.conf 5 .
+Only allowed for the super-user.
 .It Fl f
 If the invoked shell is
 .Xr csh 1 ,
@@ -139,9 +144,6 @@ is not sufficient to transition to the user's default MAC label.
 If the label cannot be set,
 .Nm
 will fail.
-.It Fl c Ar class
-Use the settings of the specified login class.
-Only allowed for the super-user.
 .El
 .Pp
 The
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 6557c34..e721e62 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -373,6 +373,8 @@ main(int argc, char *argv[])
 		}
 		lc = login_getclass(class);
 		if (lc == NULL)
+			err(1, "login_getclass");
+		if (lc->lc_class == NULL || strcmp(class, lc->lc_class) != 0)
 			errx(1, "unknown class: %s", class);
 	}
 
diff --git a/usr.bin/svn/Makefile b/usr.bin/svn/Makefile
new file mode 100644
index 0000000..4442117
--- /dev/null
+++ b/usr.bin/svn/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR = lib svn svnadmin svndumpfilter svnlook svnserve svnsync svnversion svnmucc svnrdump
+
+.include <bsd.subdir.mk>
diff --git a/usr.bin/svn/Makefile.inc b/usr.bin/svn/Makefile.inc
new file mode 100644
index 0000000..fb50b22
--- /dev/null
+++ b/usr.bin/svn/Makefile.inc
@@ -0,0 +1,61 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+.if ${MK_SVN} == "yes"
+SVNLITE?=
+.else
+SVNLITE?=	lite
+.endif
+
+.if !defined(SVNDIR)
+
+SVNDIR=		${.CURDIR}/../../../contrib/subversion/subversion
+APRU=		${.CURDIR}/../../../contrib/apr-util
+APR=		${.CURDIR}/../../../contrib/apr
+SQLITE=		${.CURDIR}/../../../contrib/sqlite3
+WARNS?=		0	# defintely not warns friendly
+
+.if exists(${.CURDIR}/../../Makefile.inc)
+.include "${.CURDIR}/../../Makefile.inc"
+.endif
+
+LIBAPRDIR=		${.OBJDIR}/../lib/libapr
+LIBAPR_UTILDIR=		${.OBJDIR}/../lib/libapr_util
+LIBSQLITEDIR=		${.OBJDIR}/../lib/libsqlite3
+LIBSERFDIR=		${.OBJDIR}/../lib/libserf
+
+LIBSVN_CLIENTDIR=	${.OBJDIR}/../lib/libsvn_client
+LIBSVN_DELTADIR=	${.OBJDIR}/../lib/libsvn_delta
+LIBSVN_DIFFDIR=		${.OBJDIR}/../lib/libsvn_diff
+LIBSVN_FSDIR=		${.OBJDIR}/../lib/libsvn_fs
+LIBSVN_FS_FSDIR=	${.OBJDIR}/../lib/libsvn_fs_fs
+LIBSVN_FS_UTILDIR=	${.OBJDIR}/../lib/libsvn_fs_util
+LIBSVN_RADIR=		${.OBJDIR}/../lib/libsvn_ra
+LIBSVN_RA_LOCALDIR=	${.OBJDIR}/../lib/libsvn_ra_local
+LIBSVN_RA_SVNDIR=	${.OBJDIR}/../lib/libsvn_ra_svn
+LIBSVN_RA_SERFDIR=	${.OBJDIR}/../lib/libsvn_ra_serf
+LIBSVN_REPOSDIR=	${.OBJDIR}/../lib/libsvn_repos
+LIBSVN_SUBRDIR=		${.OBJDIR}/../lib/libsvn_subr
+LIBSVN_WCDIR=		${.OBJDIR}/../lib/libsvn_wc
+
+LIBAPR=			${LIBAPRDIR}/libapr.a
+LIBAPR_UTIL=		${LIBAPR_UTILDIR}/libapr-util.a
+LIBSQLITE=		${LIBSQLITEDIR}/libsqlite3.a
+LIBSERF=		${LIBSERFDIR}/libserf.a
+
+LIBSVN_CLIENT=		${LIBSVN_CLIENTDIR}/libsvn_client.a
+LIBSVN_DELTA=		${LIBSVN_DELTADIR}/libsvn_delta.a
+LIBSVN_DIFF=		${LIBSVN_DIFFDIR}/libsvn_diff.a
+LIBSVN_FS=		${LIBSVN_FSDIR}/libsvn_fs.a
+LIBSVN_FS_FS=		${LIBSVN_FS_FSDIR}/libsvn_fs_fs.a
+LIBSVN_FS_UTIL=		${LIBSVN_FS_UTILDIR}/libsvn_fs_util.a
+LIBSVN_RA=		${LIBSVN_RADIR}/libsvn_ra.a
+LIBSVN_RA_LOCAL=	${LIBSVN_RA_LOCALDIR}/libsvn_ra_local.a
+LIBSVN_RA_SVN=		${LIBSVN_RA_SVNDIR}/libsvn_ra_svn.a
+LIBSVN_RA_SERF=		${LIBSVN_RA_SERFDIR}/libsvn_ra_serf.a
+LIBSVN_REPOS=		${LIBSVN_REPOSDIR}/libsvn_repos.a
+LIBSVN_SUBR=		${LIBSVN_SUBRDIR}/libsvn_subr.a
+LIBSVN_WC=		${LIBSVN_WCDIR}/libsvn_wc.a
+
+.endif
diff --git a/usr.bin/svn/expat.h b/usr.bin/svn/expat.h
new file mode 100644
index 0000000..a501ce3
--- /dev/null
+++ b/usr.bin/svn/expat.h
@@ -0,0 +1,4 @@
+/* $FreeBSD$ */
+
+/* Hack to avoid changing vendor code */
+#include <bsdxml.h>
diff --git a/usr.bin/svn/lib/Makefile b/usr.bin/svn/lib/Makefile
new file mode 100644
index 0000000..3200625
--- /dev/null
+++ b/usr.bin/svn/lib/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+SUBDIR=	libapr libapr_util libserf libsqlite3 \
+	libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_fs_fs \
+	libsvn_fs_util libsvn_ra libsvn_ra_local libsvn_ra_serf \
+	libsvn_ra_svn libsvn_repos libsvn_subr libsvn_wc
+
+.include <bsd.subdir.mk>
diff --git a/usr.bin/svn/lib/Makefile.inc b/usr.bin/svn/lib/Makefile.inc
new file mode 100644
index 0000000..74a455c
--- /dev/null
+++ b/usr.bin/svn/lib/Makefile.inc
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+.if !defined(SVNDIR)
+
+SVNDIR=		${.CURDIR}/../../../../contrib/subversion/subversion
+APRU=		${.CURDIR}/../../../../contrib/apr-util
+APR=		${.CURDIR}/../../../../contrib/apr
+SQLITE=		${.CURDIR}/../../../../contrib/sqlite3
+SERF=		${.CURDIR}/../../../../contrib/serf
+
+WARNS?=		0	# definitely not ready
+
+.if exists(${.CURDIR}/../../../Makefile.inc)
+.include "${.CURDIR}/../../../Makefile.inc"
+.endif
+
+.endif
diff --git a/usr.bin/svn/lib/libapr/Makefile b/usr.bin/svn/lib/libapr/Makefile
new file mode 100644
index 0000000..81f7e43
--- /dev/null
+++ b/usr.bin/svn/lib/libapr/Makefile
@@ -0,0 +1,36 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+INTERNALLIB=	yes
+LIB=		apr
+SRCS=		apr_cpystrn.c apr_fnmatch.c apr_getpass.c apr_hash.c \
+		apr_pools.c apr_random.c apr_snprintf.c apr_strings.c \
+		apr_strnatcmp.c apr_strtok.c apr_tables.c buffer.c \
+		builtins.c charset.c common.c copy.c dir.c dso.c env.c \
+		epoll.c errorcodes.c fileacc.c filedup.c filepath.c \
+		filepath_util.c filestat.c flock.c fullrw.c getopt.c \
+		global_mutex.c groupinfo.c ia32.c inet_ntop.c inet_pton.c \
+		kqueue.c mktemp.c mmap.c multicast.c mutex.c open.c \
+		otherchild.c pipe.c poll.c pollcb.c pollset.c port.c \
+		ppc.c proc.c proc_mutex.c procsup.c rand.c readwrite.c \
+		s390.c seek.c select.c sendrecv.c sha2.c sha2_glue.c \
+		shm.c signals.c sockaddr.c socket_util.c sockets.c \
+		sockopt.c solaris.c start.c tempdir.c thread.c thread_cond.c \
+		thread_mutex.c thread_rwlock.c threadpriv.c time.c \
+		timestr.c userinfo.c version.c waitio.c
+
+NOMAN=		internalonly
+
+.PATH:		${APR}/atomic/unix ${APR}/dso/unix ${APR}/file_io/unix \
+		${APR}/locks/unix ${APR}/memory/unix ${APR}/misc/unix \
+		${APR}/mmap/unix ${APR}/network_io/unix ${APR}/passwd \
+		${APR}/poll/unix ${APR}/random/unix ${APR}/shmem/unix \
+		${APR}/strings ${APR}/support/unix ${APR}/tables \
+		${APR}/threadproc/unix ${APR}/time/unix ${APR}/user/unix \
+		${APR}/include
+
+CFLAGS+= 	-DHAVE_CONFIG_H -I${.CURDIR} \
+		-I${APR}/include/arch/unix -I${APR}/include
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libapr/apr.h b/usr.bin/svn/lib/libapr/apr.h
new file mode 100644
index 0000000..0ce5d85
--- /dev/null
+++ b/usr.bin/svn/lib/libapr/apr.h
@@ -0,0 +1,638 @@
+/* $FreeBSD$ */
+
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef APR_H
+#define APR_H
+
+/* GENERATED FILE WARNING!  DO NOT EDIT apr.h
+ *
+ * You must modify apr.h.in instead.
+ *
+ * And please, make an effort to stub apr.hw and apr.hnw in the process.
+ */
+
+/**
+ * @file apr.h
+ * @brief APR Platform Definitions
+ * @remark This is a generated header generated from include/apr.h.in by
+ * ./configure, or copied from include/apr.hw or include/apr.hnw 
+ * for Win32 or Netware by those build environments, respectively.
+ */
+
+/**
+ * @defgroup APR Apache Portability Runtime library
+ * @{
+ */
+/**
+ * @defgroup apr_platform Platform Definitions
+ * @{
+ * @warning
+ * <strong><em>The actual values of macros and typedefs on this page<br>
+ * are platform specific and should NOT be relied upon!</em></strong>
+ */
+
+/* So that we can use inline on some critical functions, and use
+ * GNUC attributes (such as to get -Wall warnings for printf-like
+ * functions).  Only do this in gcc 2.7 or later ... it may work
+ * on earlier stuff, but why chance it.
+ *
+ * We've since discovered that the gcc shipped with NeXT systems
+ * as "cc" is completely broken.  It claims to be __GNUC__ and so
+ * on, but it doesn't implement half of the things that __GNUC__
+ * means.  In particular it's missing inline and the __attribute__
+ * stuff.  So we hack around it.  PR#1613. -djg
+ */
+#if !defined(__GNUC__) || __GNUC__ < 2 || \
+    (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ||\
+    defined(NEXT)
+#ifndef __attribute__
+#define __attribute__(__x)
+#endif
+#define APR_INLINE
+#define APR_HAS_INLINE           0
+#else
+#define APR_INLINE __inline__
+#define APR_HAS_INLINE           1
+#endif
+
+#define APR_HAVE_ARPA_INET_H     1
+#define APR_HAVE_CONIO_H         0
+#define APR_HAVE_CRYPT_H         0
+#define APR_HAVE_CTYPE_H         1
+#define APR_HAVE_DIRENT_H        1
+#define APR_HAVE_ERRNO_H         1
+#define APR_HAVE_FCNTL_H         1
+#define APR_HAVE_IO_H            0
+#define APR_HAVE_LIMITS_H        1
+#define APR_HAVE_NETDB_H         1
+#define APR_HAVE_NETINET_IN_H    1
+#define APR_HAVE_NETINET_SCTP_H  1
+#define APR_HAVE_NETINET_SCTP_UIO_H 1
+#define APR_HAVE_NETINET_TCP_H   1
+#define APR_HAVE_PROCESS_H       0
+#define APR_HAVE_PTHREAD_H       1
+#define APR_HAVE_SEMAPHORE_H     1
+#define APR_HAVE_SIGNAL_H        1
+#define APR_HAVE_STDARG_H        1
+#define APR_HAVE_STDINT_H        1
+#define APR_HAVE_STDIO_H         1
+#define APR_HAVE_STDLIB_H        1
+#define APR_HAVE_STRING_H        1
+#define APR_HAVE_STRINGS_H       1
+#define APR_HAVE_SYS_IOCTL_H     1
+#define APR_HAVE_SYS_SENDFILE_H  0
+#define APR_HAVE_SYS_SIGNAL_H    1
+#define APR_HAVE_SYS_SOCKET_H    1
+#define APR_HAVE_SYS_SOCKIO_H    1
+#define APR_HAVE_SYS_SYSLIMITS_H 1
+#define APR_HAVE_SYS_TIME_H      1
+#define APR_HAVE_SYS_TYPES_H     1
+#define APR_HAVE_SYS_UIO_H       1
+#define APR_HAVE_SYS_UN_H        1
+#define APR_HAVE_SYS_WAIT_H      1
+#define APR_HAVE_TIME_H          1
+#define APR_HAVE_UNISTD_H        1
+#define APR_HAVE_WINDOWS_H       0
+#define APR_HAVE_WINSOCK2_H      0
+
+/** @} */
+/** @} */
+
+/* We don't include our conditional headers within the doxyblocks 
+ * or the extern "C" namespace 
+ */
+
+#if APR_HAVE_WINDOWS_H
+/* If windows.h was already included, our preferences don't matter.
+ * If not, include a restricted set of windows headers to our tastes.
+ */
+#ifndef _WINDOWS_
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifndef _WIN32_WINNT
+/* Restrict the server to a subset of Windows XP header files by default
+ */
+#define _WIN32_WINNT 0x0501
+#endif
+
+#ifndef NOUSER
+#define NOUSER
+#endif
+#ifndef NOMCX
+#define NOMCX
+#endif
+#ifndef NOIME
+#define NOIME
+#endif
+
+#include <windows.h>
+/* 
+ * Add a _very_few_ declarations missing from the restricted set of headers
+ * (If this list becomes extensive, re-enable the required headers above!)
+ * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now
+ */
+#define SW_HIDE             0
+#ifndef _WIN32_WCE
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <mswsock.h>
+#else
+#include <winsock.h>
+#endif
+
+#endif /* ndef _WINDOWS_ */
+#endif /* APR_HAVE_WINDOWS_H */
+
+#if APR_HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#if APR_HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS)
+/* C99 7.18.4 requires that stdint.h only exposes INT64_C 
+ * and UINT64_C for C++ implementations if this is defined: */
+#define __STDC_CONSTANT_MACROS
+#endif
+
+#if APR_HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#if APR_HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+#ifdef OS2
+#define INCL_DOS
+#define INCL_DOSERRORS
+#include <os2.h>
+#endif
+
+/* header files for PATH_MAX, _POSIX_PATH_MAX */
+#if APR_HAVE_LIMITS_H
+#include <limits.h>
+#else
+#if APR_HAVE_SYS_SYSLIMITS_H
+#include <sys/syslimits.h>
+#endif
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @addtogroup apr_platform
+ * @ingroup APR 
+ * @{
+ */
+
+#define APR_HAVE_SHMEM_MMAP_TMP     1
+#define APR_HAVE_SHMEM_MMAP_SHM     1
+#define APR_HAVE_SHMEM_MMAP_ZERO    1
+#define APR_HAVE_SHMEM_SHMGET_ANON  1
+#define APR_HAVE_SHMEM_SHMGET       1
+#define APR_HAVE_SHMEM_MMAP_ANON    1
+#define APR_HAVE_SHMEM_BEOS         0
+
+#define APR_USE_SHMEM_MMAP_TMP     0
+#define APR_USE_SHMEM_MMAP_SHM     0
+#define APR_USE_SHMEM_MMAP_ZERO    0
+#define APR_USE_SHMEM_SHMGET_ANON  0
+#define APR_USE_SHMEM_SHMGET       1
+#define APR_USE_SHMEM_MMAP_ANON    1
+#define APR_USE_SHMEM_BEOS         0
+
+#define APR_USE_FLOCK_SERIALIZE           1 
+#define APR_USE_SYSVSEM_SERIALIZE         0
+#define APR_USE_POSIXSEM_SERIALIZE        0
+#define APR_USE_FCNTL_SERIALIZE           0
+#define APR_USE_PROC_PTHREAD_SERIALIZE    0 
+#define APR_USE_PTHREAD_SERIALIZE         1 
+
+#define APR_HAS_FLOCK_SERIALIZE           1
+#define APR_HAS_SYSVSEM_SERIALIZE         1
+#define APR_HAS_POSIXSEM_SERIALIZE        1
+#define APR_HAS_FCNTL_SERIALIZE           1
+#define APR_HAS_PROC_PTHREAD_SERIALIZE    0
+
+#define APR_PROCESS_LOCK_IS_GLOBAL        0
+
+#define APR_HAVE_CORKABLE_TCP   1 
+#define APR_HAVE_GETRLIMIT      1
+#define APR_HAVE_IN_ADDR        1
+#define APR_HAVE_INET_ADDR      1
+#define APR_HAVE_INET_NETWORK   1
+#define APR_HAVE_IPV6           1
+#define APR_HAVE_MEMMOVE        1
+#define APR_HAVE_SETRLIMIT      1
+#define APR_HAVE_SIGACTION      1
+#define APR_HAVE_SIGSUSPEND     1
+#define APR_HAVE_SIGWAIT        1
+#define APR_HAVE_SA_STORAGE     1
+#define APR_HAVE_STRCASECMP     1
+#define APR_HAVE_STRDUP         1
+#define APR_HAVE_STRICMP        0
+#define APR_HAVE_STRNCASECMP    1
+#define APR_HAVE_STRNICMP       0
+#define APR_HAVE_STRSTR         1
+#define APR_HAVE_MEMCHR         1
+#define APR_HAVE_STRUCT_RLIMIT  1
+#define APR_HAVE_UNION_SEMUN    1
+#define APR_HAVE_SCTP           1
+#define APR_HAVE_IOVEC          1
+
+/*  APR Feature Macros */
+#define APR_HAS_SHARED_MEMORY     1
+#define APR_HAS_THREADS           1
+#define APR_HAS_SENDFILE          1
+#define APR_HAS_MMAP              1
+#define APR_HAS_FORK              1
+#define APR_HAS_RANDOM            1
+#define APR_HAS_OTHER_CHILD       1
+#define APR_HAS_DSO               0
+#define APR_HAS_SO_ACCEPTFILTER   1
+#define APR_HAS_UNICODE_FS        0
+#define APR_HAS_PROC_INVOKED      0
+#define APR_HAS_USER              1
+#define APR_HAS_LARGE_FILES       0
+#define APR_HAS_XTHREAD_FILES     0
+#define APR_HAS_OS_UUID           1
+
+#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0
+
+/* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible
+ * to poll on files/pipes.
+ */
+#define APR_FILES_AS_SOCKETS      1
+
+/* This macro indicates whether or not EBCDIC is the native character set.
+ */
+#define APR_CHARSET_EBCDIC        0
+
+/* If we have a TCP implementation that can be "corked", what flag
+ * do we use?
+ */
+#define APR_TCP_NOPUSH_FLAG       TCP_NOPUSH
+
+/* Is the TCP_NODELAY socket option inherited from listening sockets?
+*/
+#define APR_TCP_NODELAY_INHERITED 1
+
+/* Is the O_NONBLOCK flag inherited from listening sockets?
+*/
+#define APR_O_NONBLOCK_INHERITED 1
+
+/* Typedefs that APR needs. */
+
+typedef  unsigned char           apr_byte_t;
+
+typedef  short           apr_int16_t;
+typedef  unsigned short  apr_uint16_t;
+
+typedef  int             apr_int32_t;
+typedef  unsigned int    apr_uint32_t;
+
+#include <sys/_types.h>
+#ifdef __LP64__
+#define APR_SIZEOF_VOIDP 8
+#else
+#define APR_SIZEOF_VOIDP 4
+#endif
+
+/*
+ * Darwin 10's default compiler (gcc42) builds for both 64 and
+ * 32 bit architectures unless specifically told not to.
+ * In those cases, we need to override types depending on how
+ * we're being built at compile time.
+ * NOTE: This is an ugly work-around for Darwin's
+ * concept of universal binaries, a single package
+ * (executable, lib, etc...) which contains both 32
+ * and 64 bit versions. The issue is that if APR is
+ * built universally, if something else is compiled
+ * against it, some bit sizes will depend on whether
+ * it is 32 or 64 bit. This is determined by the __LP64__
+ * flag. Since we need to support both, we have to
+ * handle OS X unqiuely.
+ */
+#ifdef DARWIN_10
+#undef APR_SIZEOF_VOIDP
+#undef INT64_C
+#undef UINT64_C
+#ifdef __LP64__
+ typedef  long            apr_int64_t;
+ typedef  unsigned long   apr_uint64_t;
+ #define APR_SIZEOF_VOIDP     8
+ #define INT64_C(v)   (v ## L)
+ #define UINT64_C(v)  (v ## UL)
+#else
+ typedef  long long            apr_int64_t;
+ typedef  unsigned long long   apr_uint64_t;
+ #define APR_SIZEOF_VOIDP     4
+ #define INT64_C(v)   (v ## LL)
+ #define UINT64_C(v)  (v ## ULL)
+#endif
+#else
+ typedef  __int64_t            apr_int64_t;
+ typedef  __uint64_t           apr_uint64_t;
+#endif
+
+typedef  size_t          apr_size_t;
+typedef  ssize_t         apr_ssize_t;
+typedef  off_t           apr_off_t;
+typedef  socklen_t       apr_socklen_t;
+typedef  unsigned int           apr_ino_t;
+
+#if APR_SIZEOF_VOIDP == 8
+typedef  apr_uint64_t            apr_uintptr_t;
+#else
+typedef  apr_uint32_t            apr_uintptr_t;
+#endif
+
+/* Are we big endian? */
+#define APR_IS_BIGENDIAN	0
+
+/* Mechanisms to properly type numeric literals */
+#define APR_INT64_C(val) INT64_C(val)
+#define APR_UINT64_C(val) UINT64_C(val)
+
+#ifdef INT16_MIN
+#define APR_INT16_MIN   INT16_MIN
+#else
+#define APR_INT16_MIN   (-0x7fff - 1)
+#endif
+
+#ifdef INT16_MAX
+#define APR_INT16_MAX  INT16_MAX
+#else
+#define APR_INT16_MAX   (0x7fff)
+#endif
+
+#ifdef UINT16_MAX
+#define APR_UINT16_MAX  UINT16_MAX
+#else
+#define APR_UINT16_MAX  (0xffff)
+#endif
+
+#ifdef INT32_MIN
+#define APR_INT32_MIN   INT32_MIN
+#else
+#define APR_INT32_MIN   (-0x7fffffff - 1)
+#endif
+
+#ifdef INT32_MAX
+#define APR_INT32_MAX  INT32_MAX
+#else
+#define APR_INT32_MAX  0x7fffffff
+#endif
+
+#ifdef UINT32_MAX
+#define APR_UINT32_MAX  UINT32_MAX
+#else
+#define APR_UINT32_MAX  (0xffffffffU)
+#endif
+
+#ifdef INT64_MIN
+#define APR_INT64_MIN   INT64_MIN
+#else
+#define APR_INT64_MIN   (APR_INT64_C(-0x7fffffffffffffff) - 1)
+#endif
+
+#ifdef INT64_MAX
+#define APR_INT64_MAX   INT64_MAX
+#else
+#define APR_INT64_MAX   APR_INT64_C(0x7fffffffffffffff)
+#endif
+
+#ifdef UINT64_MAX
+#define APR_UINT64_MAX  UINT64_MAX
+#else
+#define APR_UINT64_MAX  APR_UINT64_C(0xffffffffffffffff)
+#endif
+
+#define APR_SIZE_MAX    (~((apr_size_t)0))
+
+
+/* Definitions that APR programs need to work properly. */
+
+/**
+ * APR public API wrap for C++ compilers.
+ */
+#ifdef __cplusplus
+#define APR_BEGIN_DECLS     extern "C" {
+#define APR_END_DECLS       }
+#else
+#define APR_BEGIN_DECLS
+#define APR_END_DECLS
+#endif
+
+/** 
+ * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
+ * so that they follow the platform's calling convention.
+ * <PRE>
+ *
+ * void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
+ *
+ * </PRE>
+ */
+#define APR_THREAD_FUNC       
+
+/**
+ * The public APR functions are declared with APR_DECLARE(), so they may
+ * use the most appropriate calling convention.  Public APR functions with 
+ * variable arguments must use APR_DECLARE_NONSTD().
+ *
+ * @remark Both the declaration and implementations must use the same macro.
+ *
+ * <PRE>
+ * APR_DECLARE(rettype) apr_func(args)
+ * </PRE>
+ * @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA
+ * @remark Note that when APR compiles the library itself, it passes the 
+ * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32) 
+ * to export public symbols from the dynamic library build.\n
+ * The user must define the APR_DECLARE_STATIC when compiling to target
+ * the static APR library on some platforms (e.g. Win32.)  The public symbols 
+ * are neither exported nor imported when APR_DECLARE_STATIC is defined.\n
+ * By default, compiling an application and including the APR public
+ * headers, without defining APR_DECLARE_STATIC, will prepare the code to be
+ * linked to the dynamic library.
+ */
+#define APR_DECLARE(type)            type 
+
+/**
+ * The public APR functions using variable arguments are declared with 
+ * APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
+ * @see APR_DECLARE @see APR_DECLARE_DATA
+ * @remark Both the declaration and implementations must use the same macro.
+ * <PRE>
+ *
+ * APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
+ *
+ * </PRE>
+ */
+#define APR_DECLARE_NONSTD(type)     type
+
+/**
+ * The public APR variables are declared with AP_MODULE_DECLARE_DATA.
+ * This assures the appropriate indirection is invoked at compile time.
+ * @see APR_DECLARE @see APR_DECLARE_NONSTD
+ * @remark Note that the declaration and implementations use different forms,
+ * but both must include the macro.
+ * 
+ * <PRE>
+ *
+ * extern APR_DECLARE_DATA type apr_variable;\n
+ * APR_DECLARE_DATA type apr_variable = value;
+ *
+ * </PRE>
+ */
+#define APR_DECLARE_DATA
+
+/* Define APR_SSIZE_T_FMT.  
+ * If ssize_t is an integer we define it to be "d",
+ * if ssize_t is a long int we define it to be "ld",
+ * if ssize_t is neither we declare an error here.
+ * I looked for a better way to define this here, but couldn't find one, so
+ * to find the logic for this definition search for "ssize_t_fmt" in
+ * configure.in.
+ */
+
+#ifdef __LP64__
+#define APR_SSIZE_T_FMT "ld"
+
+/* And APR_SIZE_T_FMT */
+#define APR_SIZE_T_FMT "lu"
+
+/* And APR_OFF_T_FMT */
+#define APR_OFF_T_FMT "ld"
+
+/* And APR_PID_T_FMT */
+#define APR_PID_T_FMT "d"
+
+/* And APR_INT64_T_FMT */
+#define APR_INT64_T_FMT "ld"
+
+/* And APR_UINT64_T_FMT */
+#define APR_UINT64_T_FMT "lu"
+
+/* And APR_UINT64_T_HEX_FMT */
+#define APR_UINT64_T_HEX_FMT "lx"
+#else
+#define APR_SSIZE_T_FMT "d"
+#define APR_SIZE_T_FMT "u"
+#define APR_OFF_T_FMT APR_INT64_T_FMT
+#define APR_PID_T_FMT "d"
+#define APR_INT64_T_FMT "lld"
+#define APR_UINT64_T_FMT "llu"
+#define APR_UINT64_T_HEX_FMT "llx"
+#endif
+
+/*
+ * Ensure we work with universal binaries on Darwin
+ */
+#ifdef DARWIN_10
+
+#undef APR_HAS_LARGE_FILES
+#undef APR_SIZEOF_VOIDP
+#undef APR_INT64_T_FMT
+#undef APR_UINT64_T_FMT
+#undef APR_UINT64_T_HEX_FMT
+
+#ifdef __LP64__
+ #define APR_HAS_LARGE_FILES  0
+ #define APR_SIZEOF_VOIDP     8
+ #define APR_INT64_T_FMT      "ld"
+ #define APR_UINT64_T_FMT     "lu"
+ #define APR_UINT64_T_HEX_FMT "lx"
+#else
+ #define APR_HAS_LARGE_FILES  1
+ #define APR_SIZEOF_VOIDP     4
+ #define APR_INT64_T_FMT      "lld"
+ #define APR_UINT64_T_FMT     "llu"
+ #define APR_UINT64_T_HEX_FMT "llx"
+#endif
+
+#undef APR_IS_BIGENDIAN
+#ifdef __BIG_ENDIAN__
+ #define APR_IS_BIGENDIAN	1
+#else
+ #define APR_IS_BIGENDIAN	0
+#endif
+
+#undef APR_OFF_T_FMT
+#define APR_OFF_T_FMT "lld"
+
+#endif /* DARWIN_10 */
+
+/* Does the proc mutex lock threads too */
+#define APR_PROC_MUTEX_IS_GLOBAL      0
+
+/* Local machine definition for console and log output. */
+#define APR_EOL_STR              "\n"
+
+#if APR_HAVE_SYS_WAIT_H
+#ifdef WEXITSTATUS
+#define apr_wait_t       int
+#else
+#define apr_wait_t       union wait
+#define WEXITSTATUS(status)    (int)((status).w_retcode)
+#define WTERMSIG(status)       (int)((status).w_termsig)
+#endif /* !WEXITSTATUS */
+#elif defined(__MINGW32__)
+typedef int apr_wait_t;
+#endif /* HAVE_SYS_WAIT_H */
+
+#if defined(PATH_MAX)
+#define APR_PATH_MAX       PATH_MAX
+#elif defined(_POSIX_PATH_MAX)
+#define APR_PATH_MAX       _POSIX_PATH_MAX
+#else
+#error no decision has been made on APR_PATH_MAX for your platform
+#endif
+
+#define APR_DSOPATH "LD_LIBRARY_PATH"
+
+/** @} */
+
+/* Definitions that only Win32 programs need to compile properly. */
+
+/* XXX These simply don't belong here, perhaps in apr_portable.h
+ * based on some APR_HAVE_PID/GID/UID?
+ */
+#ifdef __MINGW32__
+#ifndef __GNUC__
+typedef  int         pid_t;
+#endif
+typedef  int         uid_t;
+typedef  int         gid_t;
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APR_H */
diff --git a/usr.bin/svn/lib/libapr/apr_private.h b/usr.bin/svn/lib/libapr/apr_private.h
new file mode 100644
index 0000000..fcbbbd3
--- /dev/null
+++ b/usr.bin/svn/lib/libapr/apr_private.h
@@ -0,0 +1,1000 @@
+/* $FreeBSD$ */
+
+/* include/arch/unix/apr_private.h.  Generated from apr_private.h.in by configure.  */
+/* include/arch/unix/apr_private.h.in.  Generated from configure.in by autoheader.  */
+
+
+#ifndef APR_PRIVATE_H
+#define APR_PRIVATE_H
+
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* Define if apr_allocator should use mmap */
+/* #undef APR_ALLOCATOR_USES_MMAP */
+
+/* Define as function which can be used for conversion of strings to
+   apr_int64_t */
+#define APR_INT64_STRFN strtol
+
+/* Define as function used for conversion of strings to apr_off_t */
+#define APR_OFF_T_STRFN strtol
+
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+/* #undef CRAY_STACKSEG_END */
+
+/* Define to 1 if using `alloca.c'. */
+/* #undef C_ALLOCA */
+
+/* Define to path of random device */
+#define DEV_RANDOM "/dev/urandom"
+
+/* Define if struct dirent has an inode member */
+#define DIRENT_INODE d_fileno
+
+/* Define if struct dirent has a d_type member */
+#define DIRENT_TYPE d_type
+
+/* Define if DSO support uses dlfcn.h */
+/* #undef DSO_USE_DLFCN */
+
+/* Define if DSO support uses dyld.h */
+/* #undef DSO_USE_DYLD */
+
+/* Define if DSO support uses shl_load */
+/* #undef DSO_USE_SHL */
+
+/* Define to list of paths to EGD sockets */
+/* #undef EGD_DEFAULT_SOCKET */
+
+/* Define if fcntl locks affect threads within the process */
+/* #undef FCNTL_IS_GLOBAL */
+
+/* Define if fcntl returns EACCES when F_SETLK is already held */
+/* #undef FCNTL_TRYACQUIRE_EACCES */
+
+/* Define if flock locks affect threads within the process */
+/* #undef FLOCK_IS_GLOBAL */
+
+/* Define if gethostbyaddr is thread safe */
+/* #undef GETHOSTBYADDR_IS_THREAD_SAFE */
+
+/* Define if gethostbyname is thread safe */
+/* #undef GETHOSTBYNAME_IS_THREAD_SAFE */
+
+/* Define if gethostbyname_r has the glibc style */
+#define GETHOSTBYNAME_R_GLIBC2 1
+
+/* Define if gethostbyname_r has the hostent_data for the third argument */
+/* #undef GETHOSTBYNAME_R_HOSTENT_DATA */
+
+/* Define if getservbyname is thread safe */
+/* #undef GETSERVBYNAME_IS_THREAD_SAFE */
+
+/* Define if getservbyname_r has the glibc style */
+#define GETSERVBYNAME_R_GLIBC2 1
+
+/* Define if getservbyname_r has the OSF/1 style */
+/* #undef GETSERVBYNAME_R_OSF1 */
+
+/* Define if getservbyname_r has the Solaris style */
+/* #undef GETSERVBYNAME_R_SOLARIS */
+
+/* Define if accept4 function is supported */
+#define HAVE_ACCEPT4 1
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+#define HAVE_ALLOCA 1
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define if compiler provides atomic builtins */
+#define HAVE_ATOMIC_BUILTINS 1
+
+/* Define if BONE_VERSION is defined in sys/socket.h */
+/* #undef HAVE_BONE_VERSION */
+
+/* Define to 1 if you have the <ByteOrder.h> header file. */
+/* #undef HAVE_BYTEORDER_H */
+
+/* Define to 1 if you have the `calloc' function. */
+#define HAVE_CALLOC 1
+
+/* Define to 1 if you have the <conio.h> header file. */
+/* #undef HAVE_CONIO_H */
+
+/* Define to 1 if you have the `create_area' function. */
+/* #undef HAVE_CREATE_AREA */
+
+/* Define to 1 if you have the `create_sem' function. */
+/* #undef HAVE_CREATE_SEM */
+
+/* Define to 1 if you have the <crypt.h> header file. */
+/* #undef HAVE_CRYPT_H */
+
+/* Define to 1 if you have the <ctype.h> header file. */
+#define HAVE_CTYPE_H 1
+
+/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
+   don't. */
+#define HAVE_DECL_SYS_SIGLIST 1
+
+/* Define to 1 if you have the <dirent.h> header file. */
+#define HAVE_DIRENT_H 1
+
+/* Define to 1 if you have the <dir.h> header file. */
+/* #undef HAVE_DIR_H */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <dl.h> header file. */
+/* #undef HAVE_DL_H */
+
+/* Define if dup3 function is supported */
+/* #undef HAVE_DUP3 */
+
+/* Define if EGD is supported */
+/* #undef HAVE_EGD */
+
+/* Define if the epoll interface is supported */
+/* #undef HAVE_EPOLL */
+
+/* Define if epoll_create1 function is supported */
+/* #undef HAVE_EPOLL_CREATE1 */
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `fdatasync' function. */
+/* #undef HAVE_FDATASYNC */
+
+/* Define to 1 if you have the `flock' function. */
+#define HAVE_FLOCK 1
+
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
+
+/* Define if F_SETLK is defined in fcntl.h */
+#define HAVE_F_SETLK 1
+
+/* Define if getaddrinfo accepts the AI_ADDRCONFIG flag */
+#define HAVE_GAI_ADDRCONFIG 1
+
+/* Define to 1 if you have the `gai_strerror' function. */
+#define HAVE_GAI_STRERROR 1
+
+/* Define if getaddrinfo exists and works well enough for APR */
+#define HAVE_GETADDRINFO 1
+
+/* Define to 1 if you have the `getenv' function. */
+#define HAVE_GETENV 1
+
+/* Define to 1 if you have the `getgrgid_r' function. */
+#define HAVE_GETGRGID_R 1
+
+/* Define to 1 if you have the `getgrnam_r' function. */
+#define HAVE_GETGRNAM_R 1
+
+/* Define to 1 if you have the `gethostbyaddr_r' function. */
+#define HAVE_GETHOSTBYADDR_R 1
+
+/* Define to 1 if you have the `gethostbyname_r' function. */
+#define HAVE_GETHOSTBYNAME_R 1
+
+/* Define to 1 if you have the `getifaddrs' function. */
+#define HAVE_GETIFADDRS 1
+
+/* Define if getnameinfo exists */
+#define HAVE_GETNAMEINFO 1
+
+/* Define to 1 if you have the `getpass' function. */
+#define HAVE_GETPASS 1
+
+/* Define to 1 if you have the `getpassphrase' function. */
+/* #undef HAVE_GETPASSPHRASE */
+
+/* Define to 1 if you have the `getpwnam_r' function. */
+#define HAVE_GETPWNAM_R 1
+
+/* Define to 1 if you have the `getpwuid_r' function. */
+#define HAVE_GETPWUID_R 1
+
+/* Define to 1 if you have the `getrlimit' function. */
+#define HAVE_GETRLIMIT 1
+
+/* Define to 1 if you have the `getservbyname_r' function. */
+#define HAVE_GETSERVBYNAME_R 1
+
+/* Define to 1 if you have the `gmtime_r' function. */
+#define HAVE_GMTIME_R 1
+
+/* Define to 1 if you have the <grp.h> header file. */
+#define HAVE_GRP_H 1
+
+/* Define if hstrerror is present */
+/* #undef HAVE_HSTRERROR */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <io.h> header file. */
+/* #undef HAVE_IO_H */
+
+/* Define to 1 if you have the `isinf' function. */
+#define HAVE_ISINF 1
+
+/* Define to 1 if you have the `isnan' function. */
+#define HAVE_ISNAN 1
+
+/* Define to 1 if you have the <kernel/OS.h> header file. */
+/* #undef HAVE_KERNEL_OS_H */
+
+/* Define to 1 if you have the `kqueue' function. */
+#define HAVE_KQUEUE 1
+
+/* Define to 1 if you have the <langinfo.h> header file. */
+#define HAVE_LANGINFO_H 1
+
+/* Define to 1 if you have the `bsd' library (-lbsd). */
+/* #undef HAVE_LIBBSD */
+
+/* Define to 1 if you have the `sendfile' library (-lsendfile). */
+/* #undef HAVE_LIBSENDFILE */
+
+/* Define to 1 if you have the `truerand' library (-ltruerand). */
+/* #undef HAVE_LIBTRUERAND */
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the `localtime_r' function. */
+#define HAVE_LOCALTIME_R 1
+
+/* Define if LOCK_EX is defined in sys/file.h */
+#define HAVE_LOCK_EX 1
+
+/* Define to 1 if you have the <mach-o/dyld.h> header file. */
+/* #undef HAVE_MACH_O_DYLD_H */
+
+/* Define to 1 if you have the <malloc.h> header file. */
+/* #undef HAVE_MALLOC_H */
+
+/* Define if MAP_ANON is defined in sys/mman.h */
+#define HAVE_MAP_ANON 1
+
+/* Define to 1 if you have the `memchr' function. */
+#define HAVE_MEMCHR 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mkstemp' function. */
+#define HAVE_MKSTEMP 1
+
+/* Define to 1 if you have the `mkstemp64' function. */
+/* #undef HAVE_MKSTEMP64 */
+
+/* Define to 1 if you have the `mmap' function. */
+#define HAVE_MMAP 1
+
+/* Define to 1 if you have the `mmap64' function. */
+/* #undef HAVE_MMAP64 */
+
+/* Define to 1 if you have the `munmap' function. */
+#define HAVE_MUNMAP 1
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the <netinet/sctp.h> header file. */
+#define HAVE_NETINET_SCTP_H 1
+
+/* Define to 1 if you have the <netinet/sctp_uio.h> header file. */
+#define HAVE_NETINET_SCTP_UIO_H 1
+
+/* Defined if netinet/tcp.h is present */
+#define HAVE_NETINET_TCP_H 1
+
+/* Define to 1 if you have the <net/errno.h> header file. */
+/* #undef HAVE_NET_ERRNO_H */
+
+/* Define to 1 if you have the `nl_langinfo' function. */
+#define HAVE_NL_LANGINFO 1
+
+/* Define to 1 if you have the <os2.h> header file. */
+/* #undef HAVE_OS2_H */
+
+/* Define to 1 if you have the <osreldate.h> header file. */
+#define HAVE_OSRELDATE_H 1
+
+/* Define to 1 if you have the <OS.h> header file. */
+/* #undef HAVE_OS_H */
+
+/* Define to 1 if you have the `poll' function. */
+#define HAVE_POLL 1
+
+/* Define if POLLIN is defined */
+#define HAVE_POLLIN 1
+
+/* Define to 1 if you have the <poll.h> header file. */
+#define HAVE_POLL_H 1
+
+/* Define to 1 if you have the `port_create' function. */
+/* #undef HAVE_PORT_CREATE */
+
+/* Define to 1 if you have the <process.h> header file. */
+/* #undef HAVE_PROCESS_H */
+
+/* Define to 1 if you have the `pthread_attr_setguardsize' function. */
+#define HAVE_PTHREAD_ATTR_SETGUARDSIZE 1
+
+/* Define to 1 if you have the <pthread.h> header file. */
+#define HAVE_PTHREAD_H 1
+
+/* Define to 1 if you have the `pthread_key_delete' function. */
+#define HAVE_PTHREAD_KEY_DELETE 1
+
+/* Define to 1 if you have the `pthread_mutexattr_setpshared' function. */
+#define HAVE_PTHREAD_MUTEXATTR_SETPSHARED 1
+
+/* Define if recursive pthread mutexes are available */
+#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
+
+/* Define if cross-process robust mutexes are available */
+/* #undef HAVE_PTHREAD_MUTEX_ROBUST */
+
+/* Define if PTHREAD_PROCESS_SHARED is defined in pthread.h */
+#define HAVE_PTHREAD_PROCESS_SHARED 1
+
+/* Define if pthread rwlocks are available */
+#define HAVE_PTHREAD_RWLOCKS 1
+
+/* Define to 1 if you have the `pthread_rwlock_init' function. */
+#define HAVE_PTHREAD_RWLOCK_INIT 1
+
+/* Define to 1 if you have the `pthread_yield' function. */
+#define HAVE_PTHREAD_YIELD 1
+
+/* Define to 1 if you have the `putenv' function. */
+#define HAVE_PUTENV 1
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#define HAVE_PWD_H 1
+
+/* Define to 1 if you have the `readdir64_r' function. */
+/* #undef HAVE_READDIR64_R */
+
+/* Define to 1 if you have the <sched.h> header file. */
+/* #undef HAVE_SCHED_H */
+
+/* Define to 1 if you have the `sched_yield' function. */
+/* #undef HAVE_SCHED_YIELD */
+
+/* Define to 1 if you have the <semaphore.h> header file. */
+#define HAVE_SEMAPHORE_H 1
+
+/* Define to 1 if you have the `semctl' function. */
+#define HAVE_SEMCTL 1
+
+/* Define to 1 if you have the `semget' function. */
+#define HAVE_SEMGET 1
+
+/* Define to 1 if you have the `sem_close' function. */
+#define HAVE_SEM_CLOSE 1
+
+/* Define to 1 if you have the `sem_post' function. */
+#define HAVE_SEM_POST 1
+
+/* Define if SEM_UNDO is defined in sys/sem.h */
+#define HAVE_SEM_UNDO 1
+
+/* Define to 1 if you have the `sem_unlink' function. */
+#define HAVE_SEM_UNLINK 1
+
+/* Define to 1 if you have the `sem_wait' function. */
+#define HAVE_SEM_WAIT 1
+
+/* Define to 1 if you have the `sendfile' function. */
+#define HAVE_SENDFILE 1
+
+/* Define to 1 if you have the `sendfile64' function. */
+/* #undef HAVE_SENDFILE64 */
+
+/* Define to 1 if you have the `sendfilev' function. */
+/* #undef HAVE_SENDFILEV */
+
+/* Define to 1 if you have the `sendfilev64' function. */
+/* #undef HAVE_SENDFILEV64 */
+
+/* Define to 1 if you have the `send_file' function. */
+/* #undef HAVE_SEND_FILE */
+
+/* Define to 1 if you have the `setenv' function. */
+#define HAVE_SETENV 1
+
+/* Define to 1 if you have the `setrlimit' function. */
+#define HAVE_SETRLIMIT 1
+
+/* Define to 1 if you have the `setsid' function. */
+#define HAVE_SETSID 1
+
+/* Define to 1 if you have the `set_h_errno' function. */
+/* #undef HAVE_SET_H_ERRNO */
+
+/* Define to 1 if you have the `shmat' function. */
+#define HAVE_SHMAT 1
+
+/* Define to 1 if you have the `shmctl' function. */
+#define HAVE_SHMCTL 1
+
+/* Define to 1 if you have the `shmdt' function. */
+#define HAVE_SHMDT 1
+
+/* Define to 1 if you have the `shmget' function. */
+#define HAVE_SHMGET 1
+
+/* Define to 1 if you have the `shm_open' function. */
+#define HAVE_SHM_OPEN 1
+
+/* Define to 1 if you have the `shm_unlink' function. */
+#define HAVE_SHM_UNLINK 1
+
+/* Define to 1 if you have the `sigaction' function. */
+#define HAVE_SIGACTION 1
+
+/* Define to 1 if you have the <signal.h> header file. */
+#define HAVE_SIGNAL_H 1
+
+/* Define to 1 if you have the `sigsuspend' function. */
+#define HAVE_SIGSUSPEND 1
+
+/* Define to 1 if you have the `sigwait' function. */
+#define HAVE_SIGWAIT 1
+
+/* Whether you have socklen_t */
+#define HAVE_SOCKLEN_T 1
+
+/* Define if the SOCK_CLOEXEC flag is supported */
+#define HAVE_SOCK_CLOEXEC 1
+
+/* Define if SO_ACCEPTFILTER is defined in sys/socket.h */
+#define HAVE_SO_ACCEPTFILTER 1
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#define HAVE_STDARG_H 1
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the `strerror_r' function. */
+#define HAVE_STRERROR_R 1
+
+/* Define to 1 if you have the `stricmp' function. */
+/* #undef HAVE_STRICMP */
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strncasecmp' function. */
+#define HAVE_STRNCASECMP 1
+
+/* Define to 1 if you have the `strnicmp' function. */
+/* #undef HAVE_STRNICMP */
+
+/* Define to 1 if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define if struct impreq was found */
+#define HAVE_STRUCT_IPMREQ 1
+
+/* Define to 1 if `st_atimensec' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_ATIMENSEC */
+
+/* Define to 1 if `st_atime_n' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_ATIME_N */
+
+/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1
+
+/* Define to 1 if `st_blocks' is a member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_BLOCKS 1
+
+/* Define to 1 if `st_ctimensec' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_CTIMENSEC */
+
+/* Define to 1 if `st_ctime_n' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_CTIME_N */
+
+/* Define to 1 if `st_ctim.tv_nsec' is a member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC 1
+
+/* Define to 1 if `st_mtimensec' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */
+
+/* Define to 1 if `st_mtime_n' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_MTIME_N */
+
+/* Define to 1 if `st_mtim.tv_nsec' is a member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
+
+/* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */
+#define HAVE_STRUCT_TM_TM_GMTOFF 1
+
+/* Define to 1 if `__tm_gmtoff' is a member of `struct tm'. */
+/* #undef HAVE_STRUCT_TM___TM_GMTOFF */
+
+/* Define to 1 if you have the <sysapi.h> header file. */
+/* #undef HAVE_SYSAPI_H */
+
+/* Define to 1 if you have the <sysgtime.h> header file. */
+/* #undef HAVE_SYSGTIME_H */
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/ipc.h> header file. */
+#define HAVE_SYS_IPC_H 1
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#define HAVE_SYS_MMAN_H 1
+
+/* Define to 1 if you have the <sys/mutex.h> header file. */
+#define HAVE_SYS_MUTEX_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/poll.h> header file. */
+#define HAVE_SYS_POLL_H 1
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/sem.h> header file. */
+#define HAVE_SYS_SEM_H 1
+
+/* Define to 1 if you have the <sys/sendfile.h> header file. */
+/* #undef HAVE_SYS_SENDFILE_H */
+
+/* Define to 1 if you have the <sys/shm.h> header file. */
+#define HAVE_SYS_SHM_H 1
+
+/* Define to 1 if you have the <sys/signal.h> header file. */
+#define HAVE_SYS_SIGNAL_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/sockio.h> header file. */
+#define HAVE_SYS_SOCKIO_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#define HAVE_SYS_SYSCTL_H 1
+
+/* Define to 1 if you have the <sys/syslimits.h> header file. */
+#define HAVE_SYS_SYSLIMITS_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+#define HAVE_SYS_UN_H 1
+
+/* Define to 1 if you have the <sys/uuid.h> header file. */
+/* #undef HAVE_SYS_UUID_H */
+
+/* Define to 1 if you have the <sys/wait.h> header file. */
+#define HAVE_SYS_WAIT_H 1
+
+/* Define if TCP_CORK is defined in netinet/tcp.h */
+/* #undef HAVE_TCP_CORK */
+
+/* Define if TCP_NODELAY and TCP_CORK can be enabled at the same time */
+/* #undef HAVE_TCP_NODELAY_WITH_CORK */
+
+/* Define if TCP_NOPUSH is defined in netinet/tcp.h */
+#define HAVE_TCP_NOPUSH 1
+
+/* Define to 1 if you have the <termios.h> header file. */
+#define HAVE_TERMIOS_H 1
+
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H 1
+
+/* Define to 1 if you have the <tpfeq.h> header file. */
+/* #undef HAVE_TPFEQ_H */
+
+/* Define to 1 if you have the <tpfio.h> header file. */
+/* #undef HAVE_TPFIO_H */
+
+/* Define if truerand is supported */
+/* #undef HAVE_TRUERAND */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <unix.h> header file. */
+/* #undef HAVE_UNIX_H */
+
+/* Define to 1 if you have the `unsetenv' function. */
+#define HAVE_UNSETENV 1
+
+/* Define to 1 if you have the `utime' function. */
+#define HAVE_UTIME 1
+
+/* Define to 1 if you have the `utimes' function. */
+#define HAVE_UTIMES 1
+
+/* Define to 1 if you have the `uuid_create' function. */
+#define HAVE_UUID_CREATE 1
+
+/* Define to 1 if you have the `uuid_generate' function. */
+/* #undef HAVE_UUID_GENERATE */
+
+/* Define to 1 if you have the <uuid.h> header file. */
+#define HAVE_UUID_H 1
+
+/* Define to 1 if you have the <uuid/uuid.h> header file. */
+/* #undef HAVE_UUID_UUID_H */
+
+/* Define if C compiler supports VLA */
+#define HAVE_VLA 1
+
+/* Define to 1 if you have the `waitpid' function. */
+#define HAVE_WAITPID 1
+
+/* Define to 1 if you have the <windows.h> header file. */
+/* #undef HAVE_WINDOWS_H */
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+/* #undef HAVE_WINSOCK2_H */
+
+/* Define to 1 if you have the `writev' function. */
+#define HAVE_WRITEV 1
+
+/* Define for z/OS pthread API nuances */
+/* #undef HAVE_ZOS_PTHREADS */
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Define if EAI_ error codes from getaddrinfo are negative */
+/* #undef NEGATIVE_EAI */
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Define if POSIX semaphores affect threads within the process */
+/* #undef POSIXSEM_IS_GLOBAL */
+
+/* Define on PowerPC 405 where errata 77 applies */
+/* #undef PPC405_ERRATA */
+
+/* Define if pthread_attr_getdetachstate() has one arg */
+/* #undef PTHREAD_ATTR_GETDETACHSTATE_TAKES_ONE_ARG */
+
+/* Define if pthread_getspecific() has two args */
+/* #undef PTHREAD_GETSPECIFIC_TAKES_TWO_ARGS */
+
+/* Define if readdir is thread safe */
+/* #undef READDIR_IS_THREAD_SAFE */
+
+/* Define to 1 if the `setpgrp' function takes no argument. */
+/* #undef SETPGRP_VOID */
+
+/* */
+/* #undef SIGWAIT_TAKES_ONE_ARG */
+
+/* The size of `char', as computed by sizeof. */
+#define SIZEOF_CHAR 1
+
+/* The size of ino_t */
+#define SIZEOF_INO_T 4
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 8
+
+/* The size of `long long', as computed by sizeof. */
+#define SIZEOF_LONG_LONG 8
+
+/* The size of off_t */
+#define SIZEOF_OFF_T 8
+
+/* The size of pid_t */
+#define SIZEOF_PID_T 4
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* The size of size_t */
+#define SIZEOF_SIZE_T 8
+
+/* The size of ssize_t */
+#define SIZEOF_SSIZE_T 8
+
+/* The size of struct iovec */
+#define SIZEOF_STRUCT_IOVEC 16
+
+/* The size of `void*', as computed by sizeof. */
+#define SIZEOF_VOIDP 8
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at runtime.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
+/* #undef STACK_DIRECTION */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define if strerror returns int */
+#define STRERROR_R_RC_INT 1
+
+/* Define if SysV semaphores affect threads within the process */
+/* #undef SYSVSEM_IS_GLOBAL */
+
+/* Define if use of generic atomics is requested */
+/* #undef USE_ATOMICS_GENERIC */
+
+/* Define if BeOS Semaphores will be used */
+/* #undef USE_BEOSSEM */
+
+/* Define if SVR4-style fcntl() will be used */
+/* #undef USE_FCNTL_SERIALIZE */
+
+/* Define if 4.2BSD-style flock() will be used */
+#define USE_FLOCK_SERIALIZE 1
+
+/* Define if BeOS areas will be used */
+/* #undef USE_SHMEM_BEOS */
+
+/* Define if BeOS areas will be used */
+/* #undef USE_SHMEM_BEOS_ANON */
+
+/* Define if 4.4BSD-style mmap() via MAP_ANON will be used */
+#define USE_SHMEM_MMAP_ANON 1
+
+/* Define if mmap() via POSIX.1 shm_open() on temporary file will be used */
+/* #undef USE_SHMEM_MMAP_SHM */
+
+/* Define if Classical mmap() on temporary file will be used */
+/* #undef USE_SHMEM_MMAP_TMP */
+
+/* Define if SVR4-style mmap() on /dev/zero will be used */
+/* #undef USE_SHMEM_MMAP_ZERO */
+
+/* Define if OS/2 DosAllocSharedMem() will be used */
+/* #undef USE_SHMEM_OS2 */
+
+/* Define if OS/2 DosAllocSharedMem() will be used */
+/* #undef USE_SHMEM_OS2_ANON */
+
+/* Define if SysV IPC shmget() will be used */
+#define USE_SHMEM_SHMGET 1
+
+/* Define if SysV IPC shmget() will be used */
+/* #undef USE_SHMEM_SHMGET_ANON */
+
+/* Define if Windows shared memory will be used */
+/* #undef USE_SHMEM_WIN32 */
+
+/* Define if Windows CreateFileMapping() will be used */
+/* #undef USE_SHMEM_WIN32_ANON */
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
+/* Define if SysV IPC semget() will be used */
+/* #undef USE_SYSVSEM_SERIALIZE */
+
+/* Define if apr_wait_for_io_or_timeout() uses poll(2) */
+#define WAITIO_USES_POLL 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef gid_t */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to `long int' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef ssize_t */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef uid_t */
+
+
+/* switch this on if we have a BeOS version below BONE */
+#if BEOS && !HAVE_BONE_VERSION
+#define BEOS_R5 1
+#else
+#define BEOS_BONE 1
+#endif
+
+/*
+ * Darwin 10's default compiler (gcc42) builds for both 64 and
+ * 32 bit architectures unless specifically told not to.
+ * In those cases, we need to override types depending on how
+ * we're being built at compile time.
+ * NOTE: This is an ugly work-around for Darwin's
+ * concept of universal binaries, a single package
+ * (executable, lib, etc...) which contains both 32
+ * and 64 bit versions. The issue is that if APR is
+ * built universally, if something else is compiled
+ * against it, some bit sizes will depend on whether
+ * it is 32 or 64 bit. This is determined by the __LP64__
+ * flag. Since we need to support both, we have to
+ * handle OS X unqiuely.
+ */
+#ifdef DARWIN_10
+
+#define APR_OFF_T_STRFN strtol
+#define APR_INT64_STRFN strtol
+#define SIZEOF_LONG 8
+#define SIZEOF_SIZE_T 8
+#define SIZEOF_SSIZE_T 8
+#define SIZEOF_VOIDP 8
+#define SIZEOF_STRUCT_IOVEC 16
+
+#ifdef __LP64__
+ #define APR_INT64_STRFN strtol
+ #define SIZEOF_LONG 8
+ #define SIZEOF_SIZE_T 8
+ #define SIZEOF_SSIZE_T 8
+ #define SIZEOF_VOIDP 8
+ #define SIZEOF_STRUCT_IOVEC 16
+#else
+ #define APR_INT64_STRFN strtol
+ #define SIZEOF_LONG 8
+ #define SIZEOF_SIZE_T 8
+ #define SIZEOF_SSIZE_T 8
+ #define SIZEOF_VOIDP 8
+ #define SIZEOF_STRUCT_IOVEC 16
+#endif
+
+#define APR_OFF_T_STRFN strtol
+#define APR_OFF_T_STRFN strtol
+ 
+
+/* #undef SETPGRP_VOID */
+#ifdef __DARWIN_UNIX03
+ #define SETPGRP_VOID 1
+#else
+/* #undef SETPGRP_VOID */
+#endif
+ 
+#endif /* DARWIN_10 */
+
+/*
+ * Include common private declarations.
+ */
+#include "../apr_private_common.h"
+#endif /* APR_PRIVATE_H */
+
diff --git a/usr.bin/svn/lib/libapr_util/Makefile b/usr.bin/svn/lib/libapr_util/Makefile
new file mode 100644
index 0000000..4f25e8f
--- /dev/null
+++ b/usr.bin/svn/lib/libapr_util/Makefile
@@ -0,0 +1,38 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+INTERNALLIB=	yes
+LIB=		apr-util
+
+SRCS=		apr_base64.c apr_brigade.c apr_buckets.c apr_buckets_alloc.c \
+		apr_buckets_eos.c apr_buckets_file.c apr_buckets_flush.c \
+		apr_buckets_heap.c apr_buckets_mmap.c apr_buckets_pipe.c \
+		apr_buckets_pool.c apr_buckets_refcount.c apr_buckets_simple.c \
+		apr_buckets_socket.c apr_crypto.c apr_date.c apr_dbd.c \
+		apr_hooks.c apr_md4.c apr_md5.c apr_memcache.c apr_passwd.c \
+		apr_queue.c apr_reslist.c apr_rmm.c apr_sha1.c apr_strmatch.c \
+		apr_thread_pool.c apr_uri.c apr_xml.c apu_dso.c apu_version.c \
+		crypt_blowfish.c getuuid.c uuid.c xlate.c
+
+.PATH:		${APRU}/buckets ${APRU}/crypto ${APRU}/dbd \
+		${APRU}/encoding ${APRU}/hooks \
+		${APRU}/memcache ${APRU}/misc ${APRU}/strmatch \
+		${APRU}/uri ${APRU}/xlate ${APRU}/xml ${APRU}/include
+
+CFLAGS+= 	-DHAVE_CONFIG_H \
+		-I${.CURDIR} \
+		-I${APRU}/include/private \
+		-I${APRU}/include \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include
+
+.include <bsd.own.mk>
+
+.if ${MK_ICONV} == "yes"
+CFLAGS+=	-DHAVE_ICONV_H=1 -DAPU_HAVE_ICONV=1
+.endif
+
+.include <bsd.lib.mk>
+
diff --git a/usr.bin/svn/lib/libapr_util/apr_ldap.h b/usr.bin/svn/lib/libapr_util/apr_ldap.h
new file mode 100644
index 0000000..27a96de
--- /dev/null
+++ b/usr.bin/svn/lib/libapr_util/apr_ldap.h
@@ -0,0 +1,198 @@
+/* $FreeBSD$ */
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * apr_ldap.h is generated from apr_ldap.h.in by configure -- do not edit apr_ldap.h
+ */
+/**
+ * @file apr_ldap.h
+ * @brief  APR-UTIL LDAP 
+ */
+#ifndef APU_LDAP_H
+#define APU_LDAP_H
+
+/**
+ * @defgroup APR_Util_LDAP LDAP
+ * @ingroup APR_Util
+ * @{
+ */
+
+/* this will be defined if LDAP support was compiled into apr-util */
+#define APR_HAS_LDAP		  0
+
+/* identify the LDAP toolkit used */
+#define APR_HAS_NETSCAPE_LDAPSDK  0
+#define APR_HAS_SOLARIS_LDAPSDK   0
+#define APR_HAS_NOVELL_LDAPSDK    0
+#define APR_HAS_MOZILLA_LDAPSDK   0
+#define APR_HAS_OPENLDAP_LDAPSDK  0
+#define APR_HAS_MICROSOFT_LDAPSDK 0
+#define APR_HAS_TIVOLI_LDAPSDK    0
+#define APR_HAS_ZOS_LDAPSDK       0
+#define APR_HAS_OTHER_LDAPSDK     0
+
+
+/*
+ * Handle the case when LDAP is enabled
+ */
+#if APR_HAS_LDAP
+
+/*
+ * The following #defines are DEPRECATED and should not be used for
+ * anything. They remain to maintain binary compatibility.
+ * The original code defined the OPENLDAP SDK as present regardless
+ * of what really was there, which was way bogus. In addition, the
+ * apr_ldap_url_parse*() functions have been rewritten specifically for
+ * APR, so the APR_HAS_LDAP_URL_PARSE macro is forced to zero.
+ */
+#if APR_HAS_TIVOLI_LDAPSDK
+#define APR_HAS_LDAP_SSL 0
+#else
+#define APR_HAS_LDAP_SSL 1
+#endif
+#define APR_HAS_LDAP_URL_PARSE      0
+
+#if APR_HAS_OPENLDAP_LDAPSDK && !defined(LDAP_DEPRECATED) 
+/* Ensure that the "deprecated" interfaces are still exposed
+ * with OpenLDAP >= 2.3; these were exposed by default in earlier
+ * releases. */
+#define LDAP_DEPRECATED 1
+#endif
+
+/*
+ * Include the standard LDAP header files.
+ */
+
+
+
+
+
+
+/*
+ * Detected standard functions
+ */
+#define APR_HAS_LDAPSSL_CLIENT_INIT 0
+#define APR_HAS_LDAPSSL_CLIENT_DEINIT 0
+#define APR_HAS_LDAPSSL_ADD_TRUSTED_CERT 0
+#define APR_HAS_LDAP_START_TLS_S 0
+#define APR_HAS_LDAP_SSLINIT 0
+#define APR_HAS_LDAPSSL_INIT 0
+#define APR_HAS_LDAPSSL_INSTALL_ROUTINES 0
+
+/*
+ * Make sure the secure LDAP port is defined
+ */
+#ifndef LDAPS_PORT
+#define LDAPS_PORT 636  /* ldaps:/// default LDAP over TLS port */
+#endif
+
+/*
+ * For ldap function calls that input a size limit on the number of returned elements
+ * Some SDKs do not have the define for LDAP_DEFAULT_LIMIT (-1) or LDAP_NO_LIMIT (0)
+ * LDAP_DEFAULT_LIMIT is preferred as it allows inheritance from whatever the SDK
+ * or process is configured for.
+ */
+#ifdef LDAP_DEFAULT_LIMIT
+#define APR_LDAP_SIZELIMIT LDAP_DEFAULT_LIMIT
+#else
+#ifdef LDAP_NO_LIMIT
+#define APR_LDAP_SIZELIMIT LDAP_NO_LIMIT
+#endif
+#endif
+
+#ifndef APR_LDAP_SIZELIMIT
+#define APR_LDAP_SIZELIMIT 0 /* equivalent to LDAP_NO_LIMIT, and what goes on the wire */
+#endif
+
+/*
+ * z/OS is missing some defines
+ */
+#ifndef LDAP_VERSION_MAX
+#define LDAP_VERSION_MAX  LDAP_VERSION
+#endif
+#if APR_HAS_ZOS_LDAPSDK
+#define LDAP_VENDOR_NAME "IBM z/OS"
+#endif
+
+/* Note: Macros defining const casting has been removed in APR v1.0,
+ * pending real support for LDAP v2.0 toolkits.
+ *
+ * In the mean time, please use an LDAP v3.0 toolkit.
+ */
+#if LDAP_VERSION_MAX <= 2
+#error Support for LDAP v2.0 toolkits has been removed from apr-util. Please use an LDAP v3.0 toolkit.
+#endif 
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * This structure allows the C LDAP API error codes to be returned
+ * along with plain text error messages that explain to us mere mortals
+ * what really happened.
+ */
+typedef struct apr_ldap_err_t {
+    const char *reason;
+    const char *msg;
+    int rc;
+} apr_ldap_err_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* The MS SDK returns LDAP_UNAVAILABLE when the backend has closed the connection
+ * between LDAP calls. Protect with APR_HAS_MICROSOFT_LDAPSDK in case someone 
+ * manually chooses another SDK on Windows 
+ */
+#if APR_HAS_MICROSOFT_LDAPSDK
+#define APR_LDAP_IS_SERVER_DOWN(s)    ((s) == LDAP_SERVER_DOWN \
+                                    || (s) == LDAP_UNAVAILABLE)
+#else
+#define APR_LDAP_IS_SERVER_DOWN(s)    ((s) == LDAP_SERVER_DOWN)
+#endif
+
+/* These symbols are not actually exported in a DSO build, but mapped into
+ * a private exported function array for apr_ldap_stub to bind dynamically.
+ * Rename them appropriately to protect the global namespace.
+ */
+#ifdef APU_DSO_LDAP_BUILD
+
+#define apr_ldap_info apr__ldap_info
+#define apr_ldap_init apr__ldap_init
+#define apr_ldap_ssl_init apr__ldap_ssl_init
+#define apr_ldap_ssl_deinit apr__ldap_ssl_deinit
+#define apr_ldap_get_option apr__ldap_get_option
+#define apr_ldap_set_option apr__ldap_set_option
+#define apr_ldap_rebind_init apr__ldap_rebind_init
+#define apr_ldap_rebind_add apr__ldap_rebind_add
+#define apr_ldap_rebind_remove apr__ldap_rebind_remove
+
+#define APU_DECLARE_LDAP(type) type
+#else
+#define APU_DECLARE_LDAP(type) APU_DECLARE(type)
+#endif
+
+#include "apr_ldap_url.h"
+#include "apr_ldap_init.h"
+#include "apr_ldap_option.h"
+#include "apr_ldap_rebind.h"
+
+#endif /* APR_HAS_LDAP */
+/** @} */
+#endif /* APU_LDAP_H */
diff --git a/usr.bin/svn/lib/libapr_util/apu.h b/usr.bin/svn/lib/libapr_util/apu.h
new file mode 100644
index 0000000..639cec4
--- /dev/null
+++ b/usr.bin/svn/lib/libapr_util/apu.h
@@ -0,0 +1,133 @@
+/* $FreeBSD$ */
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * apu.h is generated from apu.h.in by configure -- do not edit apu.h
+ */
+/* @file apu.h
+ * @brief APR-Utility main file
+ */
+/**
+ * @defgroup APR_Util APR Utility Functions
+ * @{
+ */
+
+
+#ifndef APU_H
+#define APU_H
+
+/**
+ * APU_DECLARE_EXPORT is defined when building the APR-UTIL dynamic library,
+ * so that all public symbols are exported.
+ *
+ * APU_DECLARE_STATIC is defined when including the APR-UTIL public headers,
+ * to provide static linkage when the dynamic library may be unavailable.
+ *
+ * APU_DECLARE_STATIC and APU_DECLARE_EXPORT are left undefined when
+ * including the APR-UTIL public headers, to import and link the symbols from 
+ * the dynamic APR-UTIL library and assure appropriate indirection and calling
+ * conventions at compile time.
+ */
+
+#if defined(DOXYGEN) || !defined(WIN32)
+/**
+ * The public APR-UTIL functions are declared with APU_DECLARE(), so they may
+ * use the most appropriate calling convention.  Public APR functions with 
+ * variable arguments must use APU_DECLARE_NONSTD().
+ *
+ * @fn APU_DECLARE(rettype) apr_func(args);
+ */
+#define APU_DECLARE(type)            type
+/**
+ * The public APR-UTIL functions using variable arguments are declared with 
+ * APU_DECLARE_NONSTD(), as they must use the C language calling convention.
+ *
+ * @fn APU_DECLARE_NONSTD(rettype) apr_func(args, ...);
+ */
+#define APU_DECLARE_NONSTD(type)     type
+/**
+ * The public APR-UTIL variables are declared with APU_DECLARE_DATA.
+ * This assures the appropriate indirection is invoked at compile time.
+ *
+ * @fn APU_DECLARE_DATA type apr_variable;
+ * @note APU_DECLARE_DATA extern type apr_variable; syntax is required for
+ * declarations within headers to properly import the variable.
+ */
+#define APU_DECLARE_DATA
+#elif defined(APU_DECLARE_STATIC)
+#define APU_DECLARE(type)            type __stdcall
+#define APU_DECLARE_NONSTD(type)     type __cdecl
+#define APU_DECLARE_DATA
+#elif defined(APU_DECLARE_EXPORT)
+#define APU_DECLARE(type)            __declspec(dllexport) type __stdcall
+#define APU_DECLARE_NONSTD(type)     __declspec(dllexport) type __cdecl
+#define APU_DECLARE_DATA             __declspec(dllexport)
+#else
+#define APU_DECLARE(type)            __declspec(dllimport) type __stdcall
+#define APU_DECLARE_NONSTD(type)     __declspec(dllimport) type __cdecl
+#define APU_DECLARE_DATA             __declspec(dllimport)
+#endif
+
+#if !defined(WIN32) || defined(APU_MODULE_DECLARE_STATIC)
+/**
+ * Declare a dso module's exported module structure as APU_MODULE_DECLARE_DATA.
+ *
+ * Unless APU_MODULE_DECLARE_STATIC is defined at compile time, symbols 
+ * declared with APU_MODULE_DECLARE_DATA are always exported.
+ * @code
+ * module APU_MODULE_DECLARE_DATA mod_tag
+ * @endcode
+ */
+#define APU_MODULE_DECLARE_DATA
+#else
+#define APU_MODULE_DECLARE_DATA           __declspec(dllexport)
+#endif
+
+/*
+ * we always have SDBM (it's in our codebase)
+ */
+#define APU_HAVE_SDBM   1
+#define APU_HAVE_GDBM   0
+#define APU_HAVE_NDBM   0
+#define APU_HAVE_DB     0
+
+#if APU_HAVE_DB
+#define APU_HAVE_DB_VERSION    0
+#endif
+
+#define APU_HAVE_PGSQL         0
+#define APU_HAVE_MYSQL         0
+#define APU_HAVE_SQLITE3       0
+#define APU_HAVE_SQLITE2       0
+#define APU_HAVE_ORACLE        0
+#define APU_HAVE_FREETDS       0
+#define APU_HAVE_ODBC          0
+
+#define APU_HAVE_CRYPTO        0
+#define APU_HAVE_OPENSSL       0
+#define APU_HAVE_NSS           0
+
+#ifndef APU_HAVE_APR_ICONV
+#define APU_HAVE_APR_ICONV     0
+#endif
+#ifndef APU_HAVE_ICONV
+#define APU_HAVE_ICONV         0
+#endif
+#define APR_HAS_XLATE          (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
+
+#endif /* APU_H */
+/** @} */
diff --git a/usr.bin/svn/lib/libapr_util/apu_config.h b/usr.bin/svn/lib/libapr_util/apu_config.h
new file mode 100644
index 0000000..ac247d0
--- /dev/null
+++ b/usr.bin/svn/lib/libapr_util/apu_config.h
@@ -0,0 +1,179 @@
+/* $FreeBSD$ */
+
+/* include/private/apu_config.h.  Generated from apu_config.h.in by configure.  */
+/* include/private/apu_config.h.in.  Generated from configure.in by autoheader.  */
+
+/* Define if the system crypt() function is threadsafe */
+/* #undef APU_CRYPT_THREADSAFE */
+
+/* Define to 1 if modular components are built as DSOs */
+/* #undef APU_DSO_BUILD */
+
+/* Define to be absolute path to DSO directory */
+/* #undef APU_DSO_LIBDIR */
+
+/* Define if the inbuf parm to iconv() is const char ** */
+/* #undef APU_ICONV_INBUF_CONST */
+
+/* Define that OpenSSL uses const buffers */
+#define CRYPTO_OPENSSL_CONST_BUFFERS 1
+
+/* Define if crypt_r has uses CRYPTD */
+/* #undef CRYPT_R_CRYPTD */
+
+/* Define if crypt_r uses struct crypt_data */
+/* #undef CRYPT_R_STRUCT_CRYPT_DATA */
+
+/* Define if CODESET is defined in langinfo.h */
+#define HAVE_CODESET 1
+
+/* Define to 1 if you have the `crypt_r' function. */
+/* #undef HAVE_CRYPT_R */
+
+/* Define to 1 if you have the declaration of `EVP_PKEY_CTX_new', and to 0 if
+   you don't. */
+#define HAVE_DECL_EVP_PKEY_CTX_NEW 1
+
+/* Define if expat.h is available */
+#define HAVE_EXPAT_H 1
+
+/* Define to 1 if you have the <freetds/sybdb.h> header file. */
+/* #undef HAVE_FREETDS_SYBDB_H */
+
+/* Define to 1 if you have the <iconv.h> header file. */
+/* #undef HAVE_ICONV_H */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <langinfo.h> header file. */
+#define HAVE_LANGINFO_H 1
+
+/* Define to 1 if you have the <lber.h> header file. */
+/* #undef HAVE_LBER_H */
+
+/* Defined if ldap.h is present */
+/* #undef HAVE_LDAP_H */
+
+/* Define to 1 if you have the <ldap_ssl.h> header file. */
+/* #undef HAVE_LDAP_SSL_H */
+
+/* Define to 1 if you have the <libpq-fe.h> header file. */
+/* #undef HAVE_LIBPQ_FE_H */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <mysql.h> header file. */
+/* #undef HAVE_MYSQL_H */
+
+/* Define to 1 if you have the <mysql/mysql.h> header file. */
+/* #undef HAVE_MYSQL_MYSQL_H */
+
+/* Define to 1 if you have the <mysql/my_global.h> header file. */
+/* #undef HAVE_MYSQL_MY_GLOBAL_H */
+
+/* Define to 1 if you have the <mysql/my_sys.h> header file. */
+/* #undef HAVE_MYSQL_MY_SYS_H */
+
+/* Define to 1 if you have the <my_global.h> header file. */
+/* #undef HAVE_MY_GLOBAL_H */
+
+/* Define to 1 if you have the <my_sys.h> header file. */
+/* #undef HAVE_MY_SYS_H */
+
+/* Define to 1 if you have the `nl_langinfo' function. */
+#define HAVE_NL_LANGINFO 1
+
+/* Define to 1 if you have the <nss.h> header file. */
+/* #undef HAVE_NSS_H */
+
+/* Define to 1 if you have the <nss/nss.h> header file. */
+/* #undef HAVE_NSS_NSS_H */
+
+/* Define to 1 if you have the <nss/pk11pub.h> header file. */
+/* #undef HAVE_NSS_PK11PUB_H */
+
+/* Define to 1 if you have the <oci.h> header file. */
+/* #undef HAVE_OCI_H */
+
+/* Define to 1 if you have the <odbc/sql.h> header file. */
+/* #undef HAVE_ODBC_SQL_H */
+
+/* Define to 1 if you have the <openssl/x509.h> header file. */
+#define HAVE_OPENSSL_X509_H 1
+
+/* Define to 1 if you have the <pk11pub.h> header file. */
+/* #undef HAVE_PK11PUB_H */
+
+/* Define to 1 if you have the <postgresql/libpq-fe.h> header file. */
+/* #undef HAVE_POSTGRESQL_LIBPQ_FE_H */
+
+/* Define to 1 if you have the <prerror.h> header file. */
+/* #undef HAVE_PRERROR_H */
+
+/* Define to 1 if you have the <sqlite3.h> header file. */
+/* #undef HAVE_SQLITE3_H */
+
+/* Define to 1 if you have the <sqlite.h> header file. */
+/* #undef HAVE_SQLITE_H */
+
+/* Define to 1 if you have the <sql.h> header file. */
+/* #undef HAVE_SQL_H */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sybdb.h> header file. */
+/* #undef HAVE_SYBDB_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define if xmlparse/xmlparse.h is available */
+/* #undef HAVE_XMLPARSE_XMLPARSE_H */
+
+/* Define if xmltok/xmlparse.h is available */
+/* #undef HAVE_XMLTOK_XMLPARSE_H */
+
+/* Define if xml/xmlparse.h is available */
+/* #undef HAVE_XML_XMLPARSE_H */
+
+/* Define if ldap_set_rebind_proc takes three arguments */
+/* #undef LDAP_SET_REBIND_PROC_THREE */
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
diff --git a/usr.bin/svn/lib/libapr_util/apu_select_dbm.h b/usr.bin/svn/lib/libapr_util/apu_select_dbm.h
new file mode 100644
index 0000000..cf756e9
--- /dev/null
+++ b/usr.bin/svn/lib/libapr_util/apu_select_dbm.h
@@ -0,0 +1,30 @@
+/* $FreeBSD$ */
+
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef APU_SELECT_DBM_H
+#define APU_SELECT_DBM_H
+
+/*
+** The following macros control what features APRUTIL will use
+*/
+#define APU_USE_SDBM    1
+#define APU_USE_NDBM    0
+#define APU_USE_GDBM    0
+#define APU_USE_DB      0
+
+#endif	/* !APU_SELECT_DBM_H */
diff --git a/usr.bin/svn/lib/libapr_util/apu_want.h b/usr.bin/svn/lib/libapr_util/apu_want.h
new file mode 100644
index 0000000..7d6316c
--- /dev/null
+++ b/usr.bin/svn/lib/libapr_util/apu_want.h
@@ -0,0 +1,53 @@
+/* $FreeBSD$ */
+
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apu.h"        /* configuration data */
+
+/**
+ * @file apu_want.h
+ * @brief APR Standard Headers Support
+ *
+ * <PRE>
+ * Features:
+ *
+ *   APU_WANT_DB:       <db.h>
+ *
+ * Typical usage:
+ *
+ *   #define APU_WANT_DB
+ *   #include "apu_want.h"
+ *
+ * The appropriate headers will be included.
+ *
+ * Note: it is safe to use this in a header (it won't interfere with other
+ *       headers' or source files' use of apu_want.h)
+ * </PRE>
+ */
+
+/* --------------------------------------------------------------------- */
+
+#ifdef APU_WANT_DB
+
+#if APU_HAVE_DB
+#include <db.h>
+#endif
+
+#undef APU_WANT_DB
+#endif
+
+/* --------------------------------------------------------------------- */
diff --git a/usr.bin/svn/lib/libapr_util/expat.h b/usr.bin/svn/lib/libapr_util/expat.h
new file mode 100644
index 0000000..6ab04ef
--- /dev/null
+++ b/usr.bin/svn/lib/libapr_util/expat.h
@@ -0,0 +1,3 @@
+/* $FreeBSD$ */
+/* Hack to avoid changing vendor code */
+#include <bsdxml.h>
diff --git a/usr.bin/svn/lib/libserf/Makefile b/usr.bin/svn/lib/libserf/Makefile
new file mode 100644
index 0000000..fa79cf3
--- /dev/null
+++ b/usr.bin/svn/lib/libserf/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+INTERNALLIB=	yes
+LIB=		serf
+
+SRCS=		aggregate_buckets.c allocator.c auth.c auth_basic.c \
+		auth_digest.c auth_spnego.c auth_spnego_gss.c barrier_buckets.c \
+		buckets.c bwtp_buckets.c chunk_buckets.c context.c \
+		dechunk_buckets.c deflate_buckets.c file_buckets.c \
+		headers_buckets.c incoming.c iovec_buckets.c limit_buckets.c \
+		mmap_buckets.c outgoing.c request_buckets.c \
+		response_body_buckets.c response_buckets.c simple_buckets.c \
+		socket_buckets.c ssl_buckets.c ssltunnel.c
+
+NOMAN=		internalonly
+
+.PATH:		${SERF}/buckets ${SERF}/auth ${SERF}
+
+CFLAGS+= 	-I${.CURDIR} -I${SERF} \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix -I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libsqlite3/Makefile b/usr.bin/svn/lib/libsqlite3/Makefile
new file mode 100644
index 0000000..49b6d1d
--- /dev/null
+++ b/usr.bin/svn/lib/libsqlite3/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+INTERNALLIB=	yes
+LIB=		sqlite3
+
+SRCS=		sqlite3.c
+
+NOMAN=		internalonly
+
+.PATH:		${SQLITE}
+
+CFLAGS+= 	-DHAVE_CONFIG_H -I${.CURDIR} \
+		-I${APR}/include/arch/unix -I${APR}/include
+
+CFLAGS+=	-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
+		-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 \
+		-DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 \
+		-DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DHAVE_USLEEP=1 \
+		-DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 \
+		-DHAVE_DECL_STRERROR_R=1 -DHAVE_STRERROR_R=1 \
+		-DHAVE_READLINE=1 -DHAVE_POSIX_FALLOCATE=1 \
+		-I${SQLITE} -D_REENTRANT=1 -DSQLITE_THREADSAFE=1 \
+		-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libsvn_client/Makefile b/usr.bin/svn/lib/libsvn_client/Makefile
new file mode 100644
index 0000000..2e1949c
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_client/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/libsvn_client
+
+INTERNALLIB=	yes
+LIB=		svn_client
+
+SRCS=		add.c blame.c cat.c changelist.c checkout.c cleanup.c \
+		cmdline.c commit.c commit_util.c compat_providers.c copy.c \
+		copy_foreign.c ctx.c delete.c deprecated.c diff.c \
+		diff_local.c diff_summarize.c export.c externals.c import.c \
+		info.c iprops.c list.c locking_commands.c log.c merge.c \
+		mergeinfo.c patch.c log.c prop_commands.c \
+		ra.c relocate.c repos_diff.c resolved.c revert.c revisions.c \
+		status.c switch.c update.c upgrade.c url.c util.c version.c
+
+CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include/private \
+		-I${APRU}/include
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libsvn_delta/Makefile b/usr.bin/svn/lib/libsvn_delta/Makefile
new file mode 100644
index 0000000..5be1644
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_delta/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/libsvn_delta
+
+INTERNALLIB=	yes
+LIB=		svn_delta
+
+SRCS=		cancel.c compat.c compose_delta.c debug_editor.c \
+		default_editor.c deprecated.c depth_filter_editor.c editor.c \
+		path_driver.c svndiff.c text_delta.c version.c xdelta.c
+
+CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include/private \
+		-I${APRU}/include
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libsvn_diff/Makefile b/usr.bin/svn/lib/libsvn_diff/Makefile
new file mode 100644
index 0000000..54ff3f2
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_diff/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/libsvn_diff
+
+INTERNALLIB=	yes
+LIB=		svn_diff
+
+SRCS=		deprecated.c diff.c diff3.c diff4.c diff_file.c diff_memory.c \
+		diff_tree.c lcs.c parse-diff.c token.c util.c
+
+CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include/private \
+		-I${APRU}/include
+
+.include <bsd.lib.mk>
+
diff --git a/usr.bin/svn/lib/libsvn_fs/Makefile b/usr.bin/svn/lib/libsvn_fs/Makefile
new file mode 100644
index 0000000..c6c5020
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_fs/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/libsvn_fs
+
+INTERNALLIB=	yes
+LIB=		svn_fs
+
+SRCS=		access.c editor.c fs-loader.c
+
+CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include/private \
+		-I${APRU}/include
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libsvn_fs_fs/Makefile b/usr.bin/svn/lib/libsvn_fs_fs/Makefile
new file mode 100644
index 0000000..b747877
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_fs_fs/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/libsvn_fs_fs
+
+INTERNALLIB=	yes
+LIB=		svn_fs_fs
+
+SRCS=		caching.c dag.c fs.c fs_fs.c id.c key-gen.c lock.c \
+		rep-cache.c temp_serializer.c tree.c
+
+CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include/private \
+		-I${APRU}/include
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libsvn_fs_util/Makefile b/usr.bin/svn/lib/libsvn_fs_util/Makefile
new file mode 100644
index 0000000..6652931
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_fs_util/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/libsvn_fs_util
+
+INTERNALLIB=	yes
+LIB=		svn_fs_util
+
+SRCS=		fs-util.c
+
+CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include/private \
+		-I${APRU}/include
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libsvn_ra/Makefile b/usr.bin/svn/lib/libsvn_ra/Makefile
new file mode 100644
index 0000000..1e7a22c
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_ra/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/libsvn_ra
+
+INTERNALLIB=	yes
+LIB=		svn_ra
+
+SRCS=		compat.c debug_reporter.c deprecated.c editor.c \
+		ra_loader.c util.c
+
+CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include/private \
+		-I${APRU}/include
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libsvn_ra_local/Makefile b/usr.bin/svn/lib/libsvn_ra_local/Makefile
new file mode 100644
index 0000000..45318f1
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_ra_local/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/libsvn_ra_local
+
+INTERNALLIB=	yes
+LIB=		svn_ra_local
+
+SRCS=		ra_plugin.c split_url.c
+
+CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include/private \
+		-I${APRU}/include
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libsvn_ra_serf/Makefile b/usr.bin/svn/lib/libsvn_ra_serf/Makefile
new file mode 100644
index 0000000..f9ff6ff
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_ra_serf/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/libsvn_ra_serf
+
+INTERNALLIB=	yes
+LIB=		svn_ra_serf
+
+SRCS=		blame.c blncache.c commit.c get_deleted_rev.c getdate.c \
+		getlocations.c getlocationsegments.c getlocks.c \
+		inherited_props.c locks.c log.c merge.c mergeinfo.c options.c \
+		property.c replay.c sb_bucket.c serf.c update.c util.c \
+		util_error.c xml.c
+
+CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include/private \
+		-I${APRU}/include \
+		-I${SERF}
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libsvn_ra_svn/Makefile b/usr.bin/svn/lib/libsvn_ra_svn/Makefile
new file mode 100644
index 0000000..a3c9dbe
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_ra_svn/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/libsvn_ra_svn
+
+INTERNALLIB=	yes
+LIB=		svn_ra_svn
+
+SRCS=		client.c cram.c cyrus_auth.c deprecated.c editorp.c \
+		internal_auth.c marshal.c streams.c version.c
+
+CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include/private \
+		-I${APRU}/include
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libsvn_repos/Makefile b/usr.bin/svn/lib/libsvn_repos/Makefile
new file mode 100644
index 0000000..92c2b86
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_repos/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/libsvn_repos
+
+INTERNALLIB=	yes
+LIB=		svn_repos
+
+SRCS=		authz.c commit.c delta.c deprecated.c dump.c fs-wrap.c \
+		hooks.c load-fs-vtable.c load.c log.c node_tree.c notify.c \
+		replay.c reporter.c repos.c rev_hunt.c \
+
+CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include/private \
+		-I${APRU}/include
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libsvn_subr/Makefile b/usr.bin/svn/lib/libsvn_subr/Makefile
new file mode 100644
index 0000000..4523197
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_subr/Makefile
@@ -0,0 +1,36 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/libsvn_subr
+
+INTERNALLIB=	yes
+LIB=		svn_subr
+
+SRCS=		adler32.c atomic.c auth.c base64.c cache-inprocess.c \
+		cache-membuffer.c cache-memcache.c cache.c cache_config.c \
+		checksum.c cmdline.c compat.c config.c config_auth.c \
+		config_file.c config_win.c crypto.c ctype.c date.c debug.c \
+		deprecated.c dirent_uri.c dso.c eol.c error.c gpg_agent.c \
+		hash.c io.c iter.c lock.c log.c macos_keychain.c magic.c \
+		md5.c mergeinfo.c mutex.c named_atomic.c nls.c opt.c path.c \
+		pool.c prompt.c properties.c pseudo_md5.c quoprint.c sha1.c \
+		simple_providers.c skel.c sorts.c spillbuf.c sqlite.c \
+		sqlite3wrapper.c ssl_client_cert_providers.c \
+		ssl_client_cert_pw_providers.c ssl_server_trust_providers.c \
+		stream.c string.c subst.c sysinfo.c target.c temp_serializer.c \
+		time.c token.c types.c user.c username_providers.c utf.c \
+		utf_validate.c utf_width.c validate.c version.c \
+		win32_crashrpt.c win32_crypto.c win32_xlate.c xml.c \
+
+CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include/private \
+		-I${APRU}/include \
+		-I${SQLITE}
+
+.include <bsd.lib.mk>
+
diff --git a/usr.bin/svn/lib/libsvn_wc/Makefile b/usr.bin/svn/lib/libsvn_wc/Makefile
new file mode 100644
index 0000000..ce3905a
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_wc/Makefile
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/libsvn_wc
+
+INTERNALLIB=	yes
+LIB=		svn_wc
+
+SRCS=		adm_crawler.c adm_files.c adm_ops.c \
+		ambient_depth_filter_editor.c cleanup.c conflicts.c \
+		context.c copy.c crop.c delete.c deprecated.c diff_editor.c \
+		diff_local.c entries.c externals.c info.c lock.c merge.c \
+		node.c old-and-busted.c props.c questions.c relocate.c \
+		revert.c revision_status.c status.c translate.c \
+		tree_conflicts.c update_editor.c upgrade.c util.c \
+		wc_db.c wc_db_pristine.c wc_db_update_move.c wc_db_util.c \
+		wc_db_wcroot.c wcroot_anchor.c workqueue.c
+
+CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include/private \
+		-I${APRU}/include
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile
new file mode 100644
index 0000000..4638c17
--- /dev/null
+++ b/usr.bin/svn/svn/Makefile
@@ -0,0 +1,56 @@
+# $FreeBSD$
+
+NO_MAN=	svn.1
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/svn
+
+PROG=	svn${SVNLITE}
+
+SRCS=	add-cmd.c blame-cmd.c cat-cmd.c changelist-cmd.c checkout-cmd.c \
+	cl-conflicts.c cleanup-cmd.c commit-cmd.c conflict-callbacks.c \
+	copy-cmd.c delete-cmd.c deprecated.c diff-cmd.c export-cmd.c \
+	file-merge.c help-cmd.c import-cmd.c info-cmd.c list-cmd.c \
+	lock-cmd.c log-cmd.c merge-cmd.c mergeinfo-cmd.c mkdir-cmd.c \
+	move-cmd.c notify.c patch-cmd.c propdel-cmd.c propedit-cmd.c \
+	propget-cmd.c proplist-cmd.c props.c propset-cmd.c relocate-cmd.c \
+	resolve-cmd.c resolved-cmd.c revert-cmd.c status-cmd.c status.c \
+	svn.c switch-cmd.c unlock-cmd.c update-cmd.c upgrade-cmd.c util.c 
+
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
+	-I${.CURDIR}/../lib/libapr \
+	-I${APR}/include/arch/unix \
+	-I${APR}/include \
+	-I${.CURDIR}/../lib/libapr_util \
+	-I${APRU}/include/private \
+	-I${APRU}/include
+
+LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
+	-L${LIBSVN_WCDIR} -lsvn_wc \
+	-L${LIBSVN_RADIR} -lsvn_ra \
+	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
+	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
+	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
+	-L${LIBSVN_REPOSDIR} -lsvn_repos \
+	-L${LIBSVN_FSDIR} -lsvn_fs \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
+	-L${LIBSVN_DELTADIR} -lsvn_delta \
+	-L${LIBSVN_DIFFDIR} -lsvn_diff \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr \
+	-L${LIBSERFDIR} -lserf \
+	-L${LIBAPR_UTILDIR} -lapr-util \
+	-lbsdxml \
+	-L${LIBAPRDIR} -lapr \
+	-L${LIBSQLITEDIR} -lsqlite3 \
+	-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
+
+DPADD=	${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
+	${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \
+	${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \
+	${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
+	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
+	${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/svn/svn_private_config.h b/usr.bin/svn/svn_private_config.h
new file mode 100644
index 0000000..00eb0fc
--- /dev/null
+++ b/usr.bin/svn/svn_private_config.h
@@ -0,0 +1,260 @@
+/* $FreeBSD$ */
+
+/* subversion/svn_private_config.h.tmp.  Generated from svn_private_config.h.in by configure.  */
+/* subversion/svn_private_config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* The fs type to use by default */
+#define DEFAULT_FS_TYPE "fsfs"
+
+/* The http library to use by default */
+#define DEFAULT_HTTP_LIBRARY "serf"
+
+/* Define to 1 if Ev2 implementations should be used. */
+/* #undef ENABLE_EV2_IMPL */
+
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+/* #undef ENABLE_NLS */
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+/* #undef HAVE_DOPRNT */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `iconv' library (-liconv). */
+/* #undef HAVE_LIBICONV */
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+/* #undef HAVE_LIBSOCKET */
+
+/* Define to 1 if you have the <magic.h> header file. */
+/* #undef HAVE_MAGIC_H */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `rb_errinfo' function. */
+/* #undef HAVE_RB_ERRINFO */
+
+/* Define to 1 if you have the `readlink' function. */
+#define HAVE_READLINK 1
+
+/* Define to 1 if you have the <serf.h> header file. */
+#define HAVE_SERF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `symlink' function. */
+#define HAVE_SYMLINK 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/utsname.h> header file. */
+#define HAVE_SYS_UTSNAME_H 1
+
+/* Define to 1 if you have the `tcgetattr' function. */
+#define HAVE_TCGETATTR 1
+
+/* Define to 1 if you have the `tcsetattr' function. */
+#define HAVE_TCSETATTR 1
+
+/* Defined if we have a usable termios library. */
+#define HAVE_TERMIOS_H 1
+
+/* Define to 1 if you have the `uname' function. */
+#define HAVE_UNAME 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
+
+/* Define to 1 if you have the <zlib.h> header file. */
+/* #undef HAVE_ZLIB_H */
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "http://subversion.apache.org/"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "subversion"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "subversion 1.8.1"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "subversion"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.8.1"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to the Python/C API format character suitable for apr_int64_t */
+#define SVN_APR_INT64_T_PYCFMT "l"
+
+/* Define if circular linkage is not possible on this platform. */
+/* #undef SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK */
+
+/* Defined to be the path to the installed binaries */
+#define SVN_BINDIR "/usr/bin"
+
+/* Defined to the config.guess name of the build system */
+#define SVN_BUILD_HOST "bikeshed-green-indigo-orange-freebsd"
+
+/* Defined to the config.guess name of the build target */
+#define SVN_BUILD_TARGET "bikeshed-green-indigo-orange-freebsd"
+
+/* The path of a default editor for the client. */
+/* #undef SVN_CLIENT_EDITOR */
+
+/* Defined if the full version matching rules are disabled */
+/* #undef SVN_DISABLE_FULL_VERSION_MATCH */
+
+/* Defined if plaintext password/passphrase storage is disabled */
+/* #undef SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE */
+
+/* The desired major version for the Berkeley DB */
+#define SVN_FS_WANT_DB_MAJOR 4
+
+/* The desired minor version for the Berkeley DB */
+#define SVN_FS_WANT_DB_MINOR 0
+
+/* The desired patch version for the Berkeley DB */
+#define SVN_FS_WANT_DB_PATCH 14
+
+/* Define if compiler provides atomic builtins */
+#define SVN_HAS_ATOMIC_BUILTINS 1
+
+/* Is GNOME Keyring support enabled? */
+/* #undef SVN_HAVE_GNOME_KEYRING */
+
+/* Is GPG Agent support enabled? */
+#define SVN_HAVE_GPG_AGENT 1
+
+/* Is Mac OS KeyChain support enabled? */
+/* #undef SVN_HAVE_KEYCHAIN_SERVICES */
+
+/* Defined if KWallet support is enabled */
+/* #undef SVN_HAVE_KWALLET */
+
+/* Defined if libmagic support is enabled */
+#define SVN_HAVE_LIBMAGIC 1
+
+/* Is Mach-O low-level _dyld API available? */
+/* #undef SVN_HAVE_MACHO_ITERATE */
+
+/* Is Mac OS property list API available? */
+/* #undef SVN_HAVE_MACOS_PLIST */
+
+/* Defined if apr_memcache (standalone or in apr-util) is present */
+#define SVN_HAVE_MEMCACHE 1
+
+/* Defined if Expat 1.0 or 1.1 was found */
+/* #undef SVN_HAVE_OLD_EXPAT */
+
+/* Defined if Cyrus SASL v2 is present on the system */
+/* #undef SVN_HAVE_SASL */
+
+/* Defined if support for Serf is enabled */
+#define SVN_HAVE_SERF 1
+
+/* Defined if libsvn_client should link against libsvn_ra_local */
+#define SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL 1
+
+/* Defined if libsvn_client should link against libsvn_ra_serf */
+#define SVN_LIBSVN_CLIENT_LINKS_RA_SERF 1
+
+/* Defined if libsvn_client should link against libsvn_ra_svn */
+#define SVN_LIBSVN_CLIENT_LINKS_RA_SVN 1
+
+/* Defined if libsvn_fs should link against libsvn_fs_base */
+/* #undef SVN_LIBSVN_FS_LINKS_FS_BASE */
+
+/* Defined if libsvn_fs should link against libsvn_fs_fs */
+#define SVN_LIBSVN_FS_LINKS_FS_FS 1
+
+/* Defined to be the path to the installed locale dirs */
+#define SVN_LOCALE_DIR "NONE/share/locale"
+
+/* Defined to be the null device for the system */
+#define SVN_NULL_DEVICE_NAME "/dev/null"
+
+/* Defined to be the path separator used on your local filesystem */
+#define SVN_PATH_LOCAL_SEPARATOR '/'
+
+/* Subversion library major verson */
+#define SVN_SOVERSION 0
+
+/* Defined if svn should use the amalgamated version of sqlite */
+/* #undef SVN_SQLITE_INLINE */
+
+/* Defined if svn should try to load DSOs */
+/* #undef SVN_USE_DSO */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+#ifdef SVN_WANT_BDB
+#define APU_WANT_DB
+
+#endif
+
+
+
+/* Indicate to translators that string X should be translated.  Do not look
+   up the translation at run time; just expand to X.  This macro is suitable
+   for use where a constant string is required at compile time. */
+#define N_(x) x
+/* Indicate to translators that we have decided the string X should not be
+   translated.  Expand to X. */
+#define U_(x) x
+#ifdef ENABLE_NLS
+#include <locale.h>
+#include <libintl.h>
+/* Indicate to translators that string X should be translated.  At run time,
+   look up and return the translation of X. */
+#define _(x) dgettext(PACKAGE_NAME, x)
+/* Indicate to translators that strings X1 and X2 are singular and plural
+   forms of the same message, and should be translated.  At run time, return
+   an appropriate translation depending on the number N. */
+#define Q_(x1, x2, n) dngettext(PACKAGE_NAME, x1, x2, n)
+#else
+#define _(x) (x)
+#define Q_(x1, x2, n) (((n) == 1) ? x1 : x2)
+#define gettext(x) (x)
+#define dgettext(domain, x) (x)
+#endif
+
diff --git a/usr.bin/svn/svnadmin/Makefile b/usr.bin/svn/svnadmin/Makefile
new file mode 100644
index 0000000..2a07947
--- /dev/null
+++ b/usr.bin/svn/svnadmin/Makefile
@@ -0,0 +1,37 @@
+# $FreeBSD$
+
+NO_MAN=	svnadmin.1
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/svnadmin
+
+PROG=	svn${SVNLITE}admin
+
+SRCS=	svnadmin.c
+
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
+	-I${.CURDIR}/../lib/libapr \
+	-I${APR}/include/arch/unix \
+	-I${APR}/include \
+	-I${.CURDIR}/../lib/libapr_util \
+	-I${APRU}/include/private \
+	-I${APRU}/include
+
+LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos \
+	-L${LIBSVN_FSDIR} -lsvn_fs \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
+	-L${LIBSVN_DELTADIR} -lsvn_delta \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr \
+	-L${LIBAPR_UTILDIR} -lapr-util \
+	-lbsdxml \
+	-L${LIBAPRDIR} -lapr \
+	-L${LIBSQLITEDIR} -lsqlite3 \
+	-lz -lcrypt
+
+DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
+	${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
+	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/svn/svndumpfilter/Makefile b/usr.bin/svn/svndumpfilter/Makefile
new file mode 100644
index 0000000..5554dff
--- /dev/null
+++ b/usr.bin/svn/svndumpfilter/Makefile
@@ -0,0 +1,37 @@
+# $FreeBSD$
+
+NO_MAN=	svndumpfilter.1
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/svndumpfilter
+
+PROG=	svn${SVNLITE}dumpfilter
+
+SRCS=	svndumpfilter.c
+
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
+	-I${.CURDIR}/../lib/libapr \
+	-I${APR}/include/arch/unix \
+	-I${APR}/include \
+	-I${.CURDIR}/../lib/libapr_util \
+	-I${APRU}/include/private \
+	-I${APRU}/include
+
+LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos \
+	-L${LIBSVN_FSDIR} -lsvn_fs \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
+	-L${LIBSVN_DELTADIR} -lsvn_delta \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr \
+	-L${LIBAPR_UTILDIR} -lapr-util \
+	-lbsdxml \
+	-L${LIBAPRDIR} -lapr \
+	-L${LIBSQLITEDIR} -lsqlite3 \
+	-lz -lcrypt
+
+DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
+	${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
+	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/svn/svnlook/Makefile b/usr.bin/svn/svnlook/Makefile
new file mode 100644
index 0000000..618a473
--- /dev/null
+++ b/usr.bin/svn/svnlook/Makefile
@@ -0,0 +1,38 @@
+# $FreeBSD$
+
+NO_MAN=	svnlook.1
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/svnlook
+
+PROG=	svn${SVNLITE}look
+
+SRCS=	svnlook.c
+
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
+	-I${.CURDIR}/../lib/libapr \
+	-I${APR}/include/arch/unix \
+	-I${APR}/include \
+	-I${.CURDIR}/../lib/libapr_util \
+	-I${APRU}/include/private \
+	-I${APRU}/include
+
+LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos \
+	-L${LIBSVN_FSDIR} -lsvn_fs \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
+	-L${LIBSVN_DELTADIR} -lsvn_delta \
+	-L${LIBSVN_DIFFDIR} -lsvn_diff \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr \
+	-L${LIBAPR_UTILDIR} -lapr-util \
+	-lbsdxml \
+	-L${LIBAPRDIR} -lapr \
+	-L${LIBSQLITEDIR} -lsqlite3 \
+	-lz -lcrypt
+
+DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
+	${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
+	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/svn/svnmucc/Makefile b/usr.bin/svn/svnmucc/Makefile
new file mode 100644
index 0000000..8ec8d1f
--- /dev/null
+++ b/usr.bin/svn/svnmucc/Makefile
@@ -0,0 +1,45 @@
+# $FreeBSD$
+
+NO_MAN=	svnmucc.1
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/svnmucc
+
+PROG=	svn${SVNLITE}mucc
+
+SRCS=	svnmucc.c
+
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
+	-I${.CURDIR}/../lib/libapr \
+	-I${APR}/include/arch/unix \
+	-I${APR}/include \
+	-I${.CURDIR}/../lib/libapr_util \
+	-I${APRU}/include/private \
+	-I${APRU}/include
+
+LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
+	-L${LIBSVN_RADIR} -lsvn_ra \
+	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
+	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
+	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
+	-L${LIBSVN_REPOSDIR} -lsvn_repos \
+	-L${LIBSVN_FSDIR} -lsvn_fs \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
+	-L${LIBSVN_DELTADIR} -lsvn_delta \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr \
+	-L${LIBSERFDIR} -lserf \
+	-L${LIBAPR_UTILDIR} -lapr-util \
+	-lbsdxml \
+	-L${LIBAPRDIR} -lapr \
+	-L${LIBSQLITEDIR} -lsqlite3 \
+	-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
+
+DPADD=	${LIBSVN_CLIENT} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} \
+	${LIBSVN_RA_SERF} ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} \
+	${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} \
+	${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} \
+	${LIBCRYPT} ${LIBMAGIC} ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/svn/svnrdump/Makefile b/usr.bin/svn/svnrdump/Makefile
new file mode 100644
index 0000000..8500f5f
--- /dev/null
+++ b/usr.bin/svn/svnrdump/Makefile
@@ -0,0 +1,48 @@
+# $FreeBSD$
+
+NO_MAN=	svnrdump.1
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/svnrdump
+
+PROG=	svn${SVNLITE}rdump
+
+SRCS=	dump_editor.c load_editor.c svnrdump.c util.c
+
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
+	-I${.CURDIR}/../lib/libapr \
+	-I${APR}/include/arch/unix \
+	-I${APR}/include \
+	-I${.CURDIR}/../lib/libapr_util \
+	-I${APRU}/include/private \
+	-I${APRU}/include
+
+LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
+	-L${LIBSVN_WCDIR} -lsvn_wc \
+	-L${LIBSVN_RADIR} -lsvn_ra \
+	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
+	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
+	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
+	-L${LIBSVN_REPOSDIR} -lsvn_repos \
+	-L${LIBSVN_FSDIR} -lsvn_fs \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
+	-L${LIBSVN_DELTADIR} -lsvn_delta \
+	-L${LIBSVN_DIFFDIR} -lsvn_diff \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr \
+	-L${LIBSERFDIR} -lserf \
+	-L${LIBAPR_UTILDIR} -lapr-util \
+	-lbsdxml \
+	-L${LIBAPRDIR} -lapr \
+	-L${LIBSQLITEDIR} -lsqlite3 \
+	-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
+
+DPADD=	${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
+	${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \
+	${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \
+	${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
+	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
+	${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/svn/svnserve/Makefile b/usr.bin/svn/svnserve/Makefile
new file mode 100644
index 0000000..6a39d4d
--- /dev/null
+++ b/usr.bin/svn/svnserve/Makefile
@@ -0,0 +1,44 @@
+# $FreeBSD$
+
+NO_MAN=	svnserve.1
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/svnserve
+
+PROG=	svn${SVNLITE}serve
+
+SRCS=	cyrus_auth.c log-escape.c serve.c svnserve.c winservice.c
+
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
+	-I${.CURDIR}/../lib/libapr \
+	-I${APR}/include/arch/unix \
+	-I${APR}/include \
+	-I${.CURDIR}/../lib/libapr_util \
+	-I${APRU}/include/private \
+	-I${APRU}/include
+
+LDADD=	-L${LIBSVN_RADIR} -lsvn_ra \
+	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
+	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
+	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
+	-L${LIBSVN_REPOSDIR} -lsvn_repos \
+	-L${LIBSVN_FSDIR} -lsvn_fs \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
+	-L${LIBSVN_DELTADIR} -lsvn_delta \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr \
+	-L${LIBSERFDIR} -lserf \
+	-L${LIBAPR_UTILDIR} -lapr-util \
+	-lbsdxml \
+	-L${LIBAPRDIR} -lapr \
+	-L${LIBSQLITEDIR} -lsqlite3 \
+	-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
+
+DPADD=	${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \
+	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
+	${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
+	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
+	${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/svn/svnsync/Makefile b/usr.bin/svn/svnsync/Makefile
new file mode 100644
index 0000000..a1f6e25
--- /dev/null
+++ b/usr.bin/svn/svnsync/Makefile
@@ -0,0 +1,44 @@
+# $FreeBSD$
+
+NO_MAN=	svnsync.1
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/svnsync
+
+PROG=	svn${SVNLITE}sync
+
+SRCS=	svnsync.c sync.c
+
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
+	-I${.CURDIR}/../lib/libapr \
+	-I${APR}/include/arch/unix \
+	-I${APR}/include \
+	-I${.CURDIR}/../lib/libapr_util \
+	-I${APRU}/include/private \
+	-I${APRU}/include
+
+LDADD=	-L${LIBSVN_RADIR} -lsvn_ra \
+	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
+	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
+	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
+	-L${LIBSVN_REPOSDIR} -lsvn_repos \
+	-L${LIBSVN_FSDIR} -lsvn_fs \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
+	-L${LIBSVN_DELTADIR} -lsvn_delta \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr \
+	-L${LIBSERFDIR} -lserf \
+	-L${LIBAPR_UTILDIR} -lapr-util \
+	-lbsdxml \
+	-L${LIBAPRDIR} -lapr \
+	-L${LIBSQLITEDIR} -lsqlite3 \
+	-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
+
+DPADD=	${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \
+	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
+	${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
+	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
+	${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/svn/svnversion/Makefile b/usr.bin/svn/svnversion/Makefile
new file mode 100644
index 0000000..fb2a7a2
--- /dev/null
+++ b/usr.bin/svn/svnversion/Makefile
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+NO_MAN=	svnversion.1
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/svnversion
+
+PROG=	svn${SVNLITE}version
+
+SRCS=	svnversion.c
+
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
+	-I${.CURDIR}/../lib/libapr \
+	-I${APR}/include/arch/unix \
+	-I${APR}/include \
+	-I${.CURDIR}/../lib/libapr_util \
+	-I${APRU}/include/private \
+	-I${APRU}/include
+
+LDADD=	-L${LIBSVN_WCDIR} -lsvn_wc \
+	-L${LIBSVN_DELTADIR} -lsvn_delta \
+	-L${LIBSVN_DIFFDIR} -lsvn_diff \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr \
+	-L${LIBAPR_UTILDIR} -lapr-util \
+	-lbsdxml \
+	-L${LIBAPRDIR} -lapr \
+	-L${LIBSQLITEDIR} -lsqlite3 \
+	-lz -lcrypt
+
+DPADD=	${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \
+	${LIBSERF} ${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} \
+	${LIBZ} ${LIBCRYPT}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index 6a7e53d..40d55cc 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -5,7 +5,7 @@
 
 PROG=	systat
 SRCS=	cmds.c cmdtab.c devs.c fetch.c iostat.c keyboard.c main.c \
-	mbufs.c netcmds.c netstat.c pigs.c swap.c icmp.c \
+	netcmds.c netstat.c pigs.c swap.c icmp.c \
 	mode.c ip.c tcp.c \
 	vmstat.c convtbl.c ifcmds.c ifstat.c
 
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index 9b648ff..c9c9e7d 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -46,9 +46,6 @@ struct	cmdtab cmdtab[] = {
 	{ "swap",	showswap,	fetchswap,	labelswap,
 	  initswap,	openswap,	closeswap,	0,
 	  0,		CF_LOADAV },
-	{ "mbufs",	showmbufs,	fetchmbufs,	labelmbufs,
-	  initmbufs,	openmbufs,	closembufs,	0,
-	  0,		CF_LOADAV },
 	{ "iostat",	showiostat,	fetchiostat,	labeliostat,
 	  initiostat,	openiostat,	closeiostat,	cmdiostat,
 	  0,		CF_LOADAV },
diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h
index 393fa1c..17fffc1 100644
--- a/usr.bin/systat/extern.h
+++ b/usr.bin/systat/extern.h
@@ -76,7 +76,6 @@ void	 closeiostat(WINDOW *);
 void	 closeip(WINDOW *);
 void	 closeip6(WINDOW *);
 void	 closekre(WINDOW *);
-void	 closembufs(WINDOW *);
 void	 closenetstat(WINDOW *);
 void	 closepigs(WINDOW *);
 void	 closeswap(WINDOW *);
@@ -99,7 +98,6 @@ void	 fetchip(void);
 void	 fetchip6(void);
 void	 fetchiostat(void);
 void	 fetchkre(void);
-void	 fetchmbufs(void);
 void	 fetchnetstat(void);
 void	 fetchpigs(void);
 void	 fetchswap(void);
@@ -113,7 +111,6 @@ int	 initip(void);
 int	 initip6(void);
 int	 initiostat(void);
 int	 initkre(void);
-int	 initmbufs(void);
 int	 initnetstat(void);
 int	 initpigs(void);
 int	 initswap(void);
@@ -127,7 +124,6 @@ void	 labelip(void);
 void	 labelip6(void);
 void	 labeliostat(void);
 void	 labelkre(void);
-void	 labelmbufs(void);
 void	 labelnetstat(void);
 void	 labelpigs(void);
 void	 labels(void);
@@ -143,7 +139,6 @@ WINDOW	*openip(void);
 WINDOW	*openip6(void);
 WINDOW	*openiostat(void);
 WINDOW	*openkre(void);
-WINDOW	*openmbufs(void);
 WINDOW	*opennetstat(void);
 WINDOW	*openpigs(void);
 WINDOW	*openswap(void);
@@ -161,7 +156,6 @@ void	 showip(void);
 void	 showip6(void);
 void	 showiostat(void);
 void	 showkre(void);
-void	 showmbufs(void);
 void	 shownetstat(void);
 void	 showpigs(void);
 void	 showswap(void);
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
deleted file mode 100644
index 3fdbcac..0000000
--- a/usr.bin/systat/mbufs.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*-
- * Copyright (c) 1980, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
-#ifdef lint
-static const char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
-#endif
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mbuf.h>
-#include <sys/sysctl.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <paths.h>
-
-#include "systat.h"
-#include "extern.h"
-
-static struct mbstat *mbstat;
-static long *m_mbtypes;
-static short nmbtypes;
-
-static struct mtnames {
-	short mt_type;
-	const char *mt_name;
-} mtnames[] = {
-	{ MT_DATA, 	"data"},
-	{ MT_HEADER,	"headers"},
-	{ MT_SONAME,	"socknames"},
-	{ MT_CONTROL,	"control"},
-	{ MT_OOBDATA,	"oobdata"}
-};
-#define	NNAMES	(sizeof (mtnames) / sizeof (mtnames[0]))
-
-WINDOW *
-openmbufs(void)
-{
-	return (subwin(stdscr, LINES-3-1, 0, MAINWIN_ROW, 0));
-}
-
-void
-closembufs(WINDOW *w)
-{
-	if (w == NULL)
-		return;
-	wclear(w);
-	wrefresh(w);
-	delwin(w);
-}
-
-void
-labelmbufs(void)
-{
-	wmove(wnd, 0, 0); wclrtoeol(wnd);
-	mvwaddstr(wnd, 0, 10,
-	    "/0   /5   /10  /15  /20  /25  /30  /35  /40  /45  /50  /55  /60");
-}
-
-void
-showmbufs(void)
-{
-	int i, j, max, idx;
-	u_long totmbufs;
-	char buf[10];
-	const char *mtname;
-
-	totmbufs = mbstat->m_mbufs;
-
-	/*
-	 * Print totals for different mbuf types.
-	 */
-	for (j = 0; j < wnd->_maxy; j++) {
-		max = 0, idx = -1;
-		for (i = 0; i < wnd->_maxy; i++) {
-			if (i == MT_NOTMBUF)
-				continue;
-			if (i >= nmbtypes)
-				break;
-			if (m_mbtypes[i] > max) {
-				max = m_mbtypes[i];
-				idx = i;
-			}
-		}
-		if (max == 0)
-			break;
-
-		mtname = NULL;
-		for (i = 0; i < (int)NNAMES; i++)
-			if (mtnames[i].mt_type == idx)
-				mtname = mtnames[i].mt_name;
-		if (mtname == NULL)
-			mvwprintw(wnd, 1+j, 0, "%10d", idx);
-		else
-			mvwprintw(wnd, 1+j, 0, "%-10.10s", mtname);
-		wmove(wnd, 1 + j, 10);
-		if (max > 60) {
-			snprintf(buf, sizeof(buf), " %d", max);
-			max = 60;
-			while (max--)
-				waddch(wnd, 'X');
-			waddstr(wnd, buf);
-		} else
-			while (max--)
-				waddch(wnd, 'X');
-		wclrtoeol(wnd);
-		m_mbtypes[idx] = 0;
-	}
-
-	/*
-	 * Print total number of free mbufs.
-	 */
-	if (totmbufs > 0) {
-		mvwprintw(wnd, 1+j, 0, "%-10.10s", "Mbufs");
-		if (totmbufs > 60) {
-			snprintf(buf, sizeof(buf), " %lu", totmbufs);
-			totmbufs = 60;
-			while(totmbufs--)
-				waddch(wnd, 'X');
-			waddstr(wnd, buf);
-		} else {
-			while(totmbufs--)
-				waddch(wnd, 'X');
-		}
-		wclrtoeol(wnd);
-		j++;
-	}
-	wmove(wnd, 1+j, 0); wclrtobot(wnd);
-}
-
-int
-initmbufs(void)
-{
-	size_t len;
-
-	len = sizeof *mbstat;
-	if ((mbstat = malloc(len)) == NULL) {
-		error("malloc mbstat failed");
-		return 0;
-	}
-	if (sysctlbyname("kern.ipc.mbstat", mbstat, &len, NULL, 0) < 0) {
-		error("sysctl retrieving mbstat");
-		return 0;
-	}
-	nmbtypes = mbstat->m_numtypes;
-	if ((m_mbtypes = calloc(nmbtypes, sizeof(long *))) == NULL) {
-		error("calloc m_mbtypes failed");
-		return 0;
-	}
-
-	return 1;
-}
-
-void
-fetchmbufs(void)
-{
-	size_t len;
-
-	len = sizeof *mbstat;
-	if (sysctlbyname("kern.ipc.mbstat", mbstat, &len, NULL, 0) < 0)
-		printw("sysctl: mbstat: %s", strerror(errno));
-}
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 4916b9c..9c144e7 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -28,7 +28,7 @@
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
 .\" $FreeBSD$
 .\"
-.Dd February 20, 2013
+.Dd July 15, 2013
 .Dt SYSTAT 1
 .Os
 .Sh NAME
@@ -67,7 +67,6 @@ statistics (a la
 .Xr iostat 8 ) ,
 virtual memory statistics (a la
 .Xr vmstat 8 ) ,
-network ``mbuf'' utilization,
 .Tn TCP/IP
 statistics,
 and network connections (a la
@@ -94,7 +93,6 @@ to be one of:
 .Ic iostat ,
 .Ic ip ,
 .Ic ip6 ,
-.Ic mbufs ,
 .Ic netstat ,
 .Ic pigs ,
 .Ic swap ,
@@ -280,9 +278,6 @@ the graph shows the percentage of space in use on each partition.
 If there are more than one swap partition in use,
 a total line is also shown.
 Areas known to the kernel, but not in use are shown as not available.
-.It Ic mbufs
-Display, in the lower window, the number of mbufs allocated
-for particular uses, i.e., data, socket structures, etc.
 .It Ic vmstat
 Take over the entire display and show a (rather crowded) compendium
 of statistics related to virtual memory usage, process scheduling,
diff --git a/usr.bin/tail/extern.h b/usr.bin/tail/extern.h
index 16a3e19..dfc63d0 100644
--- a/usr.bin/tail/extern.h
+++ b/usr.bin/tail/extern.h
@@ -67,5 +67,6 @@ void ierr(const char *);
 void oerr(void);
 int mapprint(struct mapinfo *, off_t, off_t);
 int maparound(struct mapinfo *, off_t);
+void printfn(const char *, int);
 
 extern int Fflag, fflag, qflag, rflag, rval, no_files;
diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c
index 3c605bf..5eaae98 100644
--- a/usr.bin/tail/forward.c
+++ b/usr.bin/tail/forward.c
@@ -243,7 +243,7 @@ show(file_info_t *file)
 	while ((ch = getc(file->fp)) != EOF) {
 		if (last != file && no_files > 1) {
 			if (!qflag)
-				(void)printf("\n==> %s <==\n", file->file_name);
+				printfn(file->file_name, 1);
 			last = file;
 		}
 		if (putchar(ch) == EOF)
@@ -320,7 +320,7 @@ follow(file_info_t *files, enum STYLE style, off_t off)
 			active = 1;
 			n++;
 			if (no_files > 1 && !qflag)
-				(void)printf("\n==> %s <==\n", file->file_name);
+				printfn(file->file_name, 1);
 			forward(file->fp, file->file_name, style, off, &file->st);
 			if (Fflag && fileno(file->fp) != STDIN_FILENO)
 				n++;
diff --git a/usr.bin/tail/misc.c b/usr.bin/tail/misc.c
index 3b21e4e..6944325 100644
--- a/usr.bin/tail/misc.c
+++ b/usr.bin/tail/misc.c
@@ -113,3 +113,17 @@ maparound(struct mapinfo *mip, off_t offset)
 
 	return (0);
 }
+
+/*
+ * Print the file name without stdio buffering.
+ */
+void
+printfn(const char *fn, int print_nl)
+{
+
+	if (print_nl)
+		WR("\n", 1);
+	WR("==> ", 4);
+	WR(fn, strlen(fn));
+	WR(" <==\n", 5);
+}
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index a53a568..e5566cb 100644
--- a/usr.bin/tail/tail.c
+++ b/usr.bin/tail/tail.c
@@ -203,10 +203,8 @@ main(int argc, char *argv[])
 				continue;
 			}
 			if (argc > 1 && !qflag) {
-				(void)printf("%s==> %s <==\n",
-				    first ? "" : "\n", fn);
+				printfn(fn, !first);
 				first = 0;
-				(void)fflush(stdout);
 			}
 
 			if (rflag)
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index e01143d..190ea26 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -107,20 +107,20 @@ static char io_header[] =
     "%5d%s %-*.*s %6ld %6ld %6ld %6ld %6ld %6ld %6.2f%% %.*s"
 
 static char smp_header_thr[] =
-    "  PID%s %-*.*s  THR PRI NICE   SIZE    RES STATE   C   TIME %6s COMMAND";
+    "  PID%s %-*.*s  THR PRI NICE   SIZE    RES STATE   C   TIME %7s COMMAND";
 static char smp_header[] =
-    "  PID%s %-*.*s "   "PRI NICE   SIZE    RES STATE   C   TIME %6s COMMAND";
+    "  PID%s %-*.*s "   "PRI NICE   SIZE    RES STATE   C   TIME %7s COMMAND";
 
 #define smp_Proc_format \
-    "%5d%s %-*.*s %s%3d %4s%7s %6s %-6.6s %2d%7s %5.2f%% %.*s"
+    "%5d%s %-*.*s %s%3d %4s%7s %6s %-6.6s %2d%7s %6.2f%% %.*s"
 
 static char up_header_thr[] =
-    "  PID%s %-*.*s  THR PRI NICE   SIZE    RES STATE    TIME %6s COMMAND";
+    "  PID%s %-*.*s  THR PRI NICE   SIZE    RES STATE    TIME %7s COMMAND";
 static char up_header[] =
-    "  PID%s %-*.*s "   "PRI NICE   SIZE    RES STATE    TIME %6s COMMAND";
+    "  PID%s %-*.*s "   "PRI NICE   SIZE    RES STATE    TIME %7s COMMAND";
 
 #define up_Proc_format \
-    "%5d%s %-*.*s %s%3d %4s%7s %6s %-6.6s%.0d%7s %5.2f%% %.*s"
+    "%5d%s %-*.*s %s%3d %4s%7s %6s %-6.6s%.0d%7s %6.2f%% %.*s"
 
 
 /* process state names for the "STATE" column of the display */
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index d42d9af..4439c07 100644
--- a/usr.bin/touch/touch.c
+++ b/usr.bin/touch/touch.c
@@ -56,12 +56,12 @@ static const char sccsid[] = "@(#)touch.c	8.1 (Berkeley) 6/6/93";
 #include <time.h>
 #include <unistd.h>
 
-void	stime_arg1(char *, struct timeval *);
-void	stime_arg2(char *, int, struct timeval *);
-void	stime_darg(char *, struct timeval *);
-void	stime_file(char *, struct timeval *);
-int	timeoffset(char *);
-void	usage(char *);
+static void	stime_arg1(const char *, struct timeval *);
+static void	stime_arg2(const char *, int, struct timeval *);
+static void	stime_darg(const char *, struct timeval *);
+static void	stime_file(const char *, struct timeval *);
+static int	timeoffset(const char *);
+static void	usage(const char *);
 
 int
 main(int argc, char *argv[])
@@ -78,7 +78,7 @@ main(int argc, char *argv[])
 	Aflag = aflag = cflag = mflag = timeset = 0;
 	stat_f = stat;
 	utimes_f = utimes;
-	if (gettimeofday(&tv[0], NULL))
+	if (gettimeofday(&tv[0], NULL) == -1)
 		err(1, "gettimeofday");
 
 	while ((ch = getopt(argc, argv, "A:acd:fhmr:t:")) != -1)
@@ -115,7 +115,6 @@ main(int argc, char *argv[])
 			timeset = 1;
 			stime_arg1(optarg, tv);
 			break;
-		case '?':
 		default:
 			usage(myname);
 		}
@@ -235,8 +234,8 @@ main(int argc, char *argv[])
 
 #define	ATOI2(ar)	((ar)[0] - '0') * 10 + ((ar)[1] - '0'); (ar) += 2;
 
-void
-stime_arg1(char *arg, struct timeval *tvp)
+static void
+stime_arg1(const char *arg, struct timeval *tvp)
 {
 	time_t now;
 	struct tm *t;
@@ -290,14 +289,17 @@ stime_arg1(char *arg, struct timeval *tvp)
 	t->tm_isdst = -1;		/* Figure out DST. */
 	tvp[0].tv_sec = tvp[1].tv_sec = mktime(t);
 	if (tvp[0].tv_sec == -1)
-terr:		errx(1,
-	"out of range or illegal time specification: [[CC]YY]MMDDhhmm[.SS]");
+		goto terr;
 
 	tvp[0].tv_usec = tvp[1].tv_usec = 0;
+	return;
+
+terr:
+	errx(1, "out of range or illegal time specification: [[CC]YY]MMDDhhmm[.SS]");
 }
 
-void
-stime_arg2(char *arg, int year, struct timeval *tvp)
+static void
+stime_arg2(const char *arg, int year, struct timeval *tvp)
 {
 	time_t now;
 	struct tm *t;
@@ -326,8 +328,8 @@ stime_arg2(char *arg, int year, struct timeval *tvp)
 	tvp[0].tv_usec = tvp[1].tv_usec = 0;
 }
 
-void
-stime_darg(char *arg, struct timeval *tvp)
+static void
+stime_darg(const char *arg, struct timeval *tvp)
 {
 	struct tm t = { .tm_sec = 0 };
 	const char *fmt, *colon;
@@ -372,7 +374,7 @@ bad:
 
 /* Calculate a time offset in seconds, given an arg of the format [-]HHMMSS. */
 int
-timeoffset(char *arg)
+timeoffset(const char *arg)
 {
 	int offset;
 	int isneg;
@@ -400,8 +402,8 @@ timeoffset(char *arg)
 		return (offset);
 }
 
-void
-stime_file(char *fname, struct timeval *tvp)
+static void
+stime_file(const char *fname, struct timeval *tvp)
 {
 	struct stat sb;
 
@@ -411,8 +413,8 @@ stime_file(char *fname, struct timeval *tvp)
 	TIMESPEC_TO_TIMEVAL(tvp + 1, &sb.st_mtim);
 }
 
-void
-usage(char *myname)
+static void
+usage(const char *myname)
 {
 	fprintf(stderr, "usage: %s [-A [-][[hh]mm]SS] [-achm] [-r file] "
 		"[-t [[CC]YY]MMDDhhmm[.SS]]\n"
diff --git a/usr.bin/truss/syscall.h b/usr.bin/truss/syscall.h
index 49ff9a4..94776a0 100644
--- a/usr.bin/truss/syscall.h
+++ b/usr.bin/truss/syscall.h
@@ -40,7 +40,7 @@ enum Argtype { None = 1, Hex, Octal, Int, Name, Ptr, Stat, Ioctl, Quad,
 	Fd_set, Sigaction, Fcntl, Mprot, Mmapflags, Whence, Readlinkres,
 	Umtx, Sigset, Sigprocmask, Kevent, Sockdomain, Socktype, Open,
 	Fcntlflag, Rusage, BinString, Shutdown, Resource, Rlimit, Timeval2,
-	Pathconf };
+	Pathconf, Rforkflags };
 
 #define	ARG_MASK	0xff
 #define	OUT	0x100
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index 0afd083..f5e2c46 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -93,6 +93,9 @@ static struct syscall syscalls[] = {
 	{ .name = "fcntl", .ret_type = 1, .nargs = 3,
 	  .args = { { Int, 0 } , { Fcntl, 1 }, { Fcntlflag | OUT, 2 } } },
 	{ .name = "fork", .ret_type = 1, .nargs = 0 },
+	{ .name = "vfork", .ret_type = 1, .nargs = 0 },
+	{ .name = "rfork", .ret_type = 1, .nargs = 1,
+	  .args = { { Rforkflags, 0 } } },
 	{ .name = "getegid", .ret_type = 1, .nargs = 0 },
 	{ .name = "geteuid", .ret_type = 1, .nargs = 0 },
 	{ .name = "getgid", .ret_type = 1, .nargs = 0 },
@@ -293,7 +296,7 @@ static struct xlat mmap_flags[] = {
 	X(MAP_SHARED) X(MAP_PRIVATE) X(MAP_FIXED) X(MAP_RENAME)
 	X(MAP_NORESERVE) X(MAP_RESERVED0080) X(MAP_RESERVED0100)
 	X(MAP_HASSEMAPHORE) X(MAP_STACK) X(MAP_NOSYNC) X(MAP_ANON)
-	X(MAP_NOCORE) XEND
+	X(MAP_NOCORE) X(MAP_PREFAULT_READ) XEND
 };
 
 static struct xlat mprot_flags[] = {
@@ -343,7 +346,7 @@ static struct xlat open_flags[] = {
 	X(O_RDONLY) X(O_WRONLY) X(O_RDWR) X(O_ACCMODE) X(O_NONBLOCK)
 	X(O_APPEND) X(O_SHLOCK) X(O_EXLOCK) X(O_ASYNC) X(O_FSYNC)
 	X(O_NOFOLLOW) X(O_CREAT) X(O_TRUNC) X(O_EXCL) X(O_NOCTTY)
-	X(O_DIRECT) XEND
+	X(O_DIRECT) X(O_DIRECTORY) X(O_EXEC) X(O_TTY_INIT) X(O_CLOEXEC) XEND
 };
 
 static struct xlat shutdown_arg[] = {
@@ -369,6 +372,11 @@ static struct xlat pathconf_arg[] = {
 	XEND
 };
 
+static struct xlat rfork_flags[] = {
+	X(RFPROC) X(RFNOWAIT) X(RFFDG) X(RFCFDG) X(RFTHREAD) X(RFMEM)
+	X(RFSIGSHARE) X(RFTSIGZMB) X(RFLINUXTHPN) XEND
+};
+
 #undef X
 #undef XEND
 
@@ -885,9 +893,41 @@ print_arg(struct syscall_args *sc, unsigned long *args, long retval,
 	case Mprot:
 		tmp = strdup(xlookup_bits(mprot_flags, args[sc->offset]));
 		break;
-	case Mmapflags:
-		tmp = strdup(xlookup_bits(mmap_flags, args[sc->offset]));
+	case Mmapflags: {
+		char *base, *alignstr;
+		int align, flags;
+
+		/*
+		 * MAP_ALIGNED can't be handled by xlookup_bits(), so
+		 * generate that string manually and prepend it to the
+		 * string from xlookup_bits().  Have to be careful to
+		 * avoid outputting MAP_ALIGNED|0 if MAP_ALIGNED is
+		 * the only flag.
+		 */
+		flags = args[sc->offset] & ~MAP_ALIGNMENT_MASK;
+		align = args[sc->offset] & MAP_ALIGNMENT_MASK;
+		if (align != 0) {
+			if (align == MAP_ALIGNED_SUPER)
+				alignstr = strdup("MAP_ALIGNED_SUPER");
+			else
+				asprintf(&alignstr, "MAP_ALIGNED(%d)",
+				    align >> MAP_ALIGNMENT_SHIFT);
+			if (flags == 0) {
+				tmp = alignstr;
+				break;
+			}
+		} else
+			alignstr = NULL;
+		base = strdup(xlookup_bits(mmap_flags, flags));
+		if (alignstr == NULL) {
+			tmp = base;
+			break;
+		}
+		asprintf(&tmp, "%s|%s", alignstr, base);
+		free(alignstr);
+		free(base);
 		break;
+	}
 	case Whence:
 		tmp = strdup(xlookup(whence_arg, args[sc->offset]));
 		break;
@@ -906,6 +946,9 @@ print_arg(struct syscall_args *sc, unsigned long *args, long retval,
 	case Pathconf:
 		tmp = strdup(xlookup(pathconf_arg, args[sc->offset]));
 		break;
+	case Rforkflags:
+		tmp = strdup(xlookup_bits(rfork_flags, args[sc->offset]));
+		break;
 	case Sockaddr: {
 		struct sockaddr_storage ss;
 		char addr[64];
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index 1077307..8e7f40f 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -44,15 +44,20 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
+#include <sys/capability.h>
+
 #include <ctype.h>
 #include <err.h>
+#include <errno.h>
 #include <limits.h>
 #include <locale.h>
+#include <nl_types.h>
 #include <stdint.h>
 #define _WITH_GETLINE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <termios.h>
 #include <unistd.h>
 #include <wchar.h>
 #include <wctype.h>
@@ -68,6 +73,17 @@ static wchar_t	*skip(wchar_t *);
 static void	 obsolete(char *[]);
 static void	 usage(void);
 
+static void
+strerror_init(void)
+{
+
+	/*
+	 * Cache NLS data before entering capability mode.
+	 * XXXPJD: There should be strerror_init() and strsignal_init() in libc.
+	 */
+	(void)catopen("libc", NL_CAT_LOCALE);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -77,6 +93,7 @@ main (int argc, char *argv[])
 	size_t prevbuflen, thisbuflen, b1;
 	char *prevline, *thisline, *p;
 	const char *ifn;
+	cap_rights_t rights;
 
 	(void) setlocale(LC_ALL, "");
 
@@ -128,8 +145,33 @@ main (int argc, char *argv[])
 	ofp = stdout;
 	if (argc > 0 && strcmp(argv[0], "-") != 0)
 		ifp = file(ifn = argv[0], "r");
+	cap_rights_init(&rights, CAP_FSTAT, CAP_READ);
+	if (cap_rights_limit(fileno(ifp), &rights) < 0 && errno != ENOSYS)
+		err(1, "unable to limit rights for %s", ifn);
+	cap_rights_init(&rights, CAP_FSTAT, CAP_WRITE);
 	if (argc > 1)
 		ofp = file(argv[1], "w");
+	else
+		cap_rights_set(&rights, CAP_IOCTL);
+	if (cap_rights_limit(fileno(ofp), &rights) < 0 && errno != ENOSYS) {
+		err(1, "unable to limit rights for %s",
+		    argc > 1 ? argv[1] : "stdout");
+	}
+	if (cap_rights_is_set(&rights, CAP_IOCTL)) {
+		unsigned long cmd;
+
+		cmd = TIOCGETA; /* required by isatty(3) in printf(3) */
+
+		if (cap_ioctls_limit(fileno(ofp), &cmd, 1) < 0 &&
+		    errno != ENOSYS) {
+			err(1, "unable to limit ioctls for %s",
+			    argc > 1 ? argv[1] : "stdout");
+		}
+	}
+
+	strerror_init();
+	if (cap_enter() < 0 && errno != ENOSYS)
+		err(1, "unable to enter capability mode");
 
 	prevbuflen = thisbuflen = 0;
 	prevline = thisline = NULL;
diff --git a/usr.bin/usbhidctl/usbhidctl.1 b/usr.bin/usbhidctl/usbhidctl.1
index bb7d958..6ee9785 100644
--- a/usr.bin/usbhidctl/usbhidctl.1
+++ b/usr.bin/usbhidctl/usbhidctl.1
@@ -136,8 +136,10 @@ supports isolating each item by appending a
 .Sq Cm \&# .
 character and a decimal item instance number, starting at zero.
 .Sh FILES
-.Pa /usr/share/misc/usb_hid_usages
+.Bl -tag -width 30n
+.It Pa /usr/share/misc/usb_hid_usages
 The default HID usage table.
+.El
 .Sh SEE ALSO
 .Xr usbhid 3 ,
 .Xr uhid 4 ,
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index 048c35b..033c472 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -2,14 +2,12 @@
 # $FreeBSD$
 #
 
-SRCDIR=		${.CURDIR}/../../contrib/nvi
-
-CFLAGS+=	-DGTAGS
+.include <bsd.own.mk>
 
-#if using ncurses:
-CFLAGS+=	-DSYSV_CURSES
+SRCDIR=		${.CURDIR}/../../contrib/nvi
+SUBDIR+=	catalog
 
-WARNS?=	0
+WARNS?=	0	# some warn issues on 32 bit machines
 
 VI=	nvi
 EX=	nex
@@ -17,6 +15,8 @@ VIEW=	nview
 
 PROG=	nvi
 
+CFLAGS+=	-D__REGEX_PRIVATE
+
 LINKS=	${BINDIR}/${VI} ${BINDIR}/${EX} ${BINDIR}/${VI} ${BINDIR}/${VIEW}
 LINKS+= ${BINDIR}/${VI} ${BINDIR}/vi ${BINDIR}/${EX} ${BINDIR}/ex
 LINKS+= ${BINDIR}/${VI} ${BINDIR}/view
@@ -25,34 +25,38 @@ MAN=	${SRCDIR}/docs/USD.doc/vi.man/vi.1
 MLINKS+=vi.1 ex.1 vi.1 view.1
 MLINKS+=vi.1 nex.1 vi.1 nview.1 vi.1 nvi.1
 
-CATALOGS= dutch english french german polish ru_RU.KOI8-R spanish swedish \
-          uk_UA.KOI8-U
-NLLINKS= nl_NL
-ENLINKS= en_AU en_CA en_GB en_NZ en_US
-FRLINKS= fr_BE fr_CA fr_CH fr_FR
-DELINKS= de_AT de_CH de_DE
-ESLINKS= es_ES
-SVLINKS= sv_SE
-PLLINKS= pl_PL
-
 .PATH:	${SRCDIR}/common
 .PATH:	${SRCDIR}/ex
 .PATH:	${SRCDIR}/cl
 .PATH:	${SRCDIR}/vi
+.PATH:	${SRCDIR}/regex
+
+CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/regex
+
+DPADD=		${LIBUTIL}
+LDADD=		-lutil
 
-CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/include
+.if defined(RESCUE) || defined(RELEASE_CRUNCH)
+DPADD+=		${LIBNCURSES}
+LDADD+=		-lncurses
+.else
+CFLAGS+=	-DUSE_WIDECHAR
+DPADD+=		${LIBNCURSESW}
+LDADD+=		-lncursesw
+.endif
 
-DPADD=		${LIBNCURSES}
-LDADD=		-lncurses
+.if ${MK_ICONV} == "yes" && !defined(RESCUE) && !defined(RELEASE_CRUNCH)
+CFLAGS+=	-DUSE_ICONV
+.endif
 
 CLEANFILES+=${EX}
 
 # Vi curses sources
-SRCS+=	cl_bsd.c cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c
+SRCS+=	cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c
 
 # General sources.
-SRCS+=	cut.c delete.c exf.c key.c line.c log.c main.c mark.c msg.c options.c \
-	options_f.c put.c screen.c search.c seq.c recover.c util.c
+SRCS+=	conv.c cut.c delete.c encoding.c exf.c key.c line.c log.c main.c mark.c msg.c options.c \
+	options_f.c put.c recover.c screen.c search.c seq.c util.c
 
 # Ex source.
 SRCS+=	ex.c ex_abbrev.c ex_append.c ex_args.c ex_argv.c ex_at.c ex_bang.c \
@@ -63,7 +67,7 @@ SRCS+=	ex.c ex_abbrev.c ex_append.c ex_args.c ex_argv.c ex_at.c ex_bang.c \
 	ex_read.c ex_screen.c ex_script.c ex_set.c ex_shell.c \
 	ex_shift.c ex_source.c ex_stop.c ex_subst.c ex_tag.c \
 	ex_txt.c ex_undo.c ex_usage.c ex_util.c ex_version.c ex_visual.c \
-	ex_write.c ex_yank.c ex_z.c ex_tcl.c ex_perl.c
+	ex_write.c ex_yank.c ex_z.c
 
 # Vi source.
 SRCS+=	getc.c v_at.c v_ch.c v_cmd.c v_delete.c v_ex.c v_increment.c v_init.c \
@@ -75,38 +79,7 @@ SRCS+=	getc.c v_at.c v_ch.c v_cmd.c v_delete.c v_ex.c v_increment.c v_init.c \
 # Vi screen source.
 SRCS+=	vs_line.c vs_msg.c vs_refresh.c vs_relative.c vs_smap.c vs_split.c
 
-FILES=	${CATALOGS:S;^;${SRCDIR}/catalog/;}
-FILESDIR= /usr/share/vi/catalog
-SYMLINKS=
-.for l in ${NLLINKS}
-SYMLINKS+= dutch ${FILESDIR}/$l.ISO8859-1
-SYMLINKS+= dutch ${FILESDIR}/$l.ISO8859-15
-.endfor
-.for l in ${ENLINKS}
-SYMLINKS+= english ${FILESDIR}/$l.ISO8859-1
-SYMLINKS+= english ${FILESDIR}/$l.ISO8859-15
-SYMLINKS+= english ${FILESDIR}/$l.US-ASCII
-.endfor
-SYMLINKS+= english ${FILESDIR}/POSIX
-SYMLINKS+= english ${FILESDIR}/C
-.for l in ${FRLINKS}
-SYMLINKS+= french ${FILESDIR}/$l.ISO8859-1
-SYMLINKS+= french ${FILESDIR}/$l.ISO8859-15
-.endfor
-.for l in ${DELINKS}
-SYMLINKS+= german ${FILESDIR}/$l.ISO8859-1
-SYMLINKS+= german ${FILESDIR}/$l.ISO8859-15
-.endfor
-.for l in ${ESLINKS}
-SYMLINKS+= spanish ${FILESDIR}/$l.ISO8859-1
-SYMLINKS+= spanish ${FILESDIR}/$l.ISO8859-15
-.endfor
-.for l in ${SVLINKS}
-SYMLINKS+= swedish ${FILESDIR}/$l.ISO8859-1
-SYMLINKS+= swedish ${FILESDIR}/$l.ISO8859-15
-.endfor
-.for l in ${PLLINKS}
-SYMLINKS+= polish ${FILESDIR}/$l.ISO8859-2
-.endfor
+# Wide char regex
+SRCS+=	regcomp.c regerror.c regexec.c regfree.c
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/vi/catalog/Makefile b/usr.bin/vi/catalog/Makefile
new file mode 100644
index 0000000..bd9db9f
--- /dev/null
+++ b/usr.bin/vi/catalog/Makefile
@@ -0,0 +1,161 @@
+#	$Id: Makefile,v 9.0 2012/10/19 15:13:11 zy Exp $
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+V=	${.CURDIR}/../../../contrib/nvi
+
+CAT=	dutch english french german polish ru_RU.KOI8-R spanish swedish \
+	uk_UA.KOI8-U zh_CN.GB2312
+
+SCAN=	${V}/cl/*.c ${V}/common/*.c ${V}/ex/*.c ${V}/vi/*.c
+
+.PATH: ${V}/catalog
+
+all:		dump
+
+build-tools:	dump
+
+# Helper since iconv is non trivial to make a build tool
+utf8convert:
+.for c in dutch french german spanish swedish
+	iconv -f ISO8859-1 -t UTF-8 $V/catalog/$c.base > $c.UTF-8.base
+.endfor
+	iconv -f ISO8859-2 -t UTF-8 $V/catalog/polish.base > polish.UTF-8.base
+	iconv -f GB2312 -t UTF-8 $V/catalog/zh_CN.GB2312.base > zh_CN.UTF-8.base
+	iconv -f KOI8-R -t UTF-8 $V/catalog/ru_RU.KOI8-R.base > ru_RU.UTF-8.base
+	iconv -f KOI8-U -t UTF-8 $V/catalog/uk_UA.KOI8-U.base > uk_UA.UTF-8.base
+	
+.for c in dutch french german polish spanish swedish zh_CN ru_RU uk_UA
+CAT+=	$c.UTF-8
+.endfor
+
+.for c in ${CAT}
+${c}:	${c}.base 
+	@echo "... $c";							\
+	rm -f $c;							\
+	sort -u ${.ALLSRC} |						\
+	awk '{								\
+		if ($$1 == 1) {						\
+			print "\nMESSAGE NUMBER 1 IS NOT LEGAL";	\
+			exit 1;						\
+		}							\
+		if (++nline > $$1) {					\
+			print "DUPLICATE MESSAGE NUMBER " $$1;		\
+			exit 1;						\
+		}							\
+		print $0;						\
+	}' |								\
+	sed -e '1s/^/$$set 1~$$quote "~/; 1y/~/\n/' |			\
+	gencat $c /dev/stdin;						\
+	chmod 444 $c;							\
+	if grep DUPLICATE $c > /dev/null; then				\
+		grep DUPLICATE $@;					\
+	fi;								\
+	if grep 'NOT LEGAL' $c > /dev/null; then			\
+		grep 'NOT LEGAL' $@;					\
+	fi
+.endfor
+
+CHK=	dutch.check english.check french.check german.check \
+	polish.check ru_RU.KOI8-R.check spanish.check swedish.check \
+	uk_UA.KOI8-U.check zh_CN.GB2312.check
+check: ${CHK}
+.for c in ${CAT}
+${c}.check: ${c}.base
+	@echo "... $c";							\
+	f=${.ALLSRC:S;.base$;;};					\
+	(echo "Unused message id's (this is okay):";			\
+	awk '{								\
+		while (++nline < $$1)					\
+			printf "%03d\n", nline;				\
+	}' < $$f.base;							\
+	echo =========================;					\
+	echo "MISSING ERROR MESSAGES (Please add!):";			\
+	awk '{print $$1}' < $$f.base | sort -u > __ck1;			\
+	awk '{print $$1}' < english.base | sort -u > __ck2;		\
+	comm -13 __ck1 __ck2;						\
+	echo =========================;					\
+	echo "Extra error messages (just delete them):";		\
+	comm -23 __ck1 __ck2;						\
+	echo =========================;					\
+	echo "MESSAGES WITH THE SAME MESSAGE ID's (FIX!):";		\
+	for j in							\
+	    `sed '/^$$/d' < $$f.base | LANG=C sort -u |			\
+	    awk '{print $$1}' | uniq -d`; do				\
+		egrep $$j $$f.base;					\
+	done;								\
+	echo =========================;					\
+	echo "Duplicate messages, both id and message (this is okay):";	\
+	sed '/^$$/d' < $$f.base | LANG=C sort | uniq -c |			\
+	awk '$$1 != 1 { print $$0 }' | sort -n;				\
+	echo =========================) > $c
+.endfor
+
+english.base: dump ${SCAN} #Makefile
+	./dump ${SCAN} |\
+	sed -e '/|/!d' \
+	    -e 's/|/ "/' \
+	    -e 's/^"//' |\
+	sort -nu > $@
+
+
+dump: dump.c
+	${CC} -o dump ${.ALLSRC}
+
+CLEANFILES+= dump ${CAT} english.base *.check __ck1 __ck2
+
+CATALOGS= ${CAT}
+NLLINKS= nl_NL
+ENLINKS= en_AU en_CA en_GB en_NZ en_US
+FRLINKS= fr_BE fr_CA fr_CH fr_FR
+DELINKS= de_AT de_CH de_DE
+ESLINKS= es_ES
+SVLINKS= sv_SE
+PLLINKS= pl_PL
+
+FILES=	${CATALOGS}
+FILESDIR= /usr/share/vi/catalog
+SYMLINKS=
+.for l in ${NLLINKS}
+SYMLINKS+= dutch ${FILESDIR}/$l.ISO8859-1
+SYMLINKS+= dutch ${FILESDIR}/$l.ISO8859-15
+SYMLINKS+= dutch.UTF-8 ${FILESDIR}/$l.UTF-8
+.endfor
+.for l in ${ENLINKS}
+SYMLINKS+= english ${FILESDIR}/$l.ISO8859-1
+SYMLINKS+= english ${FILESDIR}/$l.ISO8859-15
+SYMLINKS+= english ${FILESDIR}/$l.US-ASCII
+SYMLINKS+= english ${FILESDIR}/$l.UTF-8
+.endfor
+SYMLINKS+= english ${FILESDIR}/POSIX
+SYMLINKS+= english ${FILESDIR}/C
+.for l in ${FRLINKS}
+SYMLINKS+= french ${FILESDIR}/$l.ISO8859-1
+SYMLINKS+= french ${FILESDIR}/$l.ISO8859-15
+SYMLINKS+= french.UTF-8 ${FILESDIR}/$l.UTF-8
+.endfor
+.for l in ${DELINKS}
+SYMLINKS+= german ${FILESDIR}/$l.ISO8859-1
+SYMLINKS+= german ${FILESDIR}/$l.ISO8859-15
+SYMLINKS+= german.UTF-8 ${FILESDIR}/$l.UTF-8
+.endfor
+.for l in ${ESLINKS}
+SYMLINKS+= spanish ${FILESDIR}/$l.ISO8859-1
+SYMLINKS+= spanish ${FILESDIR}/$l.ISO8859-15
+SYMLINKS+= spanish.UTF-8 ${FILESDIR}/$l.UTF-8
+.endfor
+.for l in ${SVLINKS}
+SYMLINKS+= swedish ${FILESDIR}/$l.ISO8859-1
+SYMLINKS+= swedish ${FILESDIR}/$l.ISO8859-15
+SYMLINKS+= swedish.UTF-8 ${FILESDIR}/$l.UTF-8
+.endfor
+.for l in ${PLLINKS}
+SYMLINKS+= polish ${FILESDIR}/$l.ISO8859-2
+SYMLINKS+= polish.UTF-8 ${FILESDIR}/$l.UTF-8
+.endfor
+SYMLINKS+= zh_CN.GB2312 ${FILESDIR}/zh_CN.GB18030
+SYMLINKS+= zh_CN.GB2312 ${FILESDIR}/zh_CN.GBK
+SYMLINKS+= zh_CN.GB2312 ${FILESDIR}/zh_CN.eucCN
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/vi/catalog/dutch.UTF-8.base b/usr.bin/vi/catalog/dutch.UTF-8.base
new file mode 100644
index 0000000..eca193c
--- /dev/null
+++ b/usr.bin/vi/catalog/dutch.UTF-8.base
@@ -0,0 +1,306 @@
+002 "regel te lang"
+003 "kan regel %lu niet verwijderen"
+004 "kan niet toevoegen aan regel %lu"
+005 "kan niet invoegen vooraan regel %lu"
+006 "kan regel %lu niet opslaan"
+007 "kan laatste regel niet lezen"
+008 "Fout: kan regel %lu niet vinden"
+009 "log bestand"
+010 "Er vindt geen logging plaats, kan wijzigingen niet ongedaan maken"
+011 "geen wijzigingen om ongedaan te maken"
+012 "Er vindt geen logging plaats, kan wijzigingen niet ongedaan maken"
+013 "Er vindt geen logging plaats, herhaling niet mogelijk"
+014 "geen wijzigingen om te herhalen"
+015 "%s/%d: schrijven naar log mislukt"
+016 "Vi's standaard invoer en uitvoer moeten aan een terminal gekoppeld zijn"
+017 "Merk %s: niet gezet"
+018 "Merk %s: de regel is verwijderd"
+019 "Merk %s: de cursor positie bestaat niet meer"
+020 "Fout: "
+021 "nieuw bestand"
+022 "naam veranderd"
+023 "gewijzigd"
+024 "ongewijzigd"
+025 "NIET BEVEILIGD"
+026 "niet schrijfbaar"
+027 "regel %lu uit %lu [%ld%%]"
+028 "leeg bestand"
+029 "regel %lu"
+030 "Het bestand %s is geen message catalog"
+031 "Niet in staat om de standaard %s optie in te stellen"
+032 "Gebruik: %s"
+033 "set: optie %s onbekend: 'set all' laat alle opties zien"
+034 "set: [no]%s optie kan geen waarde hebben"
+035 "set: %s optie moet een waarde hebben"
+036 "set: %s optie: %s"
+037 "set: %s optie: %s: getal is te groot"
+038 "set: %s optie: %s is een ongeldige waarde"
+039 "set: %s optie moet een waarde hebben"
+040 "Te weinig kolommen op het scherm, minder dan %d"
+041 "Aantal kolommen te groot, meer dan %d"
+042 "Te weinig regels op het scherm, minder dan %d"
+043 "Aantal regels te groot, meer dan %d"
+044 "De lisp optie is niet ondersteund"
+045 "messages niet uitgeschakeld: %s"
+046 "messages niet geactiveerd: %s"
+047 "De %s optie moet karakter paren bevatten"
+053 "De standaard buffer is leeg"
+054 "Buffer %s is leeg"
+055 "Bestanden met newlines in de naam kunnen niet hersteld worden"
+056 "Wijzigingen kunnen niet ongedaan gemaakt worden als deze sessie mislukt"
+057 "Bestand wordt gecopieerd voor herstel..."
+058 "Herstel mechanisme werkt niet: %s"
+059 "Wijzigingen kunnen niet ongedaan gemaakt worden als deze sessie mislukt"
+060 "Kon bestand niet veilig stellen: %s"
+061 "Bestand wordt gecopieerd voor herstel..."
+062 "Informatie met betrekking tot gebruiker nummer %u niet gevonden"
+063 "Kan herstel bestand niet beveiligen"
+064 "herstel buffer overgelopen"
+065 "herstel bestand"
+066 "%s: verminkt herstel bestand"
+067 "%s: verminkt herstel bestand"
+068 "U heeft geen bestand genaamd %s te herstellen"
+069 "U kan eerdere versies van dit bestand herstellen"
+070 "U kan nog meer bestanden herstellen"
+071 "kan geen email versturen: %s"
+072 "Bestand leeg; niets om te doorzoeken"
+073 "Einde van het bestand bereikt zonder dat het patroon gevonden is"
+074 "Geen vorig zoek patroon"
+075 "Patroon niet gevonden"
+076 "Begin van het bestand bereikt zonder dat het patroon gevonden is"
+077 "Zoek-operatie omgeslagen"
+078 "Bezig met zoeken..."
+079 "Geen niet-printbaar karakter gevonden"
+080 "Onbekend commando"
+082 "Commando niet beschikbaar in ex mode"
+083 "Aantal mag niet nul zijn"
+084 "%s: ongeldige regel aanduiding"
+085 "Interne fout in syntax tabel (%s: %s)"
+086 "Gebruik: %s"
+087 "%s: tijdelijke buffer niet vrijgegeven"
+088 "Vlag offset voor regel 1"
+089 "Vlag offset voorbij bestands einde"
+090 "bestand/scherm veranderd tijdens uitvoeren van @ in een blok"
+091 "bestand/scherm veranderd tijdens uitvoeren van globaal/v commando"
+092 "Ex commando mislukt: rest van commando(s) genegeerd"
+093 "Ex commando mislukt: gemappede toetsen genegeerd"
+094 "Het tweede adres is kleiner dan het eerste"
+095 "Geen merk naam opgegeven"
+096 "\\ niet gevolgd door / of ?"
+097 "Referentie aan een regel nummer kleiner dan 0"
+098 "Het %s commando is onbekend"
+099 "Adres waarde te groot"
+100 "Adres waarde te klein"
+101 "Ongeldige adres combinatie"
+102 "Ongeldig adres: slechts %lu regels in het bestand aanwezig"
+103 "Ongeldig adres: het bestand is leeg"
+104 "Het %s commando staat het adres 0 niet toe"
+105 "Geen afkortingen om weer te geven"
+106 "Afkortingen moeten eindigen met een \"woord\" letter"
+107 "Afkortingen mogen geen tabulaties of spaties bevatten"
+108 "Afkortingen mogen geen woord/niet-woord karakters mengen, behalve aan het einde"
+109 "\"%s\" is geen afkorting"
+110 "Vi commando mislukt: gemappede toetsen genegeerd"
+111 "Dit is het laatste bestand"
+112 "Dit is het eerste bestand"
+113 "Dit is het eerste bestand"
+114 "lijst met bestanden is leeg"
+115 "Geen voorgaand commando om \"!\" te vervangen"
+116 "Geen bestandsnaam voor %%"
+117 "Geen bestandsnaam voor #"
+118 "Fout: execl: %s"
+119 "I/O fout: %s"
+120 "Bestand gewijzigd sinds laatste schrijfactie; schrijf het weg of gebruik ! om het te forceren"
+121 "Kan uw home directory niet vinden"
+122 "Nieuwe huidige directory: %s"
+123 "Geen cut buffers aanwezig"
+124 "Het %s commando kan niet gebruikt worden in een globaal of v commando"
+125 "%s/%s: niet gelezen: noch U noch root is de eigenaar"
+126 "%s/%s: niet gelezen: U bent niet de eigenaar"
+127 "%s/%s: niet gelezen: kan gewijzigd worden door andere gebruikers"
+128 "%s: niet gelezen: noch U noch root is de eigenaar"
+129 "%s: niet gelezen: U bent niet de eigenaar"
+130 "%s: niet gelezen: kan gewijzigd worden door andere gebruikers"
+131 "Geen volgende regel om samen te voegen"
+132 "Geen input map entries"
+133 "Geen command map entries"
+134 "Het %s karakter kan niet ge-remapped worden"
+135 "\"%s\" is niet gemapped"
+136 "Merk naam moet een enkel karakter zijn"
+137 "%s bestaat al, niet weggeschreven; gebruik ! om het te forceren"
+138 "Nieuw .exrc bestand: %s. "
+139 "doel regel ligt in het blok"
+140 "Het open commando vereist dat de open optie actief is"
+141 "Het open commando is nog niet ondersteund"
+142 "Kan dit bestand niet veilig stellen"
+143 "Bestand veilig gesteld"
+144 "%s resulteert in te veel bestandsnamen"
+145 "Alleen echte bestanden en named pipes kunnen gelezen worden"
+146 "%s: lees beveiliging niet beschikbaar"
+147 "Bezig met lezen..."
+148 "%s: %lu regels, %lu karakters"
+149 "Geen achtergrond schermen aanwezig"
+150 "Het script commando is alleen beschikbaar in vi mode"
+151 "Geen comando om uit te voeren"
+152 "shiftwidth optie op 0 gezet"
+153 "Count te groot"
+154 "Count te klein"
+155 "Reguliere expressie opgegeven; r vlag heeft geen betekenis"
+156 "De #, l en p vlaggen kunnen niet gecombineerd worden met de c vlag in vi mode"
+157 "Geen match gevonden"
+158 "Geen voorafgaande tag aanwezig"
+159 "Minder dan %s elementen op de tags stapel; gebruik :display t[ags]"
+160 "Geen bestand genaamd %s op de tags stapel; gebruik :display t[ags]"
+161 "Kies Enter om door te gaan: "
+162 "%s: tag niet gevonden"
+163 "%s: verminkte tag in %s"
+164 "%s: Het regel nummer van deze tag is voorbij het einde van het bestand"
+165 "De tags stapel is leeg"
+166 "%s: zoek patroon niet gevonden"
+167 "%d andere bestanden te wijzigen"
+168 "Buffer %s is leeg"
+169 "Bevestig wijziging? [n]"
+170 "Onderbroken"
+171 "Geen voorafgaande buffer om uit te voeren"
+172 "Geen vorige reguliere expressie"
+173 "Het %s commando vereist dat er een bestand geladen is"
+174 "Gebruik: %s"
+175 "Het visual commando vereist dat de open optie actief is"
+177 "Leeg bestand"
+178 "Geen voorafgaand F, f, T of t zoek commando"
+179 "%s niet gevonden"
+180 "Geen voorafgaand bestand te bewerken"
+181 "Cursor niet op een getal"
+182 "Getal wordt te groot"
+183 "Getal wordt te klein"
+184 "Geen overeenkomstig karakter op deze regel"
+185 "Overeenkomstig karakter niet gevonden"
+186 "Geen karakters te vervangen"
+187 "Geen ander scherm aanwezig"
+188 "Karakters achter het zoek patroon, de regel offset, en/of het z commando"
+189 "Geen voorafgaand zoek patroon"
+190 "Zoekopdracht na omslag teruggekeerd op originele positie"
+191 "Afkorting overschrijdt expansie limiet: karakters genegeerd"
+192 "Ongeldig karakter; quote to enter"
+193 "Reeds aan het begin van de invoer"
+194 "Niet meer karakters te verwijderen"
+195 "Verplaatsing voorbij het einde van het bestand"
+196 "Verplaatsing voorbij het einde van de regel"
+197 "Cursor niet verplaatst"
+198 "Reeds aan het begin van het bestand"
+199 "Verplaatsing voorbij het begin van het bestand"
+200 "Reeds in de eerste kolom"
+201 "Buffers moeten voor het commando opgegeven worden"
+202 "Reeds bij het einde van het bestand"
+203 "Reeds bij het einde van de regel"
+204 "%s is geen vi commando"
+205 "Gebruik: %s"
+206 "Geen karakters te verwijderen"
+207 "Het Q commando vereist de ex terminal interface"
+208 "Geen commando om te herhalen"
+209 "Het bestand is leeg"
+210 "%s mag niet gebruikt worden als een verplaatsings commando"
+211 "Al in commando mode"
+212 "Cursor niet in een woord"
+214 "Windows optie waarde is te groot, maximum is %u"
+215 "Toevoegen"
+216 "Veranderen"
+217 "Commando"
+218 "Invoegen"
+219 "Vervangen"
+220 "Verplaatsing voorbij het eind van het scherm"
+221 "Verplaatsing voorbij het begin van het scherm"
+222 "Scherm moet meer dan %d regels hebben om het te kunnen splitsen"
+223 "Er zijn geen achtergrond schermen"
+224 "Er is geen achtergrond scherm waarin U bestand %s aan het bewerken bent"
+225 "U kan uw enige scherm niet in de achtergrond zetten"
+226 "Het scherm kan slechts verkleind worden tot %d regels"
+227 "Het scherm kan niet kleiner"
+228 "Het scherm kan niet groter"
+230 "Dit scherm kan niet gesuspend worden"
+231 "Onderbroken: gemappede toetsen genegeerd"
+232 "vi: tijdelijke buffer niet vrijgegeven"
+233 "Deze terminal heeft geen %s toets"
+234 "Er kan slechts een buffer opgegeven worden"
+235 "Getal groter dan %lu"
+236 "Onderbroken"
+237 "Aanmaken van tijdelijk bestand is mislukt"
+238 "Waarschuwing: %s is geen regulier bestand"
+239 "%s is al geopend, bestand is in deze sessie niet schrijfbaar"
+240 "%s: verwijdering mislukt"
+241 "%s: sluiting mislukt"
+242 "%s: verwijdering mislukt"
+243 "%s: verwijdering mislukt"
+244 "Bestand niet schrijfbaar, niet weggeschreven; gebruik ! om het te forceren"
+245 "Bestand niet schrijfbaar, niet weggeschreven"
+246 "%s bestaat al, niet weggeschreven; gebruik ! om het te forceren"
+247 "%s bestaat al, niet weggeschreven"
+248 "Gebruik ! om een incompleet bestand weg te schrijven"
+249 "Bestand incompleet, niet weggeschreven"
+250 "%s: bestand op disk nieuwer dan deze versie; gebruik ! om het te forceren"
+251 "%s: bestand op disk nieuwer dan deze versie"
+252 "%s: schrijf beveiliging niet beschikbaar"
+253 "Bezig met schrijven..."
+254 "%s: WAARSCHUWING: BESTAND INCOMPLEET"
+255 "Reeds op de eerste tag van deze groep"
+256 "%s: nieuw bestand: %lu regels, %lu karakters"
+257 "%s: %lu regels, %lu karakters"
+258 "%s resulteert in te veel bestandsnamen"
+259 "%s: geen normaal bestand"
+260 "%s: U bent niet de eigenaar"
+261 "%s: kan gewijzigd worden door andere gebruikers"
+262 "Bestand gewijzigd sinds laatste schrijfactie; schrijf het weg of gebruik ! om het te forceren"
+263 "Bestand gewijzigd sinds laatste schrijfactie; schrijf het weg of gebruik :edit! om het te forceren"
+264 "Bestand gewijzigd sinds laatste schrijfactie; schrijf het weg of gebruik ! om het te forceren"
+265 "Tijdelijk bestand; exit negeert wijzigingen"
+266 "Bestand niet schrijfbaar, wijzigingen niet automatisch weggeschreven"
+267 "log opnieuw gestart"
+268 "Bevestig? [ynq]"
+269 "Druk op een toets om door te gaan: "
+270 "Druk op een toets om door te gaan [: voor meer ex commandos]: "
+271 "Druk op een toets om door te gaan [q om te stoppen]: "
+272 "Deze vorm van %s vereist de ex terminal interface"
+273 "Entering ex input mode."
+274 "Commando mislukt, nog geen bestand geladen."
+275 " doorgaan?"
+276 "Onverwacht character event"
+277 "Onverwacht end-of-file event"
+278 "Geen match gevonden voor dit patroon"
+279 "Onverwacht interrupt event"
+280 "Onverwacht quit event"
+281 "Onverwacht repaint event"
+282 "Reeds op de laatste tag van deze groep"
+283 "Het %s command vereist de ex terminal interface"
+284 "Deze vorm van %s is niet ondersteund als de secure edit optie actief is"
+285 "Onverwacht string event"
+286 "Onverwacht timeout event"
+287 "Onverwacht write event"
+289 "Shell expansies zijn niet ondersteund als de secure edit optie actief is"
+290 "Het %s commando is niet ondersteund als de secure edit optie actief is"
+291 "set: %s mag niet uitgezet worden"
+292 "Scherm te klein."
+293 "toegevoegd"
+294 "gewijzigd"
+295 "verwijderd"
+296 "samengevoegd"
+297 "verplaatst"
+298 "verschoven"
+299 "gebufferd"
+300 "regel"
+301 "regels"
+302 "Vi was niet geladen met een Tcl interpreter"
+303 "Bestand gewijzigd sinds het de laatste keer weg is geschreven."
+304 "Shell expansie mislukt"
+305 "Geen %s edit optie opgegeven"
+306 "Vi was niet geladen met een Perl interpreter"
+307 "Geen ex commando om uit te voeren"
+308 "Kies <CR> om commando uit te voeren, :q om te stoppen"
+309 "Gebruik \"cscope help\" voor uitleg"
+310 "Nog geen cscope connectie aanwezig"
+311 "%s: onbekend zoek type: gebruik een van %s"
+312 "%d: onbekende cscope sessie"
+313 "set: de %s optie mag nooit aangezet worden"
+314 "set: de %s optie mag nooit op 0 gezet worden"
+315 "%s: toegevoegd: %lu regels, %lu karakters"
+316 "Onverwacht resize event"
+317 "%d bestanden te wijzigen"
diff --git a/usr.bin/vi/catalog/french.UTF-8.base b/usr.bin/vi/catalog/french.UTF-8.base
new file mode 100644
index 0000000..eb6aad0
--- /dev/null
+++ b/usr.bin/vi/catalog/french.UTF-8.base
@@ -0,0 +1,306 @@
+002 "Dépassement de longueur de ligne"
+003 "impossible de supprimer la ligne %lu"
+004 "impossible d'ajouter à la ligne %lu"
+005 "impossible d'insérer devant la ligne %lu"
+006 "impossible de stocker la ligne %lu"
+007 "impossible d'obtenir la dernière ligne"
+008 "Erreur : impossible de récupérer la ligne %lu"
+009 "Fichier journal"
+010 "Aucune journalisation n'étant effectuée, impossible d'annuler"
+011 "Aucune action à annuler"
+012 "Aucune journalisation n'étant effectuée, impossible d'annuler"
+013 "Aucune journalisation n'étant effectuée, reprise actualisée impossible"
+014 "Aucune action à refaire"
+015 "%s/%d : Erreur d'écriture de journal"
+016 "L'entrée et la sortie Vi standards doivent être un terminal"
+017 "Marque %s : non définie"
+018 "Marque %s : la ligne a été supprimée"
+019 "Marque %s : la position du curseur n'existe plus"
+020 "Erreur : "
+021 "nouveau fichier"
+022 "le nom a changé"
+023 "modifié"
+024 "non modifié"
+025 "DÉVERROUILLÉ"
+026 "lecture seule"
+027 "ligne %lu de %lu [%ld%%]"
+028 "fichier vide"
+029 "ligne %lu"
+030 "Ce fichier %s n'est pas un catalogue de messages"
+031 "Impossible de configurer option %s par défaut"
+032 "Utilisation : %s"
+033 "Définition : pas d'option %s : 'set all' donne toutes les valeurs optionnelles"
+034 "Définition : option [no]%s ne prend pas de valeur"
+035 "Définition : l'option %s n'est pas booléenne"
+036 "Définition : option %s : %s"
+037 "Définition : option %s : %s : Dépassement de valeur"
+038 "Définition : option %s : %s n'est pas un nombre valide"
+039 "Définition : l'option %s n'est pas booléenne"
+040 "Les colonnes de l'écran sont trop petites, inférieures à %d"
+041 "Les colonnes de l'écran sont trop grandes, supérieures à %d"
+042 "Les lignes de l'écran sont trop courtes, inférieures à %d"
+043 "Les lignes de l'écran sont trop longues, supérieures à %d"
+044 "L'option lisp n'est pas implémentée"
+045 "Les messages ne sont pas désactivés : %s"
+046 "Les messages ne sont pas activés : %s"
+047 "L'option de %s doit être en groupe de deux caractères"
+053 "Le tampon par défaut est vide"
+054 "Le tampon %s est vide"
+055 "Les fichiers dont le nom contient des caractères de saut de ligne sont irrécupérables"
+056 "Impossible de récupérer les modifications si la session échoue"
+057 "Copie en cours du fichier pour récupération..."
+058 "La préservation a échoué : %s"
+059 "Impossible de récupérer les modifications si la session échoue"
+060 "La sauvegarde du fichier a échoué : %s"
+061 "Copie en cours du fichier pour récupération..."
+062 "Les renseignements sur l'identité %u de l'utilisateur sont introuvables"
+063 "Impossible de verrouiller le fichier de récupération"
+064 "Débordement de tampon du fichier de récupération"
+065 "Fichier de récupération"
+066 "%s : Fichier de récupération malformé"
+067 "%s : Fichier de récupération malformé"
+068 "Aucun fichier nommé %s à récupérer, que vous puissiez lire"
+069 "Il existe des versions récupérables antérieures à ce fichier"
+070 "Vous avez d'autres fichiers à récupérer"
+071 "pas d'envoi d'email : %s"
+072 "Fichier vide, rien à rechercher"
+073 "Fin de fichier atteinte sans trouver le motif"
+074 "Pas de motif de recherche précédent"
+075 "Motif introuvable"
+076 "Début du fichier atteint sans trouver le motif"
+077 "La recherche est revenue à son point de départ"
+078 "Recherche en cours..."
+079 "Caractère non-imprimable introuvable"
+080 "Nom de commande inconnu"
+082 "%s : Commande non disponible en ex mode"
+083 "Le compteur ne peut être zéro"
+084 "%s : mauvaise spécification de ligne"
+085 "Erreur de tableau de syntaxe interne (%s: %s)"
+086 "Utilisation : %s"
+087 "%s : tampon temporaire non libéré"
+088 "Décalage de drapeau hors de la ligne 1"
+089 "Décalage de drapeau hors de la fin du fichier"
+090 "@ avec plage, en cours d'exécution quand le fichier/l'écran a changé"
+091 "Commande Global/v en cours d'exécution quand le fichier/l'écran a changé"
+092 "La commande ex a échoué : commandes en attente abandonnées"
+093 "La commande ex a échoué : les touches affectées sont abandonnées"
+094 "La deuxième adresse est plus petite que la première"
+095 "Aucun nom de marque fourni"
+096 "\\ non suivi par / ou ?"
+097 "Référence à un numéro de ligne inférieure à 0"
+098 "La commande %s est inconnue"
+099 "Dépassement de la valeur adresse"
+100 "Dépassement négatif de la valeur adresse"
+101 "Combinaison d'adresse non valide"
+102 "Adresse non valide : il n'y a que %lu lignes dans ce fichier"
+103 "Adresse non valide : le fichier est vide"
+104 "La commande %s ne permet pas une adresse de 0"
+105 "Pas d'abréviations à afficher"
+106 "Les abréviations doivent finir par un caractère \"mot\""
+107 "Les abréviations ne peuvent pas contenir de tabulations ni d'espaces"
+108 "Les abréviations ne peuvent pas contenir un mélange de caractères mot/non-mot, sauf à la fin"
+109 "\"%s\" n'est pas une abréviation"
+110 "La commande Vi a échoué : Les touches affectées ont été abandonnées"
+111 "Plus de fichiers à éditer"
+112 "Pas de fichiers précédents à éditer"
+113 "Pas de fichiers précédents à rembobiner"
+114 "Pas de liste de fichiers à afficher"
+115 "Pas de commande précédente à remplacer \"!\""
+116 "Pas de nom de fichier à substituer à %%"
+117 "Pas de nom de fichier à substituer à #"
+118 "Erreur : execl : %s"
+119 "Erreur E/S : %s"
+120 "Fichier modifié depuis la dernière écriture complète ; écrire ou utiliser ! pour outrepasser"
+121 "Impossible de trouver l'emplacement du répertoire d'origine"
+122 "Nouveau répertoire en cours : %s"
+123 "Pas de tampon de coupure à afficher"
+124 "La commande %s ne peut pas être utilisée à l'intérieur d'une commande globale ou commande v"
+125 "%s/%s : échec de source : ni vous ni le super-utilisateur n'êtes les propriétaires "
+126 "%s/%s : échec de source : vous n'êtes pas le propriétaire"
+127 "%s/%s : échec de source : peut être écrit par un utilisateur autre que le propriétaire"
+128 "%s : échec de source : ni vous ni le super-utilisateur n'êtes les propriétaires"
+129 "%s : échec de source : vous n'êtes pas le propriétaire"
+130 "%s : échec de source : peut être écrit par un utilisateur autre que le propriétaire"
+131 "Pas de lignes suivantes à joindre"
+132 "Pas d'entrées de mappage d'entrée"
+133 "Pas d'entrées de mappage de commandes"
+134 "Le caractère %s ne peut pas être remappé"
+135 "\"%s\" n'est pas actuellement mappé"
+136 "Les noms de marque ne doivent avoir qu'un caractère"
+137 "%s existe, non enregistré; utiliser ! pour outrepasser"
+138 "Nouveau fichier exrc : %s"
+139 "La ligne de destination est à l'intérieur de la plage à déplacer"
+140 "La commande ouverte nécessite que l'option ouverte soit définie"
+141 "La commande ouverte n'est pas encore implémentée"
+142 "La préservation de ce fichier est impossible"
+143 "Fichier préservé"
+144 "%s: étendu dans trop de noms de fichiers"
+145 "Vous ne pouvez lire que les fichiers standards et les canaux de transmission nommés"
+146 "%s: Interdiction de lecture non disponible"
+147 "Lecture en cours..."
+148 "%s: %lu lignes, %lu caractères"
+149 "Pas d'écrans d'arrière-plan à afficher"
+150 "La commande script n'est disponible qu'en mode vi"
+151 "Pas de commande à exécuter"
+152 "Option de largeur de décalage définie sur 0"
+153 "Compter dépassement"
+154 "Compter dépassement négatif"
+155 "Expression standard spécifiée; drapeau r superflu"
+156 "Vous ne pouvez pas en mode vi, combiner les drapeaux #, l et p avec le drapeau c"
+157 "Aucune correspondance trouvée"
+158 "Aucune marque précédente entrée"
+159 "Moins de %s entrées dans la pile de marques ; utilisez t[ags]"
+160 "Pas de fichier %s vers lequel retourner dans la pile de marques ; utiliser : affichage t[ags]"
+161 "Appuyez sur Entrée pour continuer :"
+162 "%s : marque introuvable"
+163 "%s : marque corrompue en %s"
+164 "%s : le numéro de ligne de la marque dépasse la fin du fichier"
+165 "La pile de marques est vide"
+166 "%s : motif de recherche introuvable"
+167 "%d fichiers supplémentaires à éditer"
+168 "Le tampon %s est vide
+169 "Confirmer les changements ? [n]"
+170 "Interrompu"
+171 "Pas de tampon précédent à exécuter"
+172 "Pas d'expression standard précédente"
+173 "La commande %s nécessite qu'un fichier ait déjà été lu en mémoire"
+174 "Utilisation : %s"
+175 "La commande visual nécessite que l'option open soit définie"
+177 "Fichier vide"
+178 "Pas de recherche précédente F, f, T ou t"
+179 "%s introuvable"
+180 "Pas de fichier précédent à éditer"
+181 "Le curseur n'est pas dans un nombre"
+182 "Le nombre obtenu est trop grand"
+183 "Le nombre obtenu est trop petit"
+184 "Pas de correspondance de caractère sur cette ligne"
+185 "Caractère correspondant introuvable"
+186 "Pas de caractères à remplacer"
+187 "Pas d'autre écran vers lequel basculer"
+188 "Caractères après la chaîne de recherche, décalage de ligne et/ou commande z"
+189 "Pas de motif de recherche précédent"
+190 "La recherche est revenue à son point de départ"
+191 "L'abréviation a dépassé la limite de l'expansion : caractères abandonnés"
+192 "Caractère non valide ; guillemet pour saisir"
+193 "Déjà au début de l'insertion"
+194 "Plus de caractères à effacer"
+195 "Déplacement hors de fin de fichier"
+196 "Déplacement hors de fin de ligne"
+197 "Aucun mouvement de curseur n'a été effectué"
+198 "Déjà au début du fichier"
+199 "Déplacement hors du début du fichier"
+200 "Déjà dans la première colonne"
+201 "Les tampons doivent être spécifiés avant la commande"
+202 "Déjà à la fin du fichier"
+203 "Déjà à la fin de la ligne"
+204 "%s n'est pas une commande vi"
+205 "Utilisation : %s"
+206 "Pas de caractères à supprimer"
+207 "La commande Q nécessite une interface terminal ex"
+208 "Pas de commande à répéter"
+209 "Le fichier est vide"
+210 "Vous ne pouvez pas utiliser %s comme commande de déplacement"
+211 "Déjà en mode commande"
+212 "Le curseur n'est pas dans un mot"
+214 "Valeur optionnelle de fenêtre trop grande, maximum est %u"
+215 "Ajouter"
+216 "Changer"
+217 "Commande"
+218 "Insérer"
+219 "Remplacer"
+220 "Déplacement hors de la fin d'écran"
+221 "Déplacement hors du début d'écran"
+222 "L'écran doit être supérieur à %d lignes pour se fractionner"
+223 "Il n'y a pas d'écran d'arrière-plan"
+224 "Il n'y a pas d'écran d'arrière-plan qui édite un fichier nommé %s"
+225 "Vous ne pouvez pas mettre à l'arrière-plan votre seul écran affiché"
+226 "L'écran ne peut être réduit qu'à %d rangs"
+227 "L'écran n'est pas auto-réductible"
+228 "L'écran n'est pas auto-extensible"
+230 "Vous ne pouvez pas mettre cet écran en attente"
+231 "Interrompu : les touches affectées ont été abandonnées"
+232 "vi : le tampon temporaire n' a pas été libéré"
+233 "Ce terminal n'a pas de touche %s"
+234 "Vous ne pouvez spécifier qu'un seul tampon"
+235 "Nombre supérieur à %lu"
+236 "Interrompu"
+237 "Impossible de créer un fichier temporaire"
+238 "Avertissement : %s n'est pas un fichier standard"
+239 "%s déjà verrouillé, session en lecture seule"
+240 "%s: supprimer"
+241 "%s: fermer"
+242 "%s: supprimer"
+243 "%s: supprimer"
+244 "Fichier en lecture seule, non écrit, utiliser ! pour outrepasser"
+245 "Fichier en lecture seule, non écrit"
+246 "%s existe, non écrit; utiliser ! pour outrepasser"
+247 "%s existe, non écrit"
+248 "Fichier partiel, non écrit; utiliser ! pour outrepasser"
+249 "Fichier partiel, non écrit"
+250 "%s: fichier modifié plus récemment que cet exemplaire; utiliser ! pour outrepasser"
+251 "%s: fichier modifié plus récemment que cet exemplaire"
+252 "%s: interdiction d'écriture non disponible"
+253 "Ecriture en cours..."
+254 "%s: AVERTISSEMENT : FICHIER TRONQUÉ"
+255 "Première marque de ce groupe déjà atteinte"
+256 "%s: nouveau fichier : %lu lignes, %lu caractères"
+257 "%s: %lu lignes, %lu caractères"
+258 "%s étendue à trop de noms de fichiers"
+259 "%s: pas un fichier standard"
+260 "%s: ne vous appartient pas"
+261 "%s: accessible par un utilisateur autre que son propriétaire"
+262 "Fichier modifé depuis la dernière écriture complète ; écrire ou utiliser ! pour outrepasser "
+263 "Fichier modifé depuis la dernière écriture complète ; écrire ou utiliser :edit! pour outrepasser"
+264 "Fichier modifé depuis la dernière écriture complète ; écrire ou utiliser ! pour outrepasser"
+265 "Fichier temporaire ; quitter annulera les modifications"
+266 "Fichier en lecture seule ; les modifications ne sont pas écrites automatiquement"
+267 "Journal redémarré"
+268 "confirmer ? [ynq]"
+269 "Appuyez sur n'importe quelle touche pour continuer : "
+270 "Appuyez sur n'importe quelle touche pour continuer [: pour entrer plus de commandes ex] : "
+271 "Appuyez sur n'importe quelle touche pour continuer [q pour Quitter]: "
+272 "Cette forme de %s nécessite l'interface de terminal ex"
+273 "Entrée de mode entrée ex."
+274 "La commande a échoué, aucun fichier n'a encore été lu."
+275 "cont?"
+276 "Evénement imprévu de caractère"
+277 "Evénement imprévu de fin-de-fichier"
+278 "Pas de correspondances pour cette requête"
+279 "Evénement imprévu d'interruption"
+280 "Evénement quitter imprévu"
+281 "Evénement imprévu de rafraîchissement"
+282 "La dernière marque de ce groupe a déjà été atteinte"
+283 "La commande %s nécessite l'interface de terminal ex"
+284 "Cette forme de %s n'est pas reconnue quand l'option d'édition protégée est activée"
+285 "Evénement imprévu de chaîne"
+286 "Evénement imprévu de délai imparti"
+287 "Evénement d'écriture imprévu"
+289 "Les expansions du shell ne sont pas reconnues quand l'option d'édition protégée est activée"
+290 "La commande %s n'est pas reconnue quand l'option d'édition protégée est activée"
+291 "Définition : l'option %s ne peut pas être désactivée"
+292 "Affichage trop petit."
+293 "ajouté"
+294 "changé"
+295 "supprimé"
+296 "joint"
+297 "déplacé"
+298 "décalé"
+299 "coupé"
+300 "ligne"
+301 "lignes"
+302 "Vi n'a pas été chargé avec un interprétateur Tcl"
+303 "Ficher modifié depuis le dernier enregistrement."
+304 "L'expansion du shell a échoué"
+305 "Pas d'option d'édition %s spécifiée"
+306 "Vi n'a pas été chargé avec un interprétateur Perl"
+307 "Pas de commande ex à exécuter"
+308 "Entrez <CR> pour exécuter une commande, :q pour quitter"
+309 "Utiliser \"cscope help\" pour obtenir de l'aide"
+310 "Aucune connexion cscope n'est lancée"
+311 "%s : type de recherche inconnu : utiliser un des %s"
+312 "%d : Il n'existe pas de telle session cscope"
+313 "Définition : l'option %s ne peut jamais être activée"
+314 "Définition : l'option %s ne peut jamais être définie sur 0"
+315 "%s: joints : %lu lignes, %lu caractères"
+316 "événement imprévu de redimensionnement"
+317 "%d fichiers à éditer"
diff --git a/usr.bin/vi/catalog/german.UTF-8.base b/usr.bin/vi/catalog/german.UTF-8.base
new file mode 100644
index 0000000..956fd82
--- /dev/null
+++ b/usr.bin/vi/catalog/german.UTF-8.base
@@ -0,0 +1,306 @@
+002 "Zeilenlängen-Überlauf"
+003 "kann Zeile %lu nicht löschen"
+004 "kann an Zeile %lu nicht anfügen"
+005 "kann in Zeile %lu nicht einfügen"
+006 "kann Zeile %lu nicht speichern"
+007 "kann letzte Zeile nicht lesen"
+008 "Fehler: kann Zeile %lu nicht wiederherstellen"
+009 "Protokolldatei"
+010 "Keine Protokollierung aktiv, Rückgängigmachen nicht möglich"
+011 "Keine Änderungen rückgängig zu machen"
+012 "Keine Protokollierung aktiv, Rückgängigmachen nicht möglich"
+013 "Keine Protokollierung aktiv, Wiederholung von Änderungen nicht möglich"
+014 "Keine Änderungen zu wiederholen"
+015 "%s/%d: Protokollschreibfehler"
+016 "Vi's Standardein- und -ausgabe muß ein Terminal sein"
+017 "Marke %s: nicht gesetzt"
+018 "Marke %s: die Zeile wurde gelöscht"
+019 "Marke %s: Cursorposition existiert nicht mehr"
+020 "Fehler: "
+021 "neue Datei"
+022 "Name geändert"
+023 "geändert"
+024 "nicht geändert"
+025 "NICHT GELOCKT"
+026 "nur zum Lesen"
+027 "Zeile %lu von %lu [%ld%%]"
+028 "leere Datei"
+029 "Zeile %lu"
+030 "Die Datei %s ist kein Meldungskatalog"
+031 "Setzen der Voreinstellung für %s Option nicht möglich"
+032 "Benutzung: %s"
+033 "set: keine %s Option: 'set all' zeigt alle Optionen mit Werten an"
+034 "set: der [no]%s Option kann kein Wert zugewiesen werden"
+035 "set: %s ist keine Boolsche Option"
+036 "set: %s Option: %s"
+037 "set: %s Option: %s: Werte-Überlauf"
+038 "set: %s Option: %s ist eine ungültige Zahl"
+039 "set: %s ist keine Boolsche Option"
+040 "Bildschirm hat zu wenig Spalten, weniger als %d"
+041 "Bildschirm hat zu viele Spalten, mehr als %d"
+042 "Bildschirm hat zu wenig Zeilen, weniger als %d"
+043 "Bildschirm hat zu viele Zeilen, mehr als %d"
+044 "Die lisp-Option ist nicht implementiert"
+045 "Meldungen nicht abgeschaltet: %s"
+046 "Meldungen nicht eingeschaltet: %s"
+047 "Die %s-Option muß Gruppen zu zwei Zeichen enthalten"
+053 "Der Standardpuffer ist leer"
+054 "Puffer %s ist leer"
+055 "Dateien mit newlines im Namen sind nicht wiederherstellbar"
+056 "Änderungen nicht wiederherstellbar, falls die Editorsitzung schiefgeht"
+057 "kopiere Datei für Wiederherstellung ..."
+058 "Rettungsmechanismus funktioniert nicht: %s"
+059 "Änderungen nicht wiederherstellbar, falls die Editorsitzung schiefgeht"
+060 "Sicherung der Datei gescheitert: %s"
+061 "kopiere Datei für Wiederherstellung ..."
+062 "Informationen über den Benutzer mit id %u nicht gefunden"
+063 "Wiederherstellungsdatei kann nicht gelockt werden"
+064 "Puffer der Wiederherstellungsdatei übergelaufen"
+065 "Wiederherstellungsdatei"
+066 "%s: Wiederherstellungsdatei hat falsches Format"
+067 "%s: Wiederherstellungsdatei hat falsches Format"
+068 "Keine von Ihnen lesbaren Dateien mit Namen %s zum Wiederherstellen"
+069 "Es gibt ältere Versionen dieser Datei von Ihnen zum Wiederherstellen"
+070 "Sie haben noch andere Dateien zum Wiederherstellen"
+071 "schicke keine email: %s"
+072 "Datei leer; nichts zu suchen"
+073 "Dateiende erreicht, ohne das Suchmuster zu finden"
+074 "Kein altes Suchmuster"
+075 "Suchmuster nicht gefunden"
+076 "Dateianfang erreicht, ohne das Suchmuster zu finden"
+077 "Suche beginnt von vorn"
+078 "suche ..."
+079 "Keine nichtdruckbaren Zeichen gefunden"
+080 "Unbekannter Kommandoname"
+082 "%s: Kommando im ex-Modus nicht verfügbar"
+083 "Anzahl darf nicht Null sein"
+084 "%s: falsche Zeilenangabe"
+085 "Interner Syntaxtabellenfehler (%s: %s)"
+086 "Benutzung: %s"
+087 "%s: temporärer Puffer nicht freigegeben"
+088 "Flagoffset vor Zeile 1"
+089 "Flagoffset hinter dem Dateiende"
+090 "@ mit Bereich lief, als Datei/Anzeige geändert wurde"
+091 "globales oder v-Kommando lief, als Datei/Anzeige geändert wurde"
+092 "Ex-Kommando mißlungen: restliche Kommandoeingabe ignoriert"
+093 "Ex-Kommando mißlungen: umdefinierte Tasten ungültig"
+094 "Die zweite Adresse ist kleiner als die erste"
+095 "Kein Markenname angegeben"
+096 "\\ ohne folgenden / oder ?"
+097 "Referenz auf eine negative Zeilennummer"
+098 "Das Kommando %s ist unbekannt"
+099 "Adreßwert zu groß"
+100 "Adreßwert zu klein"
+101 "Ungültige Adreßkombination"
+102 "Ungültige Adresse: nur %lu Zeilen in der Datei"
+103 "Ungültige Adresse: die Datei ist leer"
+104 "Das Kommando %s erlaubt keine Adresse 0"
+105 "Keine Abkürzungen zum Anzeigen"
+106 "Abkürzungen müssen mit einem \"Wort\"-Zeichen enden"
+107 "Abkürzungen dürfen keine Tabulator- oder Leerzeichen enthalten"
+108 "In Abkürzungen dürfen außer am Ende Wort- und Nicht-Wort-Zeichen nicht gemischt werden"
+109 "\"%s\" ist keine Abkürzung"
+110 "Vi Kommando mißlungen: umdefinierte Tasten ungültig"
+111 "Keine weiteren Dateien zu editieren"
+112 "Keine vorhergehenden Dateien zu editieren"
+113 "Keine vorhergehenden Dateien für rewind"
+114 "Keine Dateiliste zum Anzeigen"
+115 "Kein vorhergehendes Kommando, um \"!\" zu ersetzen"
+116 "Kein Dateiname für %%"
+117 "Kein Dateiname für #"
+118 "Fehler: execl: %s"
+119 "E/A-Fehler: %s"
+120 "Datei wurde seit dem letzten vollständigen Schreiben geändert; schreibe oder verwende ! zum ignorieren"
+121 "Kann Homedirectory nicht bestimmen"
+122 "Neues aktuelles Directory: %s"
+123 "Keine Puffer anzuzeigen"
+124 "Das Kommando %s kann nicht als Teil eines global oder v Kommandos verwendet werden"
+125 "%s/%s: nicht gelesen: gehört weder Ihnen noch root"
+126 "%s/%s: nicht gelesen: gehört nicht Ihnen"
+127 "%s/%s: nicht gelesen: anderer Benutzer als Eigentümer hat Schreibrecht"
+128 "%s: nicht gelesen: gehört weder Ihnen noch root"
+129 "%s: nicht gelesen: gehört nicht Ihnen"
+130 "%s: nicht gelesen: anderer Benutzer als Eigentümer hat Schreibrecht"
+131 "Keine folgenden Zeilen zum Verbinden"
+132 "Kein input-Map Eintrag"
+133 "Kein command-Map Eintrag"
+134 "Das %s Zeichen kann nicht umgemappt werden"
+135 "\"%s\" ist momentan nicht gemappt"
+136 "Markennamen müssen einzelne Buchstaben sein"
+137 "%s existiert, nicht geschrieben; verwende ! zum Überschreiben"
+138 "Neue .exrc Datei: %s. "
+139 "Zielzeile ist innerhalb des Verschiebebereichs"
+140 "Das open Kommando verlangt, daß die open Option gesetzt ist"
+141 "Das open Kommando ist nocht nicht implementiert"
+142 "Rettung dieser Datei nicht möglich"
+143 "Datei gerettet"
+144 "%s wurde in zu viele Dateinamen expandiert"
+145 "Nur reguläre Dateien und named pipes können gelesen werden"
+146 "%s: Locken zum Lesen war nicht möglich"
+147 "lese ..."
+148 "%s: %lu Zeilen, %lu Zeichen"
+149 "Keine Hintergrundanzeigen vorhanden"
+150 "Das script Kommando ist nur im vi Modus verfügbar"
+151 "Kein Kommando auszuführen"
+152 "shiftwidth Option auf 0 gesetzt"
+153 "Anzahl-Überlauf"
+154 "Anzahl-Unterlauf"
+155 "Regulärer Ausdruck angegeben; r Flag bedeutungslos"
+156 "Die #, l und p Flags können im vi Modus nicht mit dem c Flag kombiniert werden"
+157 "Keine Übereinstimmung gefunden"
+158 "Kein vorhergehender 'tag' angegeben"
+159 "Weniger als %s Einträge auf dem 'tag'-Stack; verwende :display t[ags]"
+160 "Keine Datei namens %s auf dem 'tag'-Stack; verwende :display t[ags]"
+161 "Drücke Enter um fortzufahren: "
+162 "%s: 'tag' nicht gefunden"
+163 "%s: kaputter 'tag' in %s"
+164 "%s: die Zeilennummer des 'tag' ist hinter dem Dateiende"
+165 "Der 'tag' Stack ist leer"
+166 "%s: Suchmuster nicht gefunden"
+167 "%d weitere Dateien zu editieren"
+168 "Puffer %s ist leer"
+169 "Bestätige Änderung [n]"
+170 "Unterbrochen."
+171 "Kein vorhergehender Puffer zum Ausführen"
+172 "Kein vorhergehender regulärer Ausdruck"
+173 "Das Kommando %s verlangt, daß bereits eine Datei eingelesen wurde"
+174 "Benutzung: %s"
+175 "Das visual Kommando verlangt daß die open Option gesetzt ist"
+177 "Leere Datei"
+178 "Keine vorhergehende F, f, T oder t Suche"
+179 "%s nicht gefunden"
+180 "Keine vorhergehende Datei zu editieren"
+181 "Cursor nicht auf einer Zahl"
+182 "Sich ergebende Zahl ist zu groß"
+183 "Sich ergebende Zahl ist zu klein"
+184 "Kein korrespondierendes Zeichen in dieser Zeile"
+185 "Korrespondierendes Zeichen nicht gefunden"
+186 "Keine Zeichen zu ersetzen"
+187 "Keine andere Anzeige zum Hinschalten"
+188 "Zeichen nach Suchmuster, Zeilenoffset und/oder z Kommando"
+189 "Kein altes Suchmuster"
+190 "Suche zur ursprünglichen Position zurückgekehrt"
+191 "Abkürzung überschreitet Expansionsgrenze: Zeichen weggelassen"
+192 "Nicht erlaubtes Zeichen; maskiere zum Eingeben"
+193 "Bereits am Anfang der Eingabe"
+194 "Keine weiteren Zeichen zu löschen"
+195 "Bewegung hinter das Dateiende"
+196 "Bewegung hinter das Zeilenende"
+197 "Keine Cursorbewegung gemacht"
+198 "Bereits am Dateianfang"
+199 "Bewegung vor den Dateianfang"
+200 "Bereits in der ersten Spalte"
+201 "Puffer sollen vor dem Kommando angegeben werden"
+202 "Bereits am Dateiende"
+203 "Bereits am Zeilenende"
+204 "%s ist kein vi Kommando"
+205 "Benutzung: %s"
+206 "Keine Zeichen zu löschen"
+207 "Das Q Kommando benötigt das ex Terminal Interface"
+208 "Kein Kommando zu wiederholen"
+209 "Die Datei ist leer"
+210 "%s kann nicht als Bewegungskommando verwendet werden"
+211 "Bereits im Kommando-Modus"
+212 " Cursor nicht auf einem Wort"
+214 "Wert der Window Option ist zu groß, max ist %u"
+215 "Anhängen"
+216 "Ändern"
+217 "Kommando"
+218 "Einfügen"
+219 "Ersetzen"
+220 "Bewegung hinter das Anzeigenende"
+221 "Bewegung vor den Anzeigenanfang"
+222 "Anzeige muß für Bildschirmteilung größer als %d sein"
+223 "Keine Hintergrundanzeigen vorhanden"
+224 "Es gibt keine Hintergrundanzeige, die eine Datei namens %s editiert"
+225 "Die einzige dargestellte Anzeige kann nicht in den Hintergrund gebracht werden"
+226 "Die Anzeige kann nur auf %d Zeilen verkleinert werden"
+227 "Die Anzeige kann nicht verkleinert werden"
+228 "Die Anzeige kann nicht vergrößert werden"
+230 "Diese Anzeige kann nicht gestopt werden"
+231 "Unterbrochen: umdefinierte Tasten ungültig"
+232 "vi: temporärer Puffer nicht freigegeben"
+233 "Dieses Terminal hat keine %s Taste"
+234 "es kann nur ein Puffer angegeben werden"
+235 "Zahl größer als %lu"
+236 "Unterbrochen"
+237 "Nicht möglich, temporäre Datei anzulegen"
+238 "Warnung: %s ist keine reguläre Datei"
+239 "%s ist bereits gelockt, Editorsitzung schreibgeschützt"
+240 "%s: löschen"
+241 "%s: schließen"
+242 "%s: löschen"
+243 "%s: löschen"
+244 "Datei nicht schreibbar, nicht geschrieben; verwende ! zum Überschreiben"
+245 "Datei nicht schreibbar, nicht geschrieben"
+246 "%s existiert, nicht geschrieben; verwende ! zum Überschreiben"
+247 "%s existiert, nicht geschrieben"
+248 "Teil der Datei, nicht geschrieben; verwende ! zum Überschreiben"
+249 "Teil der Datei, nicht geschrieben"
+250 "%s: Datei wurde später als diese Kopie verändert; verwende ! zum Überschreiben"
+251 "%s: Datei wurde später als diese Kopie verändert"
+252 "%s: Locken zum Schreiben war nicht möglich"
+253 "schreibe ..."
+254 "%s: WARNUNG: DATEI ABGESCHNITTEN"
+255 "Bereits am ersten 'tag' dieser Gruppe"
+256 "%s: neue Datei: %lu Zeilen, %lu Zeichen"
+257 "%s: %lu Zeilen, %lu Zeichen"
+258 "%s wurde in zu viele Dateinamen expandiert"
+259 "%s: keine reguläre Datei"
+260 "%s: gehört nicht Ihnen"
+261 "%s: anderer Benutzer als Eigentümer hat Zugriff"
+262 "Datei wurde seit dem letzten vollständigen Schreiben geändert; schreibe oder verwende ! zum ignorieren"
+263 "Datei wurde seit dem letzten vollständigen Schreiben geändert; schreibe oder verwende :edit! zum ignorieren"
+264 "Datei wurde seit dem letzten vollständigen Schreiben geändert; schreibe oder verwende ! zum ignorieren"
+265 "Datei ist temporär; beim Verlassen gehen die Änderungen verloren"
+266 "Datei ist schreibgeschützt, Änderungen werden nicht automatisch geschrieben"
+267 "Portokollierung neu begonnen"
+268 "bestätigen [ynq]"
+269 "Drücke beliebige Taste um fortzufahren"
+270 "Drücke beliebige Taste um fortzufahren [: um weitere Kommandos einzugeben]: "
+271 "Drücke beliebige Taste um fortzufahren [q zum Verlassen]: "
+272 "Diese Form von %s benötigt das ex Terminal-Interface"
+273 "Gehe in ex Eingabe-Modus.\n"
+274 "Kommando schiefgelaufen, noch keine Datei eingelesen"
+275 " weiter?"
+276 "unerwartetes Zeichen - Ereignis"
+277 "unerwartetes Dateiende - Ereignis"
+278 "Keine Position zum Anspringen gefunden"
+279 "unerwartetes Unterbrechungs - Ereignis"
+280 "unerwartetes Verlassen - Ereignis"
+281 "unerwartetes Wiederherstellungs - Ereignis"
+282 "Bereits am letzten 'tag' dieser Gruppe"
+283 "Das %s Kommando benötigt das ex Terminal-Interface"
+284 "Diese Form von %s wird nicht unterstützt wenn die 'secure edit' - Option gesetzt ist"
+285 "unerwartetes Zeichenketten - Ereignis"
+286 "unerwartetes timeout - Ereignis"
+287 "unerwartetes Schreibe - Ereignis"
+289 "Shell Expandierungen nicht unterstützt wenn die 'secure edit' - Option gesetzt ist"
+290 "Das %s Kommando wird nicht unterstützt wenn die 'secure edit' - Option gesetzt ist"
+291 "set: %s kann nicht ausgeschaltet werden"
+292 "Anzeige zu klein."
+293 "angefügt"
+294 "geändert"
+295 "gelöscht"
+296 "verbunden"
+297 "verschoben"
+298 "geschoben"
+299 "in Puffer geschrieben"
+300 "Zeile"
+301 "Zeilen"
+302 "Vi wurde nicht mit dem Tcl Interpreter gelinkt"
+303 "Datei wurde seit dem letzten Schreiben verändert."
+304 "Shell Expansion hat nicht geklappt"
+305 "Es ist keine %s Editieroption angegeben"
+306 "Vi wurde nicht mit einem Perl Interpreter geladen"
+307 "Kein ex Kommando auszuführen"
+308 "Drücke <CR> um ein Kommando auszuführen, :q zum verlassen"
+309 "Verwende \"cscope help\" für Hilestellung"
+310 "Keine cscope Verbindung aktiv"
+311 "%s: unbekannter Suchtyp: verwende einen aus %s"
+312 "%d: keine solche cscope Verbindung"
+313 "set: die %s Option kann nicht eingeschaltet werden"
+314 "set: die %s Option kann nicht auf 0 gesetzt werden"
+315 "%s: angefügt: %lu Zeilen, %lu Zeichen"
+316 "unerwartetes Größenveränderungs - Ereignis"
+317 "%d Dateien zu edieren"
diff --git a/usr.bin/vi/catalog/polish.UTF-8.base b/usr.bin/vi/catalog/polish.UTF-8.base
new file mode 100644
index 0000000..9648e78
--- /dev/null
+++ b/usr.bin/vi/catalog/polish.UTF-8.base
@@ -0,0 +1,306 @@
+002 "Zbyt długa linia"
+003 "nie można usunąć linii %lu"
+004 "nie można dodać do linii %lu"
+005 "nie można wstawić w linii %lu"
+006 "nie można zachować linii %lu"
+007 "nie można pobrać ostatniej linii"
+008 "Błąd: nie można pobrać linii %lu"
+009 "Plik logu"
+010 "Brak logowania, anulowanie (undo) niemożliwe"
+011 "Brak zmian do anulowania"
+012 "Brak logowania, anulowanie (undo) niemożliwe"
+013 "Brak logowania, nie można przeglądać do przodu"
+014 "Brak zmian do powtórzenia"
+015 "%s/%d: błąd zapisu do logu"
+016 "Standardowe wejście i wyjście vi musi być terminalem"
+017 "Znacznik %s: nie ustawiony"
+018 "Znacznik %s: linia została usunięta"
+019 "Znacznik %s: pozycja kursora już nie istnieje"
+020 "Błąd: "
+021 "nowy plik"
+022 "nazwa została zmieniona"
+023 "zmieniony"
+024 "nie zmieniony"
+025 "ODBLOKOWANY"
+026 "tylko do odczytu"
+027 "linia %lu z %lu [%ld%%]"
+028 "pusty plik"
+029 "linia %lu"
+030 "Plik %s nie jest katalogiem komunikatów"
+031 "Nie można ustawić domyślnej opcji %s"
+032 "Sposób użycia: %s"
+033 "set: brak opcji %s: 'set all' wyświetla wartości opcji"
+034 "set: opcja no]%s nie pobiera wartości"
+035 "set: opcja %s nie jest zmienną boolowską"
+036 "set: opcja %s: %s"
+037 "set: opcja %s: %s: przepełnienie"
+038 "set: opcja %s: %s nie jest poprawną liczbą"
+039 "set: opcja %s nie jest zmienną boolowską"
+040 "Zbyt mała liczba kolumn ekranu, mniejsza niż %d"
+041 "Zbyt duża liczba kolumn, większa niż %d"
+042 "Zbyt mała liczba wierszy ekranu, mniejsza niż %d"
+043 "Zbyt duża liczba wierszy ekranu, większa niż %d"
+044 "Opcja lisp nie jest zaimplementowana"
+045 "komunikaty nie wyłączone: %s"
+046 "komunikaty nie włączone: %s"
+047 "Opcja %s musi składać się z dwóch grup symboli"
+053 "Domyślny bufor jest pusty"
+054 "Bufor %s jest pusty"
+055 "Pliki z symbolem nowego wiersza w nazwie nie mogą być odtworzone"
+056 "Zmiany nie do odtworzenia, jeśli sesja zostanie przerwana"
+057 "Tworzenie kopii zapasowej..."
+058 "Błąd podczas zachowywania: %s"
+059 "Zmiany nie do odtworzenia, jeśli sesja zostanie przerwana"
+060 "Błąd podczas tworzenia kopii zapasowej: %s"
+061 "Tworzenie kopii zapasowej..."
+062 "Nie znaleziono informacji o użytkowniku numer %u"
+063 "Nie można zablokować kopii zapasowej"
+064 "Przepełnienie bufora kopii zapasowej"
+065 "Kopia zapasowa"
+066 "%s: błędna kopia zapasowa"
+067 "%s: błędna kopia zapasowa"
+068 "Brak plików o nazwie %s, które mógłbyś odczytać, do odzyskania"
+069 "Istnieją starsze wersje tego pliku, które można odzyskać"
+070 "Istnieją inne pliki, które można odzyskać"
+071 "nie wysyłam poczty: %s"
+072 "Pusty plik; nie ma czego szukać"
+073 "Dotarto do końca pliku bez znalezienia szukanego wzorca"
+074 "Brak poprzedniego wzorca poszukiwań"
+075 "Nie znaleziono wzorca"
+076 "Dotarto do początku pliku bez znalezienia szukanego wzorca"
+077 "Poszukiwanie od początku"
+078 "Szukam..."
+079 "Nie znaleziono niedrukowalnych znaków"
+080 "Nieznana nazwa polecenia"
+082 "%s: polecenie niedostępne w trybie edytora ex"
+083 "Liczba nie może być zerem"
+084 "%s: błędny numer linii"
+085 "Wewnętrzny błąd tablicy składni (%s: %s)"
+086 "Sposób użycia: %s"
+087 "%s: tymczasowy bufor nie został zwolniony"
+088 "Przesunięcie przed linię 1"
+089 "Przesunięcie poza koniec pliku"
+090 "@ with range running when the file/screen changed"
+091 "Wykonywano polecenie globalne/wizualne podczas zmiany pliku/ekranu"
+092 "Błąd polecenie ex: pozostałe polecenia anulowane"
+093 "Błąd polecenia ex: mapowanie klawiszy anulowane"
+094 "Drugi adres jest mniejszy od pierwszego"
+095 "Nie podano nazwy znacznika"
+096 "\\ bez / lub ?"
+097 "Odniesienie do linii o numerze mniejszym od 0"
+098 "Nieznane polecenie %s"
+099 "Przepełnienie wartości adresu"
+100 "Niedomiar wartości adresu"
+101 "Niedozwolona kombinacja adresu"
+102 "Niedozwolony adres: jest tylko %lu linii w pliku"
+103 "Niedozwolony adres: plik jest pusty"
+104 "Polecenie %s nie zezwala na użycie adresu 0"
+105 "Brak skrótów do wyświetlenia"
+106 "Skróty muszą się kończyć symbolem \"słowo\""
+107 "Skróty nie mogą zawierać spacji lub tabulacji"
+108 "Skróty nie mogą przeplatać symboli słowo/nie-słowo, z wyjątkiem na końcu linii"
+109 "\"%s\" nie jest skrótem"
+110 "Błąd polecenia vi: mapowanie klawiszy odrzucone"
+111 "Nie ma więcej plików do edycji"
+112 "Nie ma poprzednich plików do edycji"
+113 "Nie ma poprzednich plików do przewinięcia wstecz"
+114 "Nie ma listy plików do wyświetlenia"
+115 "Nie ma poprzedniego polecenia do zastąpienia \"!\""
+116 "Nie ma nazwy pliku do zastąpienia %%"
+117 "Nie ma nazwy pliku do zastąpienia #"
+118 "Błąd: execl: %s"
+119 "Błąd I/O: %s"
+120 "Plik zmodyfikowany od ostatniego zapisu; zapisz lub użyj ! żeby wymusić"
+121 "Nie mozna znaleźć katalogu domowego (home)"
+122 "Nowy katalog bieżący: %s"
+123 "Nie ma buforów edycji do wyświetlenia"
+124 "Polecenie %s nie może być użyte jako część polecenia globalnego lub wizualnego"
+125 "%s/%s: nie wczytany: nie należy do ciebie ani do roota"
+126 "%s/%s: nie wczytany: nie należy do ciebie"
+127 "%s/%s: nie wczytany: inny użytkownik niż właściciel ma prawo do zapisu"
+128 "%s: nie wczytany: nie należy do ciebie ani do roota"
+129 "%s: nie wczytany: nie należy do ciebie"
+130 "%s: nie wczytany: inny uzytkownik niż właściciel ma prawo do zapisu"
+131 "Brak kolejnych linii do połączenia"
+132 "Brak pozycji map wejściowych"
+133 "Brak pozycji map poleceń"
+134 "Znak %s nie może być przemapowany"
+135 "\"%s\" obecnie nie jest mapowany"
+136 "Nazwa znacznika musi być pojedyńczą literą"
+137 "%s istnieje, nie zapisany; użyj ! żeby wymusić"
+138 "Nowy plik exrc: %s"
+139 "Linia docelowa jest wewnątrz przenoszonego obszaru"
+140 "Polecenie open wymaga ustawienia opcji open"
+141 "Polecenie open jest niezaimplementowane"
+142 "Niemożliwe jest zachowanie tego pliku"
+143 "Plik zachowany"
+144 "%s: rozwija się na zbyt wiele nazw plików"
+145 "Tylko zwykłe pliki i nazwane łącza (named pipes) można czytać"
+146 "%s: nie można założyć blokady do odczytu"
+147 "Czytanie..."
+148 "%s: %lu linii, %lu znaków"
+149 "Brak ekranów w tle do wyświetlenia"
+150 "Polecenie script dostępne jest tylko w trybie vi"
+151 "Brak polecenia do wykonania"
+152 "Opcja shiftwidth ustawiona na 0"
+153 "Przepełnienie licznika"
+154 "Niedomiar licznika"
+155 "Podano wyrażenie regularne; flaga r nie ma znaczenia"
+156 "Flagi #, l oraz p nie mogą być łączone z flagą c w trybie vi"
+157 "Nie znaleziono wzorca"
+158 "Brak poprzedniego znacznika"
+159 "Mniej niż %s na stosie znaczników; użyj :display t[ags]"
+160 "Brak pliku %s na stosie znaczników do powrotu; użyj :display t[ags]"
+161 "Naciśnij Enter: "
+162 "%s: znacznik nie znaleziony"
+163 "%s: błędny znacznik w %s"
+164 "%s: numer linii znacznika wykracza poza koniec pliku"
+165 "Stos znaczników jest pusty"
+166 "%s: nie znaleziono szukanego wzorca"
+167 "%d plików jeszcze do edycji"
+168 "Bufor %s jest pusty"
+169 "Potwierdzasz zmianę? [n]"
+170 "Przerwany"
+171 "Brak poprzedniego bufora do wykonania"
+172 "Brak poprzedniego wyrażenia regularnego"
+173 "Polecenie %s wymaga uprzedniego wczytania pliku"
+174 "Sposób użycia: %s"
+175 "Polecenie wizualne wymaga ustawienia opcji open"
+177 "Pusty plik"
+178 "Brak poprzedniego szukania F, f, T lub t"
+179 "%s nie znaleziono"
+180 "Brak poprzedniego pliku do edycji"
+181 "Kursor nie na liczbie"
+182 "Liczba wynikowa zbyt duża"
+183 "Liczba wynikowa zbyt mała"
+184 "Brak pasujących znaków w tej linii"
+185 "Nie znaleziono pasujących znaków"
+186 "Brak znaków do zamiany"
+187 "Brak innego ekranu do przełączenia"
+188 "Znaki poza napisem do szukania, przesunięciem linii i/lub poleceniem z"
+189 "Brak poprzedniego wzorca szukania"
+190 "Szukanie wróciło do pierwotnej pozycji"
+191 "Skrót przekroczył limit rozwinięcia: część znaków odrzucono"
+192 "Niedozwolony znak; zacytuj, żeby wprowadzić"
+193 "Już na początku wstawiania"
+194 "Brak kolejnych znaków do usunięcia"
+195 "Przesunięcie poza koniec pliku"
+196 "Przesunięcie poza koniec linii"
+197 "Nie wykonano przesunięcia kursora"
+198 "Już na początku pliku"
+199 "Przesunięcie przed początek pliku"
+200 "Już w pierwszej kolumnie"
+201 "Należy podać bufory przed poleceniem"
+202 "Już na końcu pliku"
+203 "Już na końcu linii"
+204 "%s nie jest poleceniem vi"
+205 "Sposób użycia: %s"
+206 "Brak znaków do usunięcia"
+207 "Polecenie Q wymaga interfejsu terminala ex"
+208 "Brak polecenia do powtórzenia"
+209 "Plik jest pusty"
+210 "%s nie może być użyte jako polecenie przesunięcia"
+211 "Już w trybie poleceń"
+212 "Kursor nie na słowie"
+214 "Wartości opcji okna zbyt duże, max to %u"
+215 "Dołącz"
+216 "Zmień"
+217 "Polecenie"
+218 "Wstaw"
+219 "Zamień"
+220 "Przesunięcie poza koniec ekranu"
+221 "Przesunięcie przed początek ekranu"
+222 "Ekran musi mieć więcej niż %d linii, żeby go podzielić"
+223 "Brak ekranów w tle"
+224 "Nie ma ekranu w tle z edycją pliku o nazwie %s"
+225 "Nie można schować w tle jedynego ekranu edycyjnego"
+226 "Można zmniejszyć ekran tylko do %d wierszy"
+227 "Ekran nie może być zmniejszony"
+228 "Ekran nie może być zwiększony"
+230 "Ekran nie może być zawieszony"
+231 "Przerwano: odrzucono mapowane klawisze"
+232 "vi: nie zwolniono bufora tymczasowego"
+233 "Ten terminal nie posiada klawisza %s"
+234 "Można podać tylko jeden bufor"
+235 "Liczba większa niż %lu"
+236 "Przerwano"
+237 "Nie można utworzyć pliku tymczasowego"
+238 "Uwaga: %s nie jest zwykłym plikiem"
+239 "%s już zablokowany, sesja tylko do odczytu"
+240 "%s: usuń"
+241 "%s: zamknij"
+242 "%s: usuń"
+243 "%s: usuń"
+244 "Plik tylko do odczytu, nie zapisany; użyj ! żeby wymusić"
+245 "Plik tylko do odczytu, nie zapisany"
+246 "%s istnieje, nie zapisany; użyj ! żeby wymusić"
+247 "%s istnieje, nie zapisany"
+248 "Plik częściowy, nie zapisany; użyj ! żeby wymusić"
+249 "Plik częściowy, nie zapisany"
+250 "%s: plik zmodyfikowany później, niż ta kopia; użyj ! żeby wymusić"
+251 "%s: plik zmodyfikowany później, niż ta kopia"
+252 "%s: nie można zablokować do pisania"
+253 "Zapisywanie..."
+254 "%s: OSTRZEŻENIE: PLIK ZOSTAŁ OBCIĘTY"
+255 "Już przy pierwszym znaczniku z tej grupy"
+256 "%s: nowy plik: %lu linii, %lu znaków"
+257 "%s: %lu linii, %lu znaków"
+258 "%s rozwija się na zbyt wiele nazw plików"
+259 "%s: nie jest zwykłym plikiem"
+260 "%s: nie jesteś właścicielem"
+261 "%s: dostępny dla użytkownika innego niż właściciel"
+262 "Plik zmodyfikowany od ostatniego zapisu; zapisz lub użyj ! żeby wymusić"
+263 "Plik zmodyfikowany od ostatniego zapisu; zapisz lub użyj :edit! żeby wymusić"
+264 "Plik zmodyfikowany od ostatniego zapisu; zapisz lub użyj ! żeby wymusić"
+265 "To jest plik tymczasowy; wyjście anuluje zmiany"
+266 "Plik tylko do odczytu, nie ma autozapisu zmian"
+267 "Ponownie rozpoczęto logowanie"
+268 "potwierdzasz? [ynq]"
+269 "Naciśnij dowolny klawisz: "
+270 "Naciśnij dowolny klawisz [: żeby podać następne polecenia ex]: "
+271 "Naciśnij dowolny klawisz [q żeby zakończyć]: "
+272 "Ta forma %s wymaga interfejsu terminala ex"
+273 "Wchodzę w tryb wprowadzania ex."
+274 "Błąd polecenia, jeszcze nie wczytano pliku."
+275 " dalej?"
+276 "Nieoczekiwany symbol"
+277 "Nieoczekiwany koniec pliku"
+278 "Brak wzorców pasujących do zapytania"
+279 "Nieoczekiwane przerwanie"
+280 "Nieoczekiwane polecenie koniec"
+281 "Nieoczekiwane polecenie odświeżenia"
+282 "Już przy ostatnim znaczniku z tej grupy"
+283 "Polecenie %s wymaga interfejsu terminala ex"
+284 "Ta forma %s jest niedostępna, kiedy ustawiona jest opcja bezpiecznej edycji"
+285 "Nieoczekiwany ciąg znaków"
+286 "Nieoczekiwany timeout"
+287 "Nieoczekiwane polecenie zapisu"
+289 "Rozwinięcia shella niedostępne w trybie bezpiecznej edycji"
+290 "Polecenie %s jest niedostępne w trybie bezpiecznej edycji"
+291 "set: opcji %s nie można wyłączyć"
+292 "Ekran zbyt mały."
+293 "dodano"
+294 "zmieniono"
+295 "usunięto"
+296 "połączono"
+297 "przeniesiono"
+298 "przesunięto"
+299 "wczytano"
+300 "linia"
+301 "linii"
+302 "Vi nie został uruchomiony z interpreterem Tcl"
+303 "Plik zmodyfikowany od ostatniego zapisu"
+304 "Błąd rozwinięcia shella"
+305 "Brak opcji %s edycji"
+306 "Vi nie został uruchomiony z interpreterem Perl"
+307 "Brak polecenia ex do wykonania"
+308 "Naciśnij <CR> żeby wykonac polecenie, :q żeby wyjść"
+309 "Użyj \"cscope help\" w celu uzyskania pomocy"
+310 "Brak aktywnych połączeń cscope"
+311 "%s: nieznany typ poszukiwań: użyj jednego z %s"
+312 "%d: brak takiej sesji cscope"
+313 "set: nie można nigdy włączyć opcji %s"
+314 "set: opcja %s nie może nigdy mieć wartości 0"
+315 "%s: dodano: %lu linii, %lu znaków"
+316 "Nieoczekiwane polecenie zmiany rozmiaru"
+317 "%d plików do edycji"
diff --git a/usr.bin/vi/catalog/ru_RU.UTF-8.base b/usr.bin/vi/catalog/ru_RU.UTF-8.base
new file mode 100644
index 0000000..b358015
--- /dev/null
+++ b/usr.bin/vi/catalog/ru_RU.UTF-8.base
@@ -0,0 +1,311 @@
+002 "Переполнение значения длины строки"
+003 "невозможно удалить строку %lu"
+004 "невозможно добавить к строке %lu"
+005 "невозможно вставить в строку %lu"
+006 "невозможно сохранить строку %lu"
+007 "невозможно достать последнюю строку"
+008 "Ошибка: не удалось получить строку %lu"
+009 "Файл записей"
+010 "Записи не велись, невозможно отменить последнюю команду"
+011 "Нет изменений для отмены"
+012 "Записи не велись, невозможно отменить последнюю команду"
+013 "Записи не велись, невозможно просмотреть вперед"
+014 "Нет изменений для переделки"
+015 "%s/%d: ошибка при записи протокола"
+016 "Стандартный ввод/вывод для VI должен быть терминал"
+017 "Отметка %s: не установлена"
+018 "Отметка %s: строка была удалена"
+019 "Отметка %s: позиции курсора больше не существует"
+020 "Ошибка: "
+021 "новый файл"
+022 "имя изменено"
+023 "модифицировано"
+024 "не модифицировано"
+025 "РАЗБЛОКИРОВАНО"
+026 "только чтение"
+027 "строка %lu из %lu [%ld%%]"
+028 "пустой файл"
+029 "строка %lu"
+030 "Файл %s не является каталогом сообщений"
+031 "Невозможно установить опцию %s по умолчанию"
+032 "Использование: %s"
+033 "Опции %s нет: 'set all' показывает все возможные опции"
+034 "set: [no]%s не принимает такого значения"
+035 "set: %s опция не является логической"
+036 "set: %s опция: %s"
+037 "set: %s опция: %s: значение переполнения"
+038 "set: неправильное значение %s"
+039 "set: %s опция не является логической"
+040 "Количество колонок экрана слишком мало, меньше чем %d"
+041 "Количество колонок экрана слишком велико, больше чем %d"
+042 "Количество строк экрана слишком мало, меньше чем %d"
+043 "Количество строк экрана слишком велико, больше чем %d"
+044 "Опция lisp отсутствует"
+045 "Сообщения не выключены: %s"
+046 "Сообщения не включены: %s"
+047 "Опция %s должна состоять из групп с двумя символами"
+053 "Стартовый буфер пуст"
+054 "Буфер %s пуст"
+055 "Файлы с символами перевода строки в имени не могут быть восстановлены"
+056 "Изменения не сохранены при крахе сессии"
+057 "Копирование файла для восстановления..."
+058 "Сохранение не удалось: %s"
+059 "Изменения не сохраняются при обрыве сессии"
+060 "Сохранение копии файла не удалось: %s"
+061 "Копирование файла для восстановления..."
+062 "Информации на пользователя %u не найдено"
+063 "Невозможно защитить спасенный файл"
+064 "Буфер восстановленного файла переполнен"
+065 "Восстановленный файл"
+066 "%s: не до конца восстановленный файл"
+067 "%s: не до конца восстановленный файл"
+068 "Файлов с именем %s, которые Вы можете читать, не существует"
+069 "Есть старые версии файла, которые можно восстановить"
+070 "Существуют другие файлы, которые можно восстановить"
+071 "е-mail не послан: %s"
+072 "Файл пуст - искать нечего"
+073 "Достигнут конец файла без нахождения образца поиска"
+074 "Не задан образец поиска"
+075 "Образец поиска не найден"
+076 "Доступно начало файла без нахождения образца поиска"
+077 "Поиск зациклен"
+078 "Поиск..."
+079 "Непечатных символов не найдено"
+080 "Неизвестная команда"
+082 "%s: команда не доступна в режиме ex"
+083 "Счетчик не может быть нулем"
+084 "%s: неправильное указание строки"
+085 "Внутренняя ошибка в синтаксисе (%s: %s)"
+086 "Использование: %s"
+087 "%s: временный буфер не использован"
+088 "Метка поставлена перед строкой 1"
+089 "Метка поставлена после конца файла"
+090 "@ с диапазоном выполняется когда файл/экран изменены"
+091 "Глобальная/v команда выполняется когда файл/экран изменены"
+092 "Команда ex не удалась: последующие команды забыты"
+093 "Команда ex не удалась: назначенные клавиши забыты"
+094 "Второй адрес меньше чем первый"
+095 "Не указано название отметки"
+096 "\\ не завершается / или ?"
+097 "Ссылка к строке с номером меньше 0"
+098 "Команда %s неизвестна"
+099 "Переполнение значения адреса"
+100 "Недобор значения адреса"
+101 "Недопустимая комбинация в адресе"
+102 "Неправильный адрес: всего %lu строк в файле"
+103 "Неправильный адрес: файл пуст"
+104 "Команда %s не может использовать адрес 0"
+105 "Аббревиатуры отсутствуют"
+106 "Аббревиатуры должны заканчиваться символом \"слов\""
+107 "Аббревиатуры не могут содержать символы табуляции или пробелы"
+108 "Аббревиатуры не могут сочетаться с символами слов/не-слов, за исключением конца строки"
+109 "\"%s\" не является аббревиатурой"
+110 "Vi команда не удалась: назначенные клавиши забыты"
+111 "Файлов для редактирования больше нет"
+112 "Отсутствие предыдущего файла для редактирования"
+113 "Отсутствие предыдущего файла для просмотра назад"
+114 "Нет файлов"
+115 "Отсутствие предыдущей команды для замены \"!\""
+116 "Отсутствие замены для %%"
+117 "Отсутствие замены для #"
+118 "Ошибка: execl: %s"
+119 "Ошибка ввода/вывода: %s"
+120 "Файл изменен с момента последней полной записи: используйте ! для обхода"
+121 "Невозможно найти домашний каталог"
+122 "Новый каталог: %s"
+123 "Нет вырезанных буферов"
+124 "Команда %s не может быть использована внутри глобальной или v команды"
+125 "%s/%s: не открыт: не принадлежит Вам или root-у"
+126 "%s/%s: не открыт: не принадлежит Вам"
+127 "%s/%s: не открыт: возможность записи у пользователя, не являющегося владельцем"
+128 "%s: не считан: не принадлежит Вам или root-у"
+129 "%s: не считан: не принадлежит Вам"
+130 "%s: не считан: возможность записи у пользователя, не являющегося владельцем"
+131 "Последующие строки отсутствуют"
+132 "Отсутствие параметров ввода"
+133 "Отсутствие параметров команды"
+134 "Символ %s не может быть переназначен"
+135 "\"%s\" на данный момент не назначен"
+136 "Имя метки должно быть одним символом"
+137 "%s существует, не записан; используйте ! для обхода"
+138 "Новый файл exrc: %s"
+139 "Строка переноса находится внутри параметров переноса"
+140 "Команда open подразумевает установку опции open"
+141 "Команда open не реализована"
+142 "Защита файла невозможна"
+143 "Файл защищен"
+144 "%s расширился в слишком большое количество имен файлов"
+145 "Только обычные файлы или именованные каналы могут быть прочитаны"
+146 "%s: защита на чтение была недоступна"
+147 "Чтение..."
+148 "%s: %lu строк, %lu символов"
+149 "Нет теневых окон"
+150 "Команда script используется только в режиме vi"
+151 "Нет команды для исполнения"
+152 "Опция shiftwidth установлена на 0"
+153 "Переполнение счетчика"
+154 "Цикл выполнен не до конца"
+155 "Указано регулярное выражение: флаг r не нужен"
+156 "Флаги #, l и p не могут быть объединены с флагом c в режиме vi"
+157 "Совпадений нет"
+158 "Метка отсутствует"
+159 "В стеке меток записей меньше, чем %s, используйте :display t[ags]"
+160 "Файла с именем %s в стеке меток нет; используйте :display t[ags]"
+161 "Нажмите Enter чтобы продолжить: "
+162 "%s: метка не найдена"
+163 "%s: плохая метка в %s"
+164 "%s: номер строки метки вышел за конец файла"
+165 "Стек меток пуст"
+166 "%s: образец поиска не найден"
+167 "еще %d файлов для редактирования"
+168 "Буфер %s пуст"
+169 "Подтвердить изменения? [n]"
+170 "Прервано"
+171 "Отсутствие буфера для использования"
+172 "Нет предыдущего регулярного выражения"
+173 "Команда %s подразумевает наличие прочтенного файла"
+174 "Использование: %s"
+175 "Команда visual подразумевает обязательную установку опции open"
+177 "Пустой файл"
+178 "Нет предыдущего поиска F, f, T, или t"
+179 "%s не найдено"
+180 "Нет предыдущего файла для редактирования"
+181 "Курсор стоит не на цифре"
+182 "Полученное число слишком велико"
+183 "Полученное число слишком мало"
+184 "Подходящего символа нет на этой строке"
+185 "Подходящий символ не найден"
+186 "Нет символов для удаления"
+187 "Другого экрана не существует"
+188 "Символы после строки для поиска, смещения строки и/или команды z"
+189 "Прошлый образец поиска отсутствует"
+190 "Поиск завершился на начальной позиции"
+191 "Аббревиатура превысила лимит расширения: символы забыты"
+192 "Символ неправилен; квотируйте для ввода"
+193 "Уже на начале вставки"
+194 "Нет символов для удаления"
+195 "Передвижение за конец файла"
+196 "Передвижение за конец строки"
+197 "Движение строки не сделано"
+198 "Уже на начале файла"
+199 "Движение курсора за начало файла"
+200 "Уже в первой колонке"
+201 "Буферы должны быть указаны до выполнения команды"
+202 "Уже на конце файла"
+203 "Уже на конце строки"
+204 "%s не является командой VI"
+205 "Использование: %s"
+206 "Нет символов для удаления"
+207 "Команда Q требует ex интерфейс терминала"
+208 "Нет команды для повтора"
+209 "Файл пуст"
+210 "Команда %s не может быть использована как команда перемещения"
+211 "Уже в командном режиме"
+212 "Курсор находится не на слове"
+214 "Значение опции windows слишком велико, максимальное значение = %u"
+215 "Добавить"
+216 "Изменить"
+217 "Команда"
+218 "Вставить"
+219 "Заменить"
+220 "Движение курсора за конец экрана"
+221 "Движение курсора за начало экрана"
+222 "Для разделения экран должен быть больше чем строки %d"
+223 "Теневых окон нет"
+224 "Не существует теневого окна с редактированием файла %s"
+225 "Вы не можете сделать единственное окно теневым"
+226 "Экран может быть сжат"
+227 "Экран не может быть сжат только до %d строк"
+228 "Экран не может быть расширен"
+230 "Этот экран не может быть приостановлен"
+231 "Прервано: назначенные клавиши забыты"
+232 "vi: временный буфер не освобожден"
+233 "Данный тип терминала не имеет клавиши %s"
+234 "Может быть указан только один буфер"
+235 "Число больше чем %lu"
+236 "Прервано"
+237 "Невозможно создать временный файл"
+238 "Внимание: %s специальный файл"
+239 "%s уже заблокирован, доступен только на чтение"
+240 "%s: удален"
+241 "%s: закрыт"
+242 "%s: удален"
+243 "%s: удален"
+244 "Файл только для чтения, не записан: Используйте ! для обхода"
+245 "Файл только для чтения, не записан"
+246 "%s существует, не записан; используйте ! для обхода"
+247 "%s существует, не записан"
+248 "Используйте ! для частичной записи файла"
+249 "Часть файла, файл не записан"
+250 "%s: Файл изменялся позднее, чем данная копия: используйте ! для обхода"
+251 "%s: Файл изменялся позднее, чем данная копия"
+252 "%s: защита на запись была недоступна"
+253 "Запись..."
+254 "%s: ВНИМАНИЕ: ФАЙЛ УСЕЧЕН"
+255 "Уже присутствует в первой метке данной группы"
+256 "%s: новый файл: %lu строк, %lu символов"
+257 "%s: %lu строк, %lu символов"
+258 "%s расширился в слишком большое количество имен файлов"
+259 "%s: специальный файл"
+260 "%s: не принадлежит Вам"
+261 "%s: доступен не только Вам"
+262 "Файл изменен со времени последней записи: сохраните или используйте ! для обхода"
+263 "Файл изменен со времени последней записи: сохраните или используйте :edit для обхода"
+264 "Файл изменен со времени последней записи: сохраните или используйте ! для обхода"
+265 "Файл временный: выход сотрет любые изменения"
+266 "Файл только для чтения, автозапись не сработала"
+267 "Записи начаты заново"
+268 "подтвердить? [ynq]"
+269 "Нажмите любую клавишу чтобы продолжить: "
+270 "Нажмите любую клавишу чтобы продолжить [: чтобы ввести еще ex команды]: "
+271 "Нажмите любую клавишу чтобы продолжить [q чтобы выйти]: "
+272 "Эта форма %s требует ex интерфейс терминала"
+273 "Вход в режим ввода ex."
+274 "Команда не удалась, файл еще не прочтен."
+275 " прод?"
+276 "Неожиданное символьное событие"
+277 "Неожиданное событие 'конец файла'"
+278 "По запросу совпадений нет"
+279 "Неожиданное событие прерывания"
+280 "Неожиданное событие выхода"
+281 "Неожиданное событие перерисовки"
+282 "Уже присутствует в последней метке данной группы"
+283 "Команда %s требует ex интерфейс терминала"
+284 "Эта форма %s не поддерживается пока установлена опция безопасного редактирования"
+285 "Неожиданное строковое событие"
+286 "Неожиданное событие таймаута"
+287 "Неожиданное событие записи"
+288 "Для разделения экран должен быть больше чем столбцы %d"
+289 "Shell расширения не поддерживаются пока установлена опция безопасного редактирования"
+290 "Команда %s не поддерживается пока установлена опция безопасного редактирования"
+291 "set: опция %s не может быть выключена"
+292 "Экран слишком мал"
+293 "добавлено"
+294 "изменено"
+295 "удалено"
+296 "присоединено"
+297 "перемещено"
+298 "смещено"
+299 "скопировано"
+300 "строка"
+301 "строки"
+303 "Файл изменен с момента последней записи."
+304 "Shell расширение не удалось"
+305 "Нет указанной %s опции редактирования"
+307 "Нет ex команды для выполнения"
+308 "Введите <CR> для выполнения команды, :q чтобы выйти"
+309 "Используйте \"cscope help\" для помощи"
+310 "Нет запущенного cscope соединения"
+311 "%s: неизвестный тип поиска: используйте один из %s"
+312 "%d: нет такого cscope сеанса"
+313 "set: %s опция никогда не может быть включена"
+314 "set: %s опция никогда не может быть установлена в 0"
+315 "%s: добавлено: %lu строк, %lu символов"
+316 "Неожиданное событие изменения размера"
+317 "%d файлов для редактирования"
+319 "%d экранов в фоновом режиме; используйте :display чтобы перечислить их"
+320 "Неизвестная позиция курсора"
+321 "Преобразование кодировки файлов не поддерживается"
+322 "Преобразование кодировки ввода не поддерживается"
+323 "Неверный ввод. Усечено."
+324 "Ошибка преобразования в строке %d"
diff --git a/usr.bin/vi/catalog/spanish.UTF-8.base b/usr.bin/vi/catalog/spanish.UTF-8.base
new file mode 100644
index 0000000..4a3059a
--- /dev/null
+++ b/usr.bin/vi/catalog/spanish.UTF-8.base
@@ -0,0 +1,306 @@
+002 "Desbordamiento de longitud de línea"
+003 "no se puede borrar la línea %lu"
+004 "no se puede añadir la línea %lu"
+005 "no se puede insertar en la línea %lu"
+006 "no se puede guardar la línea %lu"
+007 "no se puede obtener la última línea"
+008 "Error: no se puede recuperar la línea %lu"
+009 "Archivo de log"
+010 "No se realiza log, no se puede deshacer"
+011 "No hay cambios para deshacer"
+012 "No se realiza log, no se puede deshacer"
+013 "No se realiza log, no se puede remontar hacia adelante"
+014 "No hay cambios para rehacer"
+015 "%s/%d: error de log"
+016 "La entrada y salida estándar de Vi debe ser una terminal"
+017 "Marcar %s: no determinado"
+018 "Marcar %s: se borró la línea"
+019 "Marcar %s: la posición del cursor ya no existe"
+020 "Error: "
+021 "nuevo archivo"
+022 "nombre cambiado"
+023 "modificado"
+024 "no modificado"
+025 "DESTRABADO"
+026 "lectura solamente"
+027 "línea %lu de %lu [%ld%%]"
+028 "archivo vacío"
+029 "línea %lu"
+030 "El archivo %s no es un catálogo de mensajes"
+031 "No se puede determinar la opción por omisión %s"
+032 "Uso: %s"
+033 "determinar: no hay opción %s: 'determinar todo' establece todos los valores de opción"
+034 "determinar: [no] hay opción %s no tiene valor"
+035 "determinar: opción %s no es booleano"
+036 "determinar: opción %s: %s"
+037 "determinar: opción %s: %s: desbordamiento de valores"
+038 "determinar: opción %s: %s es un número ilegal"
+039 "determinar: opción %s no es booleano"
+040 "Las columnas en pantalla son demasiado pequeñas, menos de %d"
+041 "Las columnas en pantalla son demasiado grandes, más de %d"
+042 "Las líneas en pantalla son demasiado pequeñas, menos de %d"
+043 "Las líneas en pantalla son demasiado grandes, más de %d"
+044 "La opción lisp no está implementada"
+045 "mensajes no desconectados: %s"
+046 "mensajes no conectados: %s"
+047 "La opción de %s debe estar en dos grupos de caracteres"
+053 "El buffer por omisión está vacío"
+054 "El buffer %s está vacío"
+055 "Los archivos con nuevas líneas en el nombre son irrecuperables"
+056 "Las modificaciones no pueden recuperarse si la sesión falla"
+057 "Copiando archivo para recuperación..."
+058 "Preservación fracasada: %s"
+059 "Las modificaciones no pueden recuperarse si la sesión falla"
+060 "Archivo de respaldo fracasado: %s"
+061 "Copiando archivo para recuperación..."
+062 "Información sobre identificación del usuario %u no encontrada"
+063 "No se puede trabar archivo de recuperación"
+064 "Desbordamiento de buffer de archivo de recuperación"
+065 "Archivo de recuperación"
+066 "%s: archivo de recuperación defectuoso"
+067 "%s: archivo de recuperación defectuoso"
+068 "No hay archivos denominados %s, que usted pueda leer, para recuperar"
+069 "Existen versiones más antiguas de este archivo que usted puede recuperar"
+070 "Existen otros archivos que usted puede recuperar"
+071 "no envía email: %s"
+072 "Archivo vacío; no hay nada para buscar"
+073 "Se alcanzó el final del archivo sin encontrar el patrón"
+074 "No hay patrón anterior de búsqueda"
+075 "No se encontró el patrón"
+076 " Se alcanzó el principio del archivo sin encontrar el patrón"
+077 "Búsqueda reiniciada"
+078 "Buscando..."
+079 "No se encontró ningún carácter no imprimible"
+080 "Nombre de comando desconocido"
+082 "%s: comando no disponible en modalidad ex"
+083 "La cuenta no puede ser cero"
+084 "%s: mala especificación de línea"
+085 "Error interno de tabla de sintaxis (%s: %s)"
+086 "Uso: %s"
+087 "%s: buffer temporario no liberado"
+088 "Desplazamiento de marcador a antes de la línea 1"
+089 "Desplazamiento de marcador más allá del final del archivo"
+090 "@ con rango que corre cuando se cambia el archivo/la pantalla"
+091 "Comando global/v que corre cuando se cambia el archivo/la pantalla"
+092 "Comando Ex fracasado: comandos pendientes descartados"
+093 "Comando Ex fracasado: teclas mapeadas descartadas"
+094 "La segunda dirección es más pequeña que la primera"
+095 "No se suministra nombre de marca"
+096 "\\ no es seguido por / o ?"
+097 "Referencia a un número de línea menor que 0"
+098 "El comando %s es desconocido"
+099 "Desbordamiento de valor de dirección"
+100 "Subdesbordamiento de valor de dirección"
+101 "Combinación de dirección ilegal"
+102 "Dirección ilegal: sólo %lu líneas en el archivo"
+103 "Dirección ilegal: el archivo está vacío"
+104 "El comando %s no permite una dirección de 0"
+105 "No hay abreviaturas para visualizar"
+106 "Las abreviaturas deben terminar con un carácter de \"palabra\" "
+107 "Las abreviaturas no pueden contener tabs o espacios"
+108 "Las abreviaturas no pueden mezclar caracteres palabra/no-palabra, salvo al final"
+109 "\"%s\" no es una abreviatura"
+110 "Comando Vi fracasado: teclas mapeadas descartadas"
+111 "No hay más archivos para editar"
+112 "No hay archivos anteriores para editar"
+113 "No hay archivos anteriores para rebobinar"
+114 "No hay lista de archivos para visualizar"
+115 "No hay un comando anterior para reemplazar a \"!\""
+116 "No hay nombre de archivo para sustituir por %%"
+117 "No hay nombre de archivo para sustituir por #"
+118 "Error: execl: %s"
+119 "Error de E/S: %s"
+120 "Archivo modificado desde la última escritura completa; escribir o usar ! para alterar"
+121 "No se puede encontrar la ubicación del directorio inicial"
+122 "Nuevo directorio actual: %s"
+123 "No hay buffers sueltos para visualizar"
+124 "El comando %s no puede usarse como parte de un comando global o v"
+125 "%s/%s: sin fuente: no le pertenece a usted o a raíz"
+126 "%s/%s: sin fuente: no le pertenece a usted"
+127 "%s/%s: sin fuente: puede ser escrito por un usuario que no sea el propietario"
+128 "%s: sin fuente: no le pertenece a usted o a raíz"
+129 "%s: sin fuente: no le pertenece a usted"
+130 "%s: sin fuente: puede ser escrito por un usuario que no sea el propietario"
+131 "No hay líneas siguientes para unir"
+132 "No hay anotaciones de mapa de entrada"
+133 "No hay anotaciones de mapa de comando"
+134 "El carácter %s no puede remapearse"
+135 "\"%s\" no está mapeado actualmente"
+136 "Marca de nombres debe ser un sólo carácter"
+137 "%s existe, no está escrito; usar ! para alterar"
+138 "Nuevo archivo exrc: %s"
+139 "La línea de destino se encuentra dentro del rango de movimiento"
+140 "El comando abierto requiere que se determine la opción abierta"
+141 "El comando abierto no se ha implementado aún"
+142 "No es posible preservar este archivo"
+143 "Archivo preservado"
+144 "%s: expandido a demasiados nombres de archivo"
+145 "Sólo pueden leerse los archivos regulares y los conductos nombrados"
+146 "%s: traba de lectura no disponible"
+147 "Leyendo..."
+148 "%s: %lu líneas, %lu caracteres"
+149 "No hay pantallas de fondo para mostrar"
+150 "El comando de script sólo está disponible en modalidad vi"
+151 "No hay comando para ejecutar"
+152 "opción de ancho de desplazamiento en 0"
+153 "Desbordamiento de cuenta"
+154 "Subdesbordamiento de cuenta"
+155 "Expresión regular especificada; marcador r no tiene significado"
+156 "Los marcadores #, l y p no pueden combinarse con el marcador c en la modalidad vi"
+157 "No se encontró coincidencia"
+158 "No se ingresó un identificador anterior"
+159 "Se encontraron menos de %s anotaciones en la pila de identificadores; usar :visualizar i[dentificadores]"
+160 "No hay archivo %s en la pila de identificadores al que se pueda volver; usar :visualizar i[dentificadores]" 
+161 "Presionar Intro para continuar: "
+162 "%s: no se encontró el identificador"
+163 "%s: identificador corrompido en %s"
+164 "%s: el número de línea del identificador es posterior al final del archivo"
+165 "La pila de identificadores está vacía"
+166 "%s: patrón de búsqueda no encontrado"
+167 "%d archivos más para editar"
+168 "El buffer %s está vacío"
+169 "¿Confirmar cambio? [n]"
+170 "Interrumpido"
+171 "No hay buffer anterior para ejecutar"
+172 "No hay expresión regular anterior"
+173 "El comando %s requiere que se haya leído un archivo"
+174 "Uso: %s"
+175 "El comando visual requiere que se determine la opción abierta"
+177 "Archivo vacío"
+178 "No hay búsqueda F, f, T o t anterior"
+179 "%s no se encontró"
+180 "No hay archivo anterior para editar"
+181 "El cursor no está en un número"
+182 "El número resultante es demasiado grande"
+183 " El número resultante es demasiado pequeño"
+184 "No hay carácter coincidente en esta línea"
+185 "No se encontró un carácter coincidente"
+186 "No hay caracteres para reemplazar"
+187 "No hay otra pantalla a la que se pueda pasar"
+188 "Caracteres tras de cadena de búsqueda, desplazamiento de línea y/o comando z"
+189 "No hay patrón anterior de búsqueda"
+190 "Búsqueda vuelve a la posición inicial"
+191 "Se superó el límite de expansión de abreviatura: se descartaron caracteres"
+192 "Carácter ilegal; mencionar para entrar"
+193 "Ya se encuentra al principio de la inserción"
+194 "No hay más caracteres para borrar"
+195 "Movimiento más allá del final del archivo"
+196 "Movimiento más allá del final de la línea"
+197 "No hay movimiento del cursor"
+198 "Ya se encuentra al principio del archivo"
+199 "Movimiento más allá del principio del archivo"
+200 "Ya se encuentra en la primera columna"
+201 "Los buffers deben especificarse antes del comando"
+202 "Ya se encuentra al final del archivo"
+203 "Ya se encuentra al final de la línea"
+204 "%s no es un comando vi"
+205 "Uso: %s"
+206 "No hay caracteres para borrar"
+207 "El comando Q requiere la interfase de terminal ex"
+208 "No hay comando para repetir"
+209 "El archivo está vacío"
+210 "%s no puede usarse como comando de movimiento"
+211 "Ya se encuentra en modalidad de comando"
+212 "El cursor no se encuentra en una palabra"
+214 "El valor de opción de Windows es demasiado grande, el máx. es %u"
+215 "Añadir"
+216 "Cambiar"
+217 "Comando"
+218 "Insertar"
+219 "Reemplazar"
+220 "El movimiento va más allá del final de la pantalla"
+221 "El movimiento va más allá del principio de la pantalla"
+222 "La pantalla debe tener más de %d líneas para dividirse"
+223 "No hay pantallas de fondo"
+224 "No hay pantalla de fondo editando un archivo denominado %s"
+225 "No se puede poner fondo a la única pantalla que se visualiza"
+226 "La pantalla sólo puede reducirse a %d hileras"
+227 "La pantalla no puede reducirse"
+228 "La pantalla no puede aumentarse"
+230 "Esta pantalla no puede suspenderse"
+231 "Interrumpido: teclas mapeadas descartadas"
+232 "vi: buffer temporario no liberado"
+233 "Esta terminal no tiene tecla %s"
+234 "Sólo un buffer puede especificarse"
+235 "Número mayor que %lu"
+236 "Interrumpido"
+237 "No se puede crear archivo temporario"
+238 "Advertencia: %s no es un archivo regular"
+239 "%s ya se encuentra trabado, la sesión es de lectura solamente"
+240 "%s: eliminar"
+241 "%s: cerrar"
+242 "%s: eliminar"
+243 "%s: eliminar"
+244 "Archivo de lectura solamente, no escrito; usar ! para alterar"
+245 " Archivo de lectura solamente, no escrito"
+246 "%s existe, no escrito; usar ! para alterar"
+247 "%s existe, no escrito"
+248 "Archivo parcial, no escrito; usar ! para alterar"
+249 "Archivo parcial, no escrito"
+250 "%s: archivo modificado más recientemente que esta copia; usar ! para alterar"
+251 "%s: archivo modificado más recientemente que esta copia"
+252 "%s: la traba de escritura no estaba disponible"
+253 "Escribiendo..."
+254 "%s: ADVERTENCIA: ARCHIVO TRUNCADO"
+255 "Ya se encuentra en el primer identificador de este grupo"
+256 "%s: nuevo archivo: %lu líneas, %lu caracteres"
+257 "%s: %lu líneas, %lu caracteres"
+258 "%s expandido a demasiados nombres de archivos"
+259 "%s: no es un archivo regular"
+260 "%s: no le pertenece"
+261 "%s: accesible por un usuario que no sea el propietario"
+262 "Archivo modificado desde la última escritura completa; escribir o usar ! para alterar"
+263 "Archivo modificado desde la última escritura completa; escribir o usar :editar! para alterar"
+264 "Archivo modificado desde la última escritura completa; escribir o usar ! para alterar"
+265 "El archivo es temporario; al salir se descartarán las modificaciones"
+266 "Archivo de lectura solamente, las modificaciones no se autoescriben"
+267 "Se reinició el log"
+268 "confirmar? [snq]"
+269 "Presionar cualquier tecla para continuar: "
+270 "Presionar cualquier tecla para continuar [: para ingresar más comandos ex]: "
+271 "Presionar cualquier tecla para continuar [q para salir]: "
+272 "Esta forma de %s requiere la interfase terminal ex"
+273 "Ingresando en la modalidad de entrada ex."
+274 "Comando fracasado, no hay archivo leído aun."
+275 " cont?"
+276 "Evento inesperado de carácter"
+277 "Evento inesperado de final de archivo"
+278 "No hay coincidencias para consulta"
+279 "Evento inesperado de interrupción"
+280 "Evento inesperado de salida"
+281 "Evento inesperado de repintura"
+282 "Ya se encuentra en el último identificador de este grupo"
+283 "El comando %s requiere la interfase terminal ex"
+284 "Esta forma de %s no se encuentra soportada cuando se determina la opción de edición segura"
+285 "Evento inesperado de cadena"
+286 "Evento inesperado de tiempo excedido"
+287 "Evento inesperado de escritura"
+289 "Las expansiones de shell no se encuentran soportadas cuando se determina la opción de edición segura"
+290 "El comando %s no se encuentra soportado cuando se determina la opción de edición segura"
+291 "determinar: la opción %s puede no estar desconectada"
+292 "El monitor es demasiado pequeño."
+293 "agregado"
+294 "cambiado"
+295 "borrado"
+296 "unido"
+297 "movido"
+298 "desplazado"
+299 "arrancado"
+300 "línea"
+301 "líneas"
+302 "Vi no se cargó con un intérprete Tcl"
+303 "Archivo modificado desde la última escritura."
+304 "Expansión de shell fracasada"
+305 "No hay opción de edición %s especificada"
+306 "Vi no se cargó con un intérprete Perl"
+307 "No hay comando ex para ejecutar"
+308 "Ingresar <CR> para ejecutar un comando, :q para salir"
+309 "Usar \"cscope ayuda\" para obtener ayuda"
+310 "No hay conexiones cscope corriendo"
+311 "%s: tipo de búsqueda desconocido: usar uno de %s"
+312 "%d: no existe esta sesión cscope"
+313 "determinar: la opción %s no puede conectarse nunca"
+314 "determinar: la opción %s no puede determinarse nunca en 0"
+315 "%s: añadido: %lu líneas, %lu caracteres"
+316 "Evento inesperado de modificación de tamaño"
+317 "%d archivos para editar"
diff --git a/usr.bin/vi/catalog/swedish.UTF-8.base b/usr.bin/vi/catalog/swedish.UTF-8.base
new file mode 100644
index 0000000..fc08dfc
--- /dev/null
+++ b/usr.bin/vi/catalog/swedish.UTF-8.base
@@ -0,0 +1,306 @@
+002 "För långa rader"
+003 "kan inte ta bort rad %lu"
+004 "kan inte lägga till på rad %lu"
+005 "kan inte sätta in på rad %lu"
+006 "kan inte lagra rad %lu"
+007 "kan inte hämta sista raden"
+008 "Fel: kan inte hämta rad %lu"
+009 "Loggningsfil"
+010 "Loggning utförs inte, ångra är inte möjligt"
+011 "Inga ändringar att ångra"
+012 "Loggning utförs inte, ångra är inte möjligt"
+013 "Loggning utförs inte, ångra ångra är inte möjligt"
+014 "Inga ändringar att återgöra"
+015 "%s/%d: fel vid loggning"
+016 "Vi:s standard in och ut måste gå till en terminal"
+017 "Markering %s: inte satt"
+018 "Markering %s: raden har tagits bort"
+019 "Markering %s: markörpositionen finns inte längre"
+020 "Fel: "
+021 "ny fil"
+022 "namnet ändrades"
+023 "ändrad"
+024 "oförändrad"
+025 "OLÅST"
+026 "inte skrivbar"
+027 "rad %lu av %lu [%ld%%]"
+028 "tom fil"
+029 "rad %lu"
+030 "Filen %s är ingen meddelandekatalog"
+031 "Kan inte sätta standardvärde för %s flaggan"
+032 "Användning: %s"
+033 "set: %s är en okänd flagga: \"set all\" visar alla flaggor"
+034 "set: [no]%s flaggan kan inte ges ett värde"
+035 "set: %s flaggan är inte boleansk"
+036 "set: %s flaggan: %s"
+037 "set: %s flaggan: %s: för stort värde"
+038 "set: %s flaggan: %s är ett otillåtet tal"
+039 "set: %s flaggan är inte boleansk"
+040 "Fönsterkolumnerna är för få, mindre än %d"
+041 "Fönsterkolumnerna är för många, fler än %d"
+042 "Fönsterraderna är för få, mindre än %d"
+043 "Fönsterraderna är för många, fler än %d"
+044 "Lisp flaggan är inte implementerad"
+045 "meddelanden är inte avslagna: %s"
+046 "meddelanden är inte påslagna: %s"
+047 "%s flaggan måste ges i teckengrupper om två"
+053 "Standardbufferten är tom"
+054 "Buffer %s är tom"
+055 "Filer med radmatning i namnet kan inte återskapas"
+056 "Ändringar kan inte återskapas om programmet kraschar"
+057 "Kopierar filen för återskapning..."
+058 "Säkerhetskopiering misslyckades: %s"
+059 "Ändringar kan inte återskapas om programmet kraschar"
+060 "Misslyckades att säkerhetskopiera filen: %s"
+061 "Kopierar filen för återskapning..."
+062 "Kan inte hitta information om användaridentitet %u"
+063 "Kan inte låsa återskapningsfilen"
+064 "Återskapningsfilens buffer överskriven"
+065 "Återskapningsfil"
+066 "%s: Återskapningsfilen är korrupt"
+067 "%s: Återskapningsfilen är korrupt"
+068 "Det finns ingen fil %s, läsbar av dig, att återskapa"
+069 "Det finns äldre versioner av denna fil som du kan återskapa"
+070 "Det finns andra filer du kan återskapa"
+071 "skickar inte email: %s"
+072 "Filen är tom; inget att söka i"
+073 "Kom till slutet på filen utan att hitta söksträngen"
+074 "Ingen tidigare söksträng"
+075 "Hittar inte söksträngen"
+076 "Kom till början av filen utan att hitta söksträngen"
+077 "Sökningen slog runt"
+078 "Söker..."
+079 "Inga icke skrivbara tecken funna"
+080 "Okänt kommandonamn"
+082 "%s: kommandot är inte tillgängligt i \"ex\" läge"
+083 "Talet får inte vara noll"
+084 "%s: Ogiltig radspecifikation"
+085 "Fel i intern syntaxtabell (%s: %s)"
+086 "Användning: %s"
+087 "%s: temporärbuffert inte frisläppt"
+088 "Offset är före rad 1"
+089 "Offset är efter slutet på filen"
+090 "@ med intervall exekverades när filen/fönstret ändrades"
+091 "Global/v kommando exekverades när filen/fönstret ändrades"
+092 "Ex kommando misslyckades: efterföljande kommandon ignorerade"
+093 "Ex kommando misslyckades: omdefinierade tangenter ignorerade"
+094 "Den andra adressen är mindre än den första"
+095 "Inget namn på markering givet"
+096 "\\ följs inte av / eller ?"
+097 "Referens till ett radnummer mindre än 0"
+098 "%s kommandot är inte känt"
+099 "Värdet på adressen är för stort"
+100 "Värdet på adressen är för litet"
+101 "Otillåten adresskombination"
+102 "Otillåten adress: bara %lu rader finns i filen"
+103 "Otillåten adress: filen är tom"
+104 "%s kommandot tillåter inte en adress som är 0"
+105 "Inga förkortningar att visa"
+106 "Förkortningar måste sluta med ett \"ord\" tecken"
+107 "Förkortningar kan inte innehålla mellanslag eller tab"
+108 "Förkortningar kan inte blanda \"ord\"/\"icke ord\" tecken, utom i slutet"
+109 "\"%s\" är ingen förkortning"
+110 "Vi kommando misslyckades: omdefinierade tangenter ignorerade"
+111 "Inga fler filer att editera"
+112 "Inga tidigare filer att editera"
+113 "Inga tidigare filer att spela tillbaka"
+114 "Ingen fillista att visa"
+115 "Inget tidigare kommando att ersätta \"!\" med"
+116 "Inget filnamn att ersätta %% med"
+117 "Inget filnamn att ersätta # med"
+118 "Fel: execl: %s"
+119 "I/O fel: %s"
+120 "Filen ändrad efter sista skrivning; spara eller använd !"
+121 "Kan inte hitta hemkatalog"
+122 "Ny nuvarande katalog: %s"
+123 "Inga \"cut buffers\" att visa"
+124 "%s kommandot kan inte används som del i ett \"global\" eller v kommando"
+125 "%s/%s: inte läst: varken du eller root är ägare"
+126 "%s/%s: inte läst: du är inte ägare"
+127 "%s/%s: inte läst: skrivbar av annan än ägaren"
+128 "%s: inte läst: varken du eller root är ägare"
+129 "%s: inte läst: du är inte ägare"
+130 "%s: inte läst: skrivbar av annan än ägaren"
+131 "Ingen nästa rad att sätta ihop med"
+132 "Det finns inget i inmatningsmappningen"
+133 "Det finns inget i kommandomappningen"
+134 "%s tecknet kan inte mappas om"
+135 "\"%s\" är inte ommappat just nu"
+136 "Namn på markeringar måste vara ett tecken långa"
+137 "%s finns, inget sparat; använd ! för att spara"
+138 "Ny exrc fil: %s"
+139 "Målraden ligger inne i området som ska flyttas"
+140 "Open kommandot kräver att open flaggan är satt"
+141 "Open kommandot är inte implementerat ännu"
+142 "Säkerhetskopiering av filen är inte möjligt"
+143 "Filen säkerhetskopierad"
+144 "%s expanderade till för många filnamn"
+145 "Endast vanliga filer och namngivna rör kan läsas"
+146 "%s: läslåset är otillgängligt"
+147 "Läser..."
+148 "%s: %lu rader, %lu tecken"
+149 "Inga bakgrundsfönster att visa"
+150 "Script kommandot finns bara i \"vi\" läge"
+151 "Inget kommando att exekvera"
+152 "shiftwidth flaggan satt till 0"
+153 "Talet har för stort värde"
+154 "Talet har för litet värde"
+155 "Reguljärt uttryck är givet; r flaggan är meningslös"
+156 "#, l och p flaggorna kan inte kombineras med c flaggan i \"vi\" läge"
+157 "Ingen matchande text funnen"
+158 "Inget tidigare märke har givits"
+159 "Det är färre än %s märken i stacken; använd :display t[ags]"
+160 "Det finns ingen fil %s i märkesstacken; använd :display t[ags]"
+161 "Tryck Enter för att fortsätta: "
+162 "%s: märke inte funnet"
+163 "%s: korrupt märke i %s"
+164 "%s: märkets radnummer är bortom filslutet"
+165 "Märkesstacken är tom"
+166 "%s: söksträngen inte funnen"
+167 "%d filer till att editera"
+168 "Buffert %s är tom"
+169 "Bekräfta ändring? [n]"
+170 "Avbruten"
+171 "Ingen tidigare buffert att exekvera"
+172 "Inget tidigare reguljärt uttryck"
+173 "%s kommandot kräver att en fil redan lästs in"
+174 "Användning: %s"
+175 "Visual kommandot kräver att open flaggan är satt"
+177 "Tom fil"
+178 "Ingen tidigare F, f, T eller t sökning"
+179 "%s inte funnen"
+180 "Ingen tidigare fil att editera"
+181 "Markören är inte i ett tal"
+182 "Det resulterande talet är för stort"
+183 "Det resulterande talet är för litet"
+184 "Inget matchande tecken på denna rad"
+185 "Matchande tecken inte funnet"
+186 "Det finns inga tecken att ersätta"
+187 "Det finns inget fönster att byta till"
+188 "Tecken efter söksträng, radoffset och/eller z kommandot"
+189 "Ingen tidigare söksträng"
+190 "Sökningen slog runt till ursprungliga positionen"
+191 "Förkortning överskred expanderingsgränsen: tecken har tagits bort"
+192 "Ogiltigt tecken; använd \"quote\" för att sätta in"
+193 "Redan i början på insättningen"
+194 "Inga fler tecken att ta bort"
+195 "Försök att gå bortom slutet på filen"
+196 "Försök att gå bortom slutet på raden"
+197 "Ingen förflyttning gjord"
+198 "Redan i början på filen"
+199 "Försök att gå före början på filen"
+200 "Redan i första kolumnen"
+201 "Buffertar måste anges före kommandot"
+202 "Redan i slutet av filen"
+203 "Redan på slutet av raden"
+204 "%s är inte ett \"vi\" kommando"
+205 "Användning: %s"
+206 "Inga tecken att ta bort"
+207 "Q kommandot kräver \"ex\" i terminalläge"
+208 "Inget kommando att repetera"
+209 "Filen är tom"
+210 "%s kan inte användas som ett förflyttningskommando"
+211 "Redan i kommando läge"
+212 "Markören är inte i ett ord"
+214 "Windows flaggans värde är för stor, största värde är %u"
+215 "Lägg till"
+216 "Ändra"
+217 "Kommando"
+218 "Sätt in"
+219 "Ersätt"
+220 "Förflyttning bortom fönsterslut"
+221 "Förflyttning till före fönstrets början"
+222 "Fönstret måste vara större än %d rader för delning"
+223 "Det finns inga fönster i bakgrunden"
+224 "Det finns inget fönster i bakgrunden som editerar filen %s"
+225 "Du får inte sätta ditt enda synliga fönster i bakgrunden"
+226 "Fönstret kan bara krympa till %d rader"
+227 "Fönstret kan inte krympa"
+228 "Fönstret kan inte växa"
+230 "Detta fönster kan inte pausas"
+231 "Avbrutet: omdefinierade tangenter ignorerade"
+232 "vi: temporärbuffertar inte frisläppta"
+233 "Denna terminal har ingen %s tangent"
+234 "Endast en buffert kan anges"
+235 "Talet är större än %lu"
+236 "Avbrutet"
+237 "Kan inte skapa temporär fil"
+238 "Warning: %s är inte en normal fil"
+239 "%s är redan låst, detta blir en icke skrivbar session"
+240 "%s: ta bort"
+241 "%s: stäng"
+242 "%s: ta bort"
+243 "%s: ta bort"
+244 "Ej skrivbar fil, filen inte sparad; använd ! för att skriva över"
+245 "Ej skrivbar fil, filen inte sparad"
+246 "%s finns, ej sparad; använd ! för att utföra operationen"
+247 "%s finns, filen inte sparad"
+248 "Ofullständig fil, filen inte sparad, använd ! för att skriva över"
+249 "Ofullständig fil, filen inte sparad"
+250 "%s: filen ändrad efter denna kopia togs; använd ! för att utföra operationen"
+251 "%s: filen ändrad efter denna kopia togs"
+252 "%s: skrivlåset är otillgängligt"
+253 "Skriver..."
+254 "%s: VARNING: FILEN TRUNKERAD"
+255 "Redan vid första märket i denna grupp"
+256 "%s: ny fil: %lu rader, %lu tecken"
+257 "%s: %lu rader, %lu tecken"
+258 "%s expanderade till för många filnamn"
+259 "%s är inte en normal fil"
+260 "%s ägs inte av dig"
+261 "%s är åtkomstbar av andra än ägaren"
+262 "Filen har ändrats efter den sparats; spara eller använd !"
+263 "Filen har ändrats efter den sparats; spara eller använd :edit!"
+264 "Filen har ändrats efter den sparats; spara eller använd !"
+265 "Filen är temporär; exit kastar bort ändringarna"
+266 "Ej skrivbar fil, ändringar har inte automatsparats"
+267 "Loggningen startar om"
+268 "bekräfta? [ynq]"
+269 "Tryck på en tangent för att fortsätta: "
+270 "Tryck på en tangent för att fortsätta [: för att ge fler kommandon]: "
+271 "Tryck på en tangent för att fortsätta [q för att avsluta]: "
+272 "Den formen av %s kräver \"ex\" i terminalläge"
+273 "Går till \"ex\" inmatningsläge."
+274 "Kommandot misslyckades, ingen fil inläst ännu."
+275 " forts?"
+276 "Oväntad teckenhändelse"
+277 "Oväntad filslutshändelse"
+278 "Sökningen hittade ingenting"
+279 "Oväntad avbrottshändelse"
+280 "Oväntad avslutningshändelse"
+281 "Oväntad omritningshändelse"
+282 "Redan vid sista märket i denna grupp"
+283 "%s kommandot kräver \"ex\" i terminalläge"
+284 "Den formen av %s är inte tillgänglig när secure edit flaggan är satt"
+285 "Oväntad stränghändelse"
+286 "Oväntad tidshändelse"
+287 "Oväntad skrivhändelse"
+289 "Skalexpansion är inte tillgänglig när secure edit flaggan är satt"
+290 "%s kommandot är inte tillgänglig när secure edit flaggan är satt"
+291 "set: %s kan inte slås av"
+292 "Fönstret för litet."
+293 "tillagda"
+294 "ändrade"
+295 "borttagna"
+296 "ihopsatta"
+297 "flyttade"
+298 "flyttade"
+299 "inklistrade"
+300 "rad"
+301 "rader"
+302 "Vi har inte länkats med en Tcl tolk"
+303 "Filen har ändrats efter den sparats."
+304 "Skalexpansion misslyckades"
+305 "Ingen %s edit flagga given"
+306 "Vi har inte länkats med en Perl tolk"
+307 "Inga \"ex\" kommandon att exekvera"
+308 "Tryck <CR> för att exekvera kommando, :q för att avsluta"
+309 "Gör \"cscope help\" för hjälp"
+310 "Inga cscope kopplingar körs"
+311 "%s: okänd söktyp: använd en av %s"
+312 "%d: ingen sådan cscope session"
+313 "set: %s flaggan får aldrig slås på"
+314 "set: %s flaggan får aldrig sättas till 0"
+315 "%s: tillagt: %lu rader, %lu tecken"
+316 "Oväntad storleksändring"
+317 "%d filer att editera"
diff --git a/usr.bin/vi/catalog/uk_UA.UTF-8.base b/usr.bin/vi/catalog/uk_UA.UTF-8.base
new file mode 100644
index 0000000..b4d6887
--- /dev/null
+++ b/usr.bin/vi/catalog/uk_UA.UTF-8.base
@@ -0,0 +1,306 @@
+002 "Переповнення значення довжини рядку"
+003 "неможливо стерти рядок %lu"
+004 "неможливо додати до рядку %lu"
+005 "неможливо вставити в рядок %lu"
+006 "неможливо розмістити рядок %lu"
+007 "неможливо дістати останній рядок"
+008 "Помилка: неможливо отримати рядок %lu"
+009 "Файл записів"
+010 "Записи не велися, неможливо відмінити останню команду"
+011 "Нема чого відміняти"
+012 "Записи не велися, неможливо відмінити останню команду"
+013 "Записи не велися, неможливо продивитися вперед"
+014 "Нема чого повторювати"
+015 "%s/%d: помилка запису протоколу"
+016 "Стандартним введенням/виведенням для vi має бути термінал"
+017 "Мітка %s: не встановлено"
+018 "Мітка %s: рядок стерто"
+019 "Мітка %s: позиції курсору більше не існує"
+020 "Помилка: "
+021 "Новий файл"
+022 "Iм'я змінилось"
+023 "змінений"
+024 "не змінений"
+025 "РO3БЛOКOВАНO"
+026 "тільки для читання"
+027 "рядок %lu з %lu [%ld%%]"
+028 "пустий файл"
+029 "рядок %lu"
+030 "Файл %s не є файлом повідомленнь"
+031 "Неможливо встановити опцію %s за змовчанням"
+032 "Використання: %s"
+033 "Опції %s немає: 'set all' показує всі можливі опції"
+034 "set: [no]%s не набуває такого значення"
+035 "set: %s опція не є логічною"
+036 "set: опція %s: %s"
+037 "set: опція %s: %s: переповнення"
+038 "set: неправильне значення %s"
+039 "set: %s опція не є логічною"
+040 "Кількість колонок на экрані надто мала, менше ніж %d"
+041 "Кількість колонок на экрані надто велика, більше ніж %d"
+042 "Кількість рядків на экрані надто мала, менше ніж %d"
+043 "Кількість рядків на экрані надто велика, більше ніж %d"
+044 "Опція lisp відсутня"
+045 "Повідомлення не вимкнені: %s"
+046 "Повідомлення не ввімкнені: %s"
+047 "Опція %s повинна містити групи з двох символів"
+053 "Стартовий буфер порожній"
+054 "Буфер %s порожній"
+055 "Неможливо відновити файл, що містить в імені символи переведення каретки"
+056 "Зміни не можна буде відновити після краху сесії"
+057 "Копіювання файлу для відновлення..."
+058 "Збереження не вдалось: %s"
+059 "Зміни не можна буде відновити після краху сесії"
+060 "Збереження копії файлу не вдалось: %s"
+061 "Копіювання файлу для відновлення..."
+062 "Iнформацію про користувача %u не знайдено"
+063 "Заблокувати відновленний файл неможливо"
+064 "Буфер відновленого файлу переповнено"
+065 "Відновленний файл"
+066 "%s: файл відновленний не до кінця"
+067 "%s: файл відновленний не до кінця"
+068 "Не існуює файлів з іменем %s, які Ви можете прочитати"
+069 "Iснують старі версії файлу, які можна відновити"
+070 "Iснують інші файли, які можна відновити"
+071 "e-mail не відіслано: %s"
+072 "Файл пустий - нема чого шукати"
+073 "Досянуто кінця файлу без знахождення зразку пошуку"
+074 "Не задано зразок пошуку"
+075 "Зразок пошуку не знайдено"
+076 "Досянуто початку файлу без знахождення зразку пошуку"
+077 "Пошук зациклено"
+078 "Пошук..."
+079 "Непечатних символів не знайдено"
+080 "Невідома команда"
+082 "%s: команда не доступна в режимі ex"
+083 "Лічильник не може бути нулем"
+084 "%s: неправильне визначення рядку"
+085 "Внутрішня помилка в синтаксисі (%s: %s)"
+086 "Використання: %s"
+087 "%s: тимчасовий буфер не використано"
+088 "Мітку поставлено перед першим рядком"
+089 "Мітку поставлено після кінця файлу"
+090 "@ з діапазоном працює коли змінено файл/вікно"
+091 "Команда Global/v працює коли змінено файл/вікно"
+092 "Команда ex не вдалась: наступні команди з'ігноровано"
+093 "Команда ex не вдалась: відображені клавіші з'ігноровано"
+094 "Друга адреса менше ніж перша"
+095 "Не вказано ім'я мітки"
+096 "\\ не закінчується / чи ?"
+097 "Посилання на рядок з номером, меншим ніж 0"
+098 "Команда %s невідома"
+099 "Переповнення лічильника адрес"
+100 "Недобір лічильника адрес"
+101 "Недопустима комбінація в адресі"
+102 "Неправильна адреса: всього %lu рядків у файлі"
+103 "Неправильна адреса: файл пустий"
+104 "Команда %s не може використовувати адресу 0"
+105 "Немає абревіатур"
+106 "Абревіатури повинні закінчуватися символом \"слів\""
+107 "В абревіатурі не можна використовувати символи табуляції та пробіли"
+108 "Абревіатури не можуть змішувати символи слів/не-слів, хіба що в кінці рядку"
+109 "\"%s\" не абревіатура"
+110 "Команда Vi не вдалась: відображені клавіші з'ігноровано"
+111 "Файлів для редагування більше немає"
+112 "Попереднього файлу для редагування немає"
+113 "Попереднього файлу для перегляду немає"
+114 "Немає файлів"
+115 "Немає попередньої команди для заміни \"!\""
+116 "Відсутнє ім'я файлу для підміни %%"
+117 "Відсутнє ім'я файлу для підміни #"
+118 "Помилка: execl: %s"
+119 "Помилка введення/виведення: %s"
+120 "Файл модифіковано після останньої команди повного запису: збережіть чи використайте ! для обходу"
+121 "Неможливо знайти домашній каталог"
+122 "Новий каталог: %s"
+123 "Немає наповнених буферів"
+124 "Команда %s не використовується як частина команди global чи v"
+125 "%s/%s: не відкрито: не належить Вам чи адміністратору"
+126 "%s/%s: не відкрито: не належить Вам"
+127 "%s/%s: не відкрито: можливість запису користувачем, який не є власником"
+128 "%s: не відкрито: не належить Вам чи адміністратору"
+129 "%s: не відкрито: не належить Вам"
+130 "%s: не відкрито: можливість запису користувачем, який не є власником"
+131 "Немає більше рядків для об'єднання"
+132 "Немає параметрів введення"
+133 "Немає параметрів команди"
+134 "Символ %s не можна переназначити"
+135 "\"%s\" зараз не переназначено"
+136 "Iм'я мітки -- один символ"
+137 "%s існує, не записано; використайте ! для обходу"
+138 "Новий файл exrс: %s"
+139 "Рядок призначення зазначено всередині діапазону переміщення"
+140 "Команда open вимагає встановлення опції open"
+141 "Команду open ще не реалізовано"
+142 "Захист файлу неможливий"
+143 "Файл захищено"
+144 "%s розширився в надто велику кількість імен файлів"
+145 "Прочитати можна тільки простий файл чи іменований канал(pipe)"
+146 "%s: блокування від читання неможливе"
+147 "Зчитую..."
+148 "%s: %lu рядків, %lu символів"
+149 "Немає тіньових вікон"
+150 "Команда script доступна лише в режимі vi"
+151 "Нема команди для виконання"
+152 "Опцію shiftwidth встановлено в 0"
+153 "Переповнення лічильника"
+154 "Цикл виконано не до кінця"
+155 "Вказано регулярний вираз; параметр 'r' не має сенсу"
+156 "Параметри #, l та p не можна комбінувати з параметром 'c' в режимі vi"
+157 "Співпадань немає"
+158 "Tег відсутній"
+159 "Менше ніж %s записів у стеку тегів; використайте :display t[ags]"
+160 "Немає файлу %s в стеку тегів для повернення; використайте :display t[ags]"
+161 "Натисніть ENTER для продовження: "
+162 "%s: тег не знайдено"
+163 "%s: зіпсований тег в %s"
+164 "%s: номер рядку тега знаходиться за кінцем файлу"
+165 "Стек тегів порожній"
+166 "%s: зразок пошуку не знайдено"
+167 "Залишилось %d файлів для редагування"
+168 "Буфер %s порожній"
+169 "Змінити? [n]"
+170 "Перервано"
+171 "Немає буферу для використання"
+172 "Немає попереднього регулярного виразу"
+173 "Команда %s вимагає вже прочитаний файл"
+174 "Використання: %s"
+175 "Команда visual вимагає встановлення опції open"
+177 "Пустий файл"
+178 "Немає попереднього пошуку F, f, T, чи t"
+179 "%s не знайдено"
+180 "Немає попереднього файлу для редагування"
+181 "Курсор стоїть не на цифрі"
+182 "Oтримане число надто велике"
+183 "Oтримане число надто мале"
+184 "Немає відповідного символу в цьому рядку"
+185 "Відповідний символ не знайдено"
+186 "Немає символів для заміни"
+187 "Немає іншого вікна"
+188 "Символи після рядку для пошуку, зміщення рядку та/чи команди z"
+189 "Немає попереднього зразку пошуку"
+190 "Пошук закінчився на початковій позиції"
+191 "Абревіатура перевищила ліміт розширення: символи з'ігноровано"
+192 "Недозволений символ: задайте в дужках"
+193 "Вже на початку вставки"
+194 "Немає символів для видалення"
+195 "Рух за кінець файлу"
+196 "Рух за кінець рядку"
+197 "Курсор не переміщувався"
+198 "Вже на початку файлу"
+199 "Рух курсору за початок файлу"
+200 "Вже в першій колонці"
+201 "Буфер треба вказувати перед командою"
+202 "Вже на кінці файлу"
+203 "Вже на кінці рядку"
+204 "%s не команда Vi"
+205 "Використання: %s"
+206 "Немає символів для видалення"
+207 "Команда Q вимагає інтерфейсу ex"
+208 "Немає команди для повторення"
+209 "Файл пустий"
+210 "Команду %s не можна використати для переміщення"
+211 "Вже в командному режимі"
+212 "Курсор стоїть не на слові"
+214 "Значнення опції Windows надто велике, максимум = %u"
+215 "Дописати"
+216 "Змінити"
+217 "Команда"
+218 "Вставити"
+219 "Замінити"
+220 "Рух курсору за кінець экрану"
+221 "Рух курсору за початок экрану"
+222 "Для розбиття вікно має містити більше ніж %d рядків"
+223 "Тіньових вікон немає"
+224 "Немає тіньового вікна з редагуванням файлу %s"
+225 "Не можна зробити тіньовим єдине вікно"
+226 "Вікно можна стиснути лише до %d рядків"
+227 "Вікно не можна стиснути"
+228 "Вікно не можна розширити"
+230 "Це вікно не можна призупинити"
+231 "Перервано: відображені клавіші з'ігноровано"
+232 "vi: тимчасовий буфур не вивільнено"
+233 "Цей тип терміналу немає клавіші %s"
+234 "Можна вказати лише один буфер"
+235 "Число більше, ніж %lu"
+236 "Перервано"
+237 "Неможлу створити тимчасовий файл"
+238 "УВАГА: %s спеціальний файл"
+239 "%s вже заблоковано, доступний тільки для читання"
+240 "%s: стерто"
+241 "%s: закрито"
+242 "%s: стерто"
+243 "%s: стерто"
+244 "Файл тільки для читання, не записано: Використайте ! для обходу"
+245 "Файл тільки для читання, не записано"
+246 "%s існує, не записано; використайте ! для обходу"
+247 "%s існує, не записано"
+248 "Використайте ! для часткового запису файлу"
+249 "Частина файлу, файл не записано"
+250 "%s: Файл змінювався пізніше, ніж ця копія: використайте ! для обходу"
+251 "%s: Файл змінювався пізніше, ніж ця копія"
+252 "%s: захист від запису недоступний"
+253 "Запис..."
+254 "%s: УВАГА: файл обрізано"
+255 "Вже на першому тегу в цій групі"
+256 "%s: новий файл: %lu рядків, %lu символів"
+257 "%s: %lu рядків, %lu символів"
+258 "%s розширився в надто велику кількість імен файлів"
+259 "%s: спеціальний файл"
+260 "%s: не належить Вам"
+261 "%s: доступний не лише Вам
+262 "Файл модифіковано після останньої команди запису: збережіть чи використайте ! для обходу"
+263 "Файл модифіковано після останньої команди запису: збережіть чи використайте :edit для обходу"
+264 "Файл модифіковано після останньої команди запису: збережіть чи використайте ! для обходу"
+265 "Тимчасовий файл: вихід зітре зміни"
+266 "Файл тільки для читання, зміни не запишуться автоматично"
+267 "Записи початі заново"
+268 "Підтверджуєте? [ynq]"
+269 "Натисніть ENTER для продовження: "
+270 "Натисніть ENTER для продовження [: для інших команд] "
+271 "Натисніть ENTER для продовження [q для виходу]: "
+272 "Tака форма %s вимагає інтерфейсу ex"
+273 "Входим в режим введення ex"
+274 "Збій команди, файл не прочитано"
+275 "Продовжити?"
+276 "Неочікувана символьна подія"
+277 "Неочікувана подія кінця файлу"
+278 "Немає співпадань за запитом"
+279 "Неочікувана подія переривання"
+280 "Неочікувана подія виходу"
+281 "Неочікувана подія перерисовки"
+282 "Вже на останньму Тегу в цій групі"
+283 "Команда %s вимагає інтерфейсу ex"
+284 "Tака форма %s не дозволяється при встановленій опції secure edit"
+285 "Неочікувана подія рядку"
+286 "Неочікувана подія тайм-ауту"
+287 "Неочікувана подія запису"
+289 "Shell'івске доповнення не дозволяється при встановленій опції secure edit"
+290 "Команда %s не дозволяється при встановленій опції secure edit"
+291 "set: опцію %s неможна виставити вимкненою"
+292 "Екран надто малий."
+293 "додано"
+294 "змінено"
+295 "стерто"
+296 "об'єднано"
+297 "переміщено"
+298 "здвинуто"
+299 "вставлено"
+300 "рядок"
+301 "рядків"
+302 "Vi завантажено без інтерпретатора Tcl"
+303 "Файл модифіковано після останньої команди запису."
+304 "Невдача shell'івського доповнення"
+305 "Oпції редагування %s не вказано"
+306 "Vi завантажено без інтерпретатора Perl"
+307 "Немає команди ex для виконання"
+308 "Натисніть ENTER щоб виконати команду, q щоб вийти"
+309 "Введіть 'cscope help' для інформації"
+310 "Немає cscope з'єднаннь"
+311 "%s: невідомий тип пошуку: використовуйте один з %s"
+312 "%d: немає такої сесії cscope"
+313 "set: опцію %s неможна виставити увімкненою"
+314 "set: опцію %s неможна виставити в 0"
+315 "%s: додано: %lu рядків, %lu символів"
+316 "Неочікувана подія зміни розміру"
+317 "%d файлів для редагування"
diff --git a/usr.bin/vi/catalog/zh_CN.UTF-8.base b/usr.bin/vi/catalog/zh_CN.UTF-8.base
new file mode 100644
index 0000000..c51a7c3
--- /dev/null
+++ b/usr.bin/vi/catalog/zh_CN.UTF-8.base
@@ -0,0 +1,311 @@
+002 "行长度溢出"
+003 "无法删除第 %lu 行"
+004 "无法向第 %lu 行追加"
+005 "无法向第 %lu 行插入"
+006 "无法存储第 %lu 行"
+007 "无法获得最后一行"
+008 "错误：无法获取第 %lu 行"
+009 "日志文件"
+010 "日志未记录，无法撤销"
+011 "未做修改，无法撤销"
+012 "日志未记录，无法撤销"
+013 "日志未记录，无法回滚"
+014 "未做修改，无法重做"
+015 "%s/%d: 日志错误"
+016 "Vi 的标准输入和输出必须是终端"
+017 "标记 %s: 未设置"
+018 "标记 %s: 该行被删除"
+019 "标记 %s: 光标位置不存在"
+020 "错误："
+021 "新文件"
+022 "文件名变更"
+023 "已修改"
+024 "未修改"
+025 "已解锁"
+026 "只读"
+027 "第 %lu 行／共 %lu 行 [%ld%%]"
+028 "空文件"
+029 "第 %lu 行"
+030 "文件 %s 不是消息目录"
+031 "无法设置选项 %s 的默认值"
+032 "用法 %s"
+033 "set: 不存在选项 %s；用 'set all' 查看所有选项的值"
+034 "set: 选项 [no]%s 不接受赋值"
+035 "set: 选项 %s 不是开关"
+036 "set: 选项 %s: %s"
+037 "set: 选项 %s: %s: 值溢出"
+038 "set: 选项 %s: %s 是一个非法数字"
+039 "set: 选项 %s 不是开关"
+040 "屏幕太窄，列宽小于 %d"
+041 "屏幕太宽，列宽大于 %d"
+042 "屏幕太矮，行高小于 %d"
+043 "屏幕太高，行高大于 %d"
+044 "lisp 选项未实现"
+045 "消息未关闭：%s"
+046 "消息未打开：%s"
+047 "%s 选项必须每两个字符一组"
+053 "默认缓冲区为空"
+054 "缓冲区 %s 为空"
+055 "文件名中有换行的文件是无法恢复的"
+056 "一旦会话失败，修改无法恢复"
+057 "正在备份文件……"
+058 "保存失败：%s"
+059 "一旦会话失败，修改无法恢复"
+060 "文件备份失败：%s"
+061 "正在备份文件……"
+062 "ID 为 %u 的用户未找到"
+063 "无法给恢复文件加锁"
+064 "恢复文件缓冲区溢出"
+065 "恢复文件"
+066 "%s: 恢复文件格式异常"
+067 "%s: 恢复文件格式异常"
+068 "不存在名为 %s 的，可读并需要恢复的文件"
+069 "存在此文件的旧版本需要您恢复"
+070 "存在其它需要您恢复的文件"
+071 "邮件未发出：%s"
+072 "文件为空，无法搜索"
+073 "到达文件尾，未找到模式"
+074 "没有上一个搜索模式"
+075 "模式未找到"
+076 "到达文件头，未找到模式"
+077 "搜索回转"
+078 "正在搜索……"
+079 "未找到不可打印字符"
+080 "命令名不明"
+082 "%s: 命令在 ex 模式下不可用"
+083 "命令计数不可为 0"
+084 "%s: 错误的行描述"
+085 "内部语法表错误 (%s: %s)"
+086 "用法：%s"
+087 "%s: 临时缓冲区未释放"
+088 "修饰符偏移量在第一行之前"
+089 "修饰符偏移量超过最后一行"
+090 "文件／屏幕改变时有带范围的 @ 命令正在运行"
+091 "文件／屏幕改变时有全局命令／v 命令正在运行"
+092 "Ex 命令失败：等待中的命令已丢弃"
+093 "Ex 命令失败：键映射已丢弃"
+094 "第二地址小于第一地址"
+095 "未提供标记名"
+096 "\\ 没有跟在 / 或 ? 后面"
+097 "引用了小于 0 的行号"
+098 "%s 命令不明"
+099 "地址值溢出"
+100 "地址值下溢"
+101 "非法的地址组合"
+102 "非法地址：文件只有 %lu 行"
+103 "非法地址：文件为空"
+104 "命令 %s 不允许地址为 0"
+105 "没有可显示的缩写"
+106 "缩写必须以「单词」字符结束"
+107 "缩写不能包含制表符或空格"
+108 "缩写不能在结尾之外的地方混用单词／非单词字符"
+109 "\"%s\" 不是缩写"
+110 "Vi 命令失败：键映射已丢弃"
+111 "没有剩余的待编辑文件"
+112 "没有上一个待编辑文件"
+113 "没有上一个需重新编辑的文件"
+114 "没有可显示的文件列表"
+115 "缺少用于替换 \"!\" 的上一条命令"
+116 "缺少用于替换 %% 的文件名"
+117 "缺少用于替换 # 的文件名"
+118 "错误：execl: %s"
+119 "输入／输出错误：%s"
+120 "文件在上一次完整写入后被修改；写入文件，或使用 ! 强制切换目录"
+121 "无法找到用户起始目录"
+122 "新的当前目录：%s"
+123 "没有可显示的剪切缓冲区"
+124 "%s 命令不能被用作全局命令或 v 命令的一部分"
+125 "%s/%s: 未引入：不属于您或根用户"
+126 "%s/%s: 未引入：不属于您"
+127 "%s/%s: 未引入：可以被文件属主以外的用户写入"
+128 "%s: 未引入：不属于您或根用户"
+129 "%s: 未引入：不属于您"
+130 "%s: 未引入：可以被文件属主以外的用户写入"
+131 "缺少可以合并的行"
+132 "缺少输入映射"
+133 "缺少命令映射"
+134 "%s 字符不能被重新映射"
+135 "\"%s\" 目前未被映射"
+136 "标记名必须是单个字符"
+137 "%s 已存在，未写入；用 ! 覆盖文件"
+138 "新建 exrc 文件：%s"
+139 "目标行在移动范围之内"
+140 "open 要求开启 open 选项"
+141 "open 命令未实现"
+142 "无法保持此文件"
+143 "文件已保持"
+144 "%s: 展开的文件名过多"
+145 "只能读取常规文件和具名管道"
+146 "%s: 读锁不可用"
+147 "正在读取……"
+148 "%s: %lu 行，%lu 个字符"
+149 "没有可显示的后台屏幕"
+150 "script 命令仅在 vi 模式下可用"
+151 "没有要执行的命令"
+152 "shiftwidth 选项被设为 0"
+153 "命令计数溢出"
+154 "命令计数下溢"
+155 "正则表达式已指定；r 修饰符无效"
+156 "#, l 和 p 修饰符在 vi 模式下不能与 c 修饰符组合"
+157 "未找到匹配"
+158 "没有上一次进入的 tag"
+159 "tags 栈上的记录少于 %s 条；用 :display t[ags] 显示它们"
+160 "tags 栈上不存在文件 %s，无法返回；用 :display t[ags] 查看"
+161 "按回车键继续："
+162 "%s: tag 未找到"
+163 "%s: 损坏的 tag 在 %s 中"
+164 "%s: tag 的行号超过了文件尾"
+165 "tags 栈为空"
+166 "%s: 搜索模式未找到"
+167 "还有 %d 个待编辑文件"
+168 "缓冲区 %s 为空"
+169 "确认修改？[n]"
+170 "已中断"
+171 "没有上一个可供执行的缓冲区"
+172 "没有上一条正则表达式"
+173 "%s 要求存在一个已读入的文件"
+174 "用法：%s"
+175 "visual 命令要求开启 open 选项"
+177 "空文件"
+178 "没有上一次 F, f, T 或 t 搜索"
+179 "%s 未找到"
+180 "没有上一个待编辑文件"
+181 "光标不在数字上"
+182 "结果数字过大"
+183 "结果数字过小"
+184 "这一行上没有匹配的字符"
+185 "匹配字符未找到"
+186 "没有可替换的字符"
+187 "没有其它屏幕可以切换"
+188 "在搜索字符串、行偏移量或 z 命令之后有多余字符"
+189 "没有上一个搜索模式"
+190 "搜索回转到了初始位置"
+191 "缩写展开超过限制：字符已丢弃"
+192 "非法字符；用引号括起来再输入"
+193 "已到插入点的开始"
+194 "没有可擦除的剩余字符"
+195 "移动超过文件尾"
+196 "移动超过行末"
+197 "光标未移动"
+198 "已到文件头"
+199 "移动超过文件头"
+200 "已位于第一列"
+201 "缓冲区应在命令前指定"
+202 "已到文件尾"
+203 "已到行末"
+204 "%s 不是 vi 命令"
+205 "用法 %s"
+206 "没有可删除的字符"
+207 "Q 命令需要 ex 终端界面"
+208 "没有可重复的命令"
+209 "文件为空"
+210 "%s 不能被用作移动命令"
+211 "已处于命令模式"
+212 "光标不在单词上"
+214 "窗口选项的值过大，最大值 %u"
+215 "追加"
+216 "修改"
+217 "命令"
+218 "插入"
+219 "替换"
+220 "移动超过屏幕终点"
+221 "移动超过屏幕起点"
+222 "分屏需要多于 %d 行"
+223 "没有后台屏幕"
+224 "不存在正在编辑文件 %s 的后台屏幕"
+225 "不能把您唯一的屏幕置于后台"
+226 "屏幕只能收缩到 %d 行"
+227 "屏幕不能收缩"
+228 "屏幕不能增高"
+230 "不能挂起此屏幕"
+231 "已中断：键映射已丢弃"
+232 "vi: 临时缓冲区未释放"
+233 "此终端没有 %s 键"
+234 "只能指定一个缓冲区"
+235 "数字大于 %lu"
+236 "已中断"
+237 "无法创建临时文件"
+238 "警告：%s 不是常规文件"
+239 "%s 已加锁，会话为只读"
+240 "%s: 移除"
+241 "%s: 关闭"
+242 "%s: 移除"
+243 "%s: 移除"
+244 "只读文件，未写入；用 ! 强制写入"
+245 "只读文件，未写入"
+246 "%s 已存在，未写入；用 ! 覆盖文件"
+247 "%s 已存在，未写入"
+248 "是已存在文件的一部分，未写入；用 ! 强制写入"
+249 "是已存在文件的一部分，未写入"
+250 "%s: 文件被修改，新于当前拷贝；用 ! 强制写入"
+251 "%s: 文件被修改，新于当前拷贝"
+252 "%s: 写锁不可用"
+253 "正在写入……"
+254 "%s: 警告：文件被截断"
+255 "已位于这组 tags 中的第一个"
+256 "%s: 新文件：%lu 行，%lu 个字符"
+257 "%s: %lu 行，%lu 个字符"
+258 "%s: 展开的文件名过多"
+259 "%s: 不是常规文件"
+260 "%s: 不属于您"
+261 "%s: 可被文件属主以外的用户访问"
+262 "文件在上一次完整写入后被修改；写入文件，或使用 ! 强制载入"
+263 "文件在上一次完整写入后被修改；写入文件，或使用 :edit! 强制编辑"
+264 "文件在上一次完整写入后被修改；写入文件，或使用 ! 强制执行"
+265 "临时文件，退出将丢弃全部修改"
+266 "文件只读，修改未被自动写入"
+267 "日志重启"
+268 "确认？[ynq]"
+269 "按任意键继续："
+270 "按任意键继续［按 : 键输入 ex 命令］："
+271 "按任意键继续［按 q 键推出］："
+272 "该形式的 %s 命令需要 ex 终端界面"
+273 "进入 ex 输入模式"
+274 "命令失败，尚未读入文件"
+275 " 继续？"
+276 "意外的字符事件"
+277 "以外的文件尾事件"
+278 "查询未找到匹配"
+279 "意外的中断事件"
+280 "意外的退出事件"
+281 "意外的重绘事件"
+282 "已位于这组 tags 中的最后一个"
+283 "%s 命令需要 ex 终端界面"
+284 "secure 编辑选项开启时不支持该形式的 %s 命令"
+285 "意外的字符串事件"
+286 "意外的超时事件"
+287 "意外的写入事件"
+288 "分屏需要多于 %d 列"
+289 "secure 编辑选项开启时不支持 shell 展开"
+290 "secure 编辑选项开启时不支持 %s 命令"
+291 "set: 选项 %s 不能关闭"
+292 "显示空间太小"
+293 "已添加"
+294 "已修改"
+295 "已删除"
+296 "已合并"
+297 "已移动"
+298 "已偏移"
+299 "已复制"
+300 "行"
+301 "行"
+303 "文件在上一次写入后被修改"
+304 "Shell 展开失败"
+305 "未指定 %s 编辑选项"
+307 "没有要执行的 ex 命令"
+308 "键入回车执行一条命令，:q 退出"
+309 "使用 \"cscope help\" 查看帮助"
+310 "没有正在运行的 cscope 连接"
+311 "%s: 搜索类型不明：使用 %s 中的一个"
+312 "%d: 无此 cscope 会话"
+313 "set: 选项 %s 绝对不能开启"
+314 "set: 选项 %s 绝对不能被设为 0"
+315 "%s: 已追加：%lu 行，%lu 个字符"
+316 "意外的大小调整事件"
+317 "%d 个待编辑的文件"
+319 "%d 个后台屏幕；用 :display 列出它们"
+320 "光标位置不明"
+321 "不支持文件编码转换"
+322 "不支持输入编码转换"
+323 "无效输入，已截断"
+324 "第 %d 行上有转换错误"
diff --git a/usr.bin/vi/config.h b/usr.bin/vi/config.h
index a8bee67..94e7808 100644
--- a/usr.bin/vi/config.h
+++ b/usr.bin/vi/config.h
@@ -1,195 +1,23 @@
-/* config.h.  Generated automatically by configure.  */
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* $Id: config.h.in,v 9.5 2013/03/11 01:20:53 zy Exp $ */
 /* $FreeBSD$ */
 
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
-
-/* Define if you have a working `mmap' system call.  */
-#define HAVE_MMAP 1
-
-/* Define if your struct stat has st_blksize.  */
-#define HAVE_ST_BLKSIZE 1
-
-/* Define if you have <vfork.h>.  */
-/* #undef HAVE_VFORK_H */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef mode_t */
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef off_t */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define if your <sys/time.h> declares struct tm.  */
-/* #undef TM_IN_SYS_TIME */
-
-/* Define vfork as fork if vfork does not work.  */
-/* #undef vfork */
-
-/* Define if your processor stores words with the most significant
-   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-/* #undef WORDS_BIGENDIAN */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef ssize_t */
-
 /* Define if you want a debugging version. */
 /* #undef DEBUG */
 
-/* Define if you have a System V-style (broken) gettimeofday. */
-/* #undef HAVE_BROKEN_GETTIMEOFDAY */
-
-/* Define if you have a Ultrix-style (broken) vdisable. */
-/* #undef HAVE_BROKEN_VDISABLE */
-
-/* Define if you have a BSD version of curses. */
-#ifndef SYSV_CURSES
-#define HAVE_BSD_CURSES 1
-#endif
-
-/* Define if you have the curses(3) addnstr function. */
-#define HAVE_CURSES_ADDNSTR 1
-
-/* Define if you have the curses(3) beep function. */
-#ifdef SYSV_CURSES
-#define HAVE_CURSES_BEEP 1
-#endif
-
-/* Define if you have the curses(3) flash function. */
-#ifdef SYSV_CURSES
-#define HAVE_CURSES_FLASH 1
-#endif
-
-/* Define if you have the curses(3) idlok function. */
-#define HAVE_CURSES_IDLOK 1
-
-/* Define if you have the curses(3) keypad function. */
-#ifdef SYSV_CURSES
-#define HAVE_CURSES_KEYPAD 1
-#endif
-
-/* Define if you have the curses(3) newterm function. */
-#ifdef SYSV_CURSES
-#define HAVE_CURSES_NEWTERM 1
-#endif
-
-/* Define if you have the curses(3) setupterm function. */
-#ifdef SYSV_CURSES
-#define HAVE_CURSES_SETUPTERM 1
-#endif
-
-/* Define if you have the curses(3) tigetstr/tigetnum functions. */
-#ifdef SYSV_CURSES
-#define HAVE_CURSES_TIGETSTR 1
-#endif
-
-/* Define if you have the chsize(2) system call. */
-/* #undef HAVE_FTRUNCATE_CHSIZE */
-
-/* Define if you have the ftruncate(2) system call. */
-#define HAVE_FTRUNCATE_FTRUNCATE 1
-
-/* Define if you have fcntl(2) style locking. */
-/* #undef HAVE_LOCK_FCNTL */
-
-/* Define if you have flock(2) style locking. */
-#define HAVE_LOCK_FLOCK 1
-
-/* Define if you want to compile in the Perl interpreter. */
-/* #undef HAVE_PERL_INTERP */	/* XXX: SET IN Makefile CFLAGS */
-
-/* Define if your Perl is at least 5.003_01. */
-/* #undef HAVE_PERL_5_003_01 */	/* XXX: SET IN Makefile CFLAGS */
-
-/* Define if you have the Berkeley style revoke(2) system call. */
-#define HAVE_REVOKE 1
-
-/* Define if you have <sys/mman.h> */
-#define HAVE_SYS_MMAN_H 1
-
-/* Define if you have <sys/select.h> */
-/* #undef HAVE_SYS_SELECT_H 1 */
-
-/* Define if you have the System V style pty calls. */
-/* #undef HAVE_SYS5_PTY */
-
-/* Define if you want to compile in the Tcl interpreter. */
-/* #define HAVE_TCL_INTERP */	/* XXX: SET IN Makefile CFLAGS */
-
-/* Define if your sprintf returns a pointer, not a length. */
-/* #undef SPRINTF_RET_CHARPNT */
-
-/* Define if you have the bsearch function.  */
-#define HAVE_BSEARCH 1
-
-/* Define if you have the gethostname function.  */
-#define HAVE_GETHOSTNAME 1
-
-/* Define if you have the getopt function.  */
-#define HAVE_GETOPT 1
-
-/* Define if you have the getpagesize function.  */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if you have the memchr function.  */
-#define HAVE_MEMCHR 1
-
-/* Define if you have the memcpy function.  */
-#define HAVE_MEMCPY 1
-
-/* Define if you have the memmove function.  */
-#define HAVE_MEMMOVE 1
-
-/* Define if you have the memset function.  */
-#define HAVE_MEMSET 1
-
-/* Define if you have the mkstemp function.  */
-#define HAVE_MKSTEMP 1
-
-/* Define if you have the mmap function.  */
-#define HAVE_MMAP 1
-
-/* Define if you have the select function.  */
-#define HAVE_SELECT 1
-
-/* Define if you have the setenv function.  */
-#define HAVE_SETENV 1
-
-/* Define if you have the snprintf function.  */
-#define HAVE_SNPRINTF 1
-
-/* Define if you have the strdup function.  */
-#define HAVE_STRDUP 1
-
-/* Define if you have the strerror function.  */
-#define HAVE_STRERROR 1
-
-/* Define if you have the strpbrk function.  */
-#define HAVE_STRPBRK 1
-
-/* Define if you have the strsep function.  */
-#define HAVE_STRSEP 1
+/* Define when using wide characters */
+/* #define USE_WIDECHAR set by Makefile */
 
-/* Define if you have the strtol function.  */
-#define HAVE_STRTOL 1
+/* Define when iconv can be used */
+/* #define USE_ICONV set by Makefile */
 
-/* Define if you have the strtoul function.  */
-#define HAVE_STRTOUL 1
+/* Define when the 2nd argument of iconv(3) is not const */
+/* #undef ICONV_TRADITIONAL */
 
-/* Define if you have the unsetenv function.  */
-#define HAVE_UNSETENV 1
+/* Define if you have <libutil.h> */
+#define HAVE_LIBUTIL_H
 
-/* Define if you have the valloc function.  */
-#define HAVE_VALLOC 1
+/* Define if you have <ncurses.h> */
+#define HAVE_NCURSES_H
 
-/* Define if you have the vsnprintf function.  */
-#define HAVE_VSNPRINTF 1
+/* Define if you have <term.h> */
+#define HAVE_TERM_H
diff --git a/usr.bin/vi/pathnames.h b/usr.bin/vi/pathnames.h
index 72c8bb3..49d58fe 100644
--- a/usr.bin/vi/pathnames.h
+++ b/usr.bin/vi/pathnames.h
@@ -1,19 +1,15 @@
-/* @(#)pathnames.h.in	8.4 (Berkeley) 6/26/96 */
+/* $Id: pathnames.h.in,v 8.7 2012/04/23 08:34:52 zy Exp $ */
 /* $FreeBSD$ */
 
 /* Read standard system paths first. */
 #include <paths.h>
 
-#ifndef	_PATH_BSHELL
-#define	_PATH_BSHELL	"/bin/sh"
-#endif
-
 #ifndef	_PATH_EXRC
 #define	_PATH_EXRC	".exrc"
 #endif
 
 #ifndef	_PATH_MSGCAT
-#define _PATH_MSGCAT    "/usr/share/vi/catalog/"
+#define	_PATH_MSGCAT	"/usr/share/vi/catalog/"
 #endif
 
 #ifndef	_PATH_NEXRC
@@ -21,15 +17,7 @@
 #endif
 
 #ifndef	_PATH_PRESERVE
-#define	_PATH_PRESERVE	"/var/tmp/vi.recover"
-#endif
-
-#ifndef _PATH_SYSV_PTY
-#define	_PATH_SYSV_PTY	"/dev/ptmx"
-#endif
-
-#ifndef	_PATH_SENDMAIL
-#define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
+#define	_PATH_PRESERVE	"/var/tmp/vi.recover/"
 #endif
 
 #ifndef	_PATH_SYSEXRC
@@ -39,11 +27,3 @@
 #ifndef	_PATH_TAGS
 #define	_PATH_TAGS	"tags"
 #endif
-
-#ifndef	_PATH_TMP
-#define	_PATH_TMP	"/tmp"
-#endif
-
-#ifndef	_PATH_TTY
-#define	_PATH_TTY	"/dev/tty"
-#endif
diff --git a/usr.bin/vi/port.h b/usr.bin/vi/port.h
deleted file mode 100644
index bdd5faf..0000000
--- a/usr.bin/vi/port.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* @(#)port.h.in	8.13 (Berkeley) 6/12/96 */
-
-/* $FreeBSD$ */
-
-/*
- * Declare the basic types, if they aren't already declared.  Named and
- * some system's db.h files protect them with __BIT_TYPES_DEFINED__.
- */
-#ifndef __BIT_TYPES_DEFINED__
-#define __BIT_TYPES_DEFINED__
-
-
-
-
-
-#endif
-
-/*
- * XXX
- * Some versions of System V changed the number of arguments to gettimeofday
- * without changing the name.
- */
-#ifdef HAVE_BROKEN_GETTIMEOFDAY
-#define	gettimeofday(tv, tz)	gettimeofday(tv)
-#endif
-
-/* 
- * XXX
- * If we don't have mmap, we fake it with read and write, but we'll
- * still need the header information.
- */
-#ifndef HAVE_SYS_MMAN_H
-#define	MAP_SHARED	1		/* share changes */
-#define	MAP_PRIVATE	2		/* changes are private */
-#define	PROT_READ	0x1		/* pages can be read */
-#define	PROT_WRITE	0x2		/* pages can be written */
-#define	PROT_EXEC	0x4		/* pages can be executed */
-#endif
-
-/*
- * XXX
- * POSIX 1003.1 names for file descriptors.
- */
-#ifndef STDERR_FILENO
-#define STDIN_FILENO	0		/* ANSI C #defines */
-#define STDOUT_FILENO	1
-#define STDERR_FILENO	2
-#endif
-
-/*
- * XXX
- * POSIX 1003.1 names for seek settings.
- */
-#ifndef SEEK_END
-#define	SEEK_SET	0		/* POSIX 1003.1 seek values */
-#define	SEEK_CUR	1
-#define	SEEK_END	2
-#endif
-
-/*
- * Hack _POSIX_VDISABLE to \377 since Ultrix doesn't honor _POSIX_VDISABLE
- * (treats it as ^@).  The symptom is that the ^@ keystroke immediately
- * drops core.
- */
-#ifdef HAVE_BROKEN_VDISABLE
-#undef	_POSIX_VDISABLE
-#define	_POSIX_VDISABLE	((unsigned char)'\377')
-#endif
-
-/*
- * XXX
- * POSIX 1003.1 tty disabling character.
- */
-#ifndef _POSIX_VDISABLE
-#define	_POSIX_VDISABLE	0		/* Some systems used 0. */
-#endif
-
-/*
- * XXX
- * 4.4BSD extension to only set the software termios bits.
- */
-#ifndef	TCSASOFT			/* 4.4BSD extension. */
-#define	TCSASOFT	0
-#endif
-
-/*
- * XXX
- * POSIX 1003.1 maximum path length.
- */
-#ifndef MAXPATHLEN
-#ifdef PATH_MAX
-#define	MAXPATHLEN	PATH_MAX
-#else
-#define	MAXPATHLEN	1024
-#endif
-#endif
-
-/*
- * XXX
- * MIN, MAX, historically in <sys/param.h>
- */
-#ifndef	MAX
-#define	MAX(_a,_b)	((_a)<(_b)?(_b):(_a))
-#endif
-#ifndef	MIN
-#define	MIN(_a,_b)	((_a)<(_b)?(_a):(_b))
-#endif
-
-/*
- * XXX
- * "DB" isn't always portable, and we want the private information.
- */
-#define DB      L__DB
-#undef	pgno_t			/* IRIX has its own version. */
-#define	pgno_t	L__db_pgno_t
-
-/*
- * XXX
- * 4.4BSD extension to provide lock values in the open(2) call.
- */
-#ifndef O_EXLOCK
-#define	O_EXLOCK	0
-#endif
-
-#ifndef O_SHLOCK
-#define	O_SHLOCK	0
-#endif
-
-/*
- * XXX
- * POSIX 1003.1 bad file format errno.
- */
-#ifndef EFTYPE
-#define	EFTYPE		EINVAL
-#endif
-
-/*
- * XXX
- * POSIX 1003.2 RE length limit.
- */
-#ifndef	_POSIX2_RE_DUP_MAX
-#define	_POSIX2_RE_DUP_MAX	255
-#endif
-
-/*
- * XXX
- * 4.4BSD extension to determine if a program dropped core from the exit
- * status.
- */
-#ifndef	WCOREDUMP
-#define	WCOREDUMP(a)	0
-#endif
-
-/*
- * XXX
- * Endian-ness of the machine.
- */
-#if !defined(LITTLE_ENDIAN)
-#define	LITTLE_ENDIAN	1234
-#endif
-#if !defined(BIG_ENDIAN)
-#define	BIG_ENDIAN	4321
-#endif
-#if !defined(BYTE_ORDER)
-#if WORDS_BIGENDIAN == 1
-#define	BYTE_ORDER	BIG_ENDIAN
-#else
-#define	BYTE_ORDER	LITTLE_ENDIAN
-#endif
-#endif
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index e204528..6bd3e9f 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -670,12 +670,14 @@ pids_init(void)
 static int
 pids_empty(void)
 {
+
 	return (curprocs == 0);
 }
 
 static int
 pids_full(void)
 {
+
 	return (curprocs >= maxprocs);
 }
 
@@ -709,7 +711,6 @@ findfreeslot(void)
 
 	if ((slot = findslot(NOPID)) < 0)
 		errx(1, "internal error: no free pid slot");
-
 	return (slot);
 }
 
@@ -721,13 +722,13 @@ findslot(pid_t pid)
 	for (slot = 0; slot < maxprocs; slot++)
 		if (childpids[slot] == pid)
 			return (slot);
-
 	return (-1);
 }
 
 static void
 clearslot(int slot)
 {
+
 	childpids[slot] = NOPID;
 }
 
@@ -762,6 +763,7 @@ prompt(void)
 static void
 usage(void)
 {
+
 	fprintf(stderr,
 "usage: xargs [-0opt] [-E eofstr] [-I replstr [-R replacements] [-S replsize]]\n"
 "             [-J replstr] [-L number] [-n number [-x]] [-P maxprocs]\n"
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 6fc038e..60d48c6 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -351,7 +351,7 @@ utility appeared in
 The meaning of the
 .Fl M
 option has changed as of
-.Fx 10
+.Fx 9.2
 and it now takes an argument.
 Command lines that used the old
 .Fl M
diff --git a/usr.bin/xlint/lint1/scan.l b/usr.bin/xlint/lint1/scan.l
index 65d2d11..013a795 100644
--- a/usr.bin/xlint/lint1/scan.l
+++ b/usr.bin/xlint/lint1/scan.l
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 #include "cgram.h"
 
 #define CHAR_MASK	(~(~0 << CHAR_BIT))
-#define YY_NO_UNPUT
 
 /* Current position (its also updated when an included file is parsed) */
 pos_t	curr_pos = { 1, "", 0 };
@@ -86,6 +85,8 @@ static	int	wcstrg(void);
 
 %}
 
+%option nounput
+
 L	[_A-Za-z]
 D	[0-9]
 NZD	[1-9]
author	sjg <sjg@FreeBSD.org>	2013-09-05 20:18:59 +0000
committer	sjg <sjg@FreeBSD.org>	2013-09-05 20:18:59 +0000
commit	62bb1062226d3ce6a2350808256a25508978352d (patch)
tree	22b131dceb13c3df96da594fbaadb693504797c7 /usr.bin
parent	72ab90509b3a51ab361bf710338f2ef44a4e360d (diff)
parent	04932445481c2cb89ff69a83b961bdef3d64757e (diff)
download	FreeBSD-src-62bb1062226d3ce6a2350808256a25508978352d.zip FreeBSD-src-62bb1062226d3ce6a2350808256a25508978352d.tar.gz