[Midnightbsd-cvs] src [7108] trunk/usr.bin/mkcsmapper: sync up mkcsmapper with freebsd 10

[laffer1 at midnightbsd.org]

Revision: 7108
          http://svnweb.midnightbsd.org/src/?rev=7108
Author:   laffer1
Date:     2015-07-18 15:58:54 -0400 (Sat, 18 Jul 2015)
Log Message:
-----------
sync up mkcsmapper with freebsd 10

Modified Paths:
--------------
    trunk/usr.bin/mkcsmapper/Makefile
    trunk/usr.bin/mkcsmapper/Makefile.inc
    trunk/usr.bin/mkcsmapper/ldef.h
    trunk/usr.bin/mkcsmapper/lex.l
    trunk/usr.bin/mkcsmapper/mkcsmapper.1
    trunk/usr.bin/mkcsmapper/yacc.y

Modified: trunk/usr.bin/mkcsmapper/Makefile
===================================================================
--- trunk/usr.bin/mkcsmapper/Makefile	2015-07-18 19:56:50 UTC (rev 7107)
+++ trunk/usr.bin/mkcsmapper/Makefile	2015-07-18 19:58:54 UTC (rev 7108)
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: stable/10/usr.bin/mkcsmapper/Makefile 250938 2013-05-23 18:07:01Z ed $
 
 .PATH: ${.CURDIR}/../../lib/libc/iconv
 
@@ -5,5 +5,7 @@
 PROG=	mkcsmapper
 LDFLAGS+= -L${.CURDIR}/../../lib/libc
 
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
 .include "${.CURDIR}/Makefile.inc"
 .include <bsd.prog.mk>

Modified: trunk/usr.bin/mkcsmapper/Makefile.inc
===================================================================
--- trunk/usr.bin/mkcsmapper/Makefile.inc	2015-07-18 19:56:50 UTC (rev 7107)
+++ trunk/usr.bin/mkcsmapper/Makefile.inc	2015-07-18 19:58:54 UTC (rev 7108)
@@ -1,7 +1,9 @@
-# $FreeBSD$
+# $FreeBSD: stable/10/usr.bin/mkcsmapper/Makefile.inc 260096 2013-12-30 20:15:46Z dim $
 
+.include <bsd.compiler.mk>
+
 SRCS+=	lex.l yacc.y
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../mkcsmapper \
 	 -I${.CURDIR}/../../lib/libc/iconv \
-	 -I${.CURDIR}/../../lib/libiconv_modules/mapper_std \
-	 --param max-inline-insns-single=64
+	 -I${.CURDIR}/../../lib/libiconv_modules/mapper_std
+CFLAGS+= --param max-inline-insns-single=64

Modified: trunk/usr.bin/mkcsmapper/ldef.h
===================================================================
--- trunk/usr.bin/mkcsmapper/ldef.h	2015-07-18 19:56:50 UTC (rev 7107)
+++ trunk/usr.bin/mkcsmapper/ldef.h	2015-07-18 19:58:54 UTC (rev 7108)
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: stable/10/usr.bin/mkcsmapper/ldef.h 250984 2013-05-25 15:36:15Z ed $ */
 /* $NetBSD: ldef.h,v 1.2 2006/09/09 14:35:17 tnozaki Exp $	*/
 
 /*-
@@ -36,7 +36,6 @@
 } linear_zone_t;
 
 extern int	 debug;
-extern int	 line_number;
+extern int	 linenumber;
 extern int	 yyerror(const char *);
 extern int	 yylex(void);
-extern int	 yyparse(void);

Modified: trunk/usr.bin/mkcsmapper/lex.l
===================================================================
--- trunk/usr.bin/mkcsmapper/lex.l	2015-07-18 19:56:50 UTC (rev 7107)
+++ trunk/usr.bin/mkcsmapper/lex.l	2015-07-18 19:58:54 UTC (rev 7108)
@@ -1,4 +1,4 @@
-/* $FreeBSD: release/9.2.0/usr.bin/mkcsmapper/lex.l 240537 2012-09-15 18:53:00Z dim $ */
+/* $FreeBSD: stable/10/usr.bin/mkcsmapper/lex.l 252582 2013-07-03 18:25:27Z peter $ */
 /* $NetBSD: lex.l,v 1.4 2006/02/09 22:03:15 dogcow Exp $	*/
 
 %{
@@ -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 @@
 %%
 
 [ \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");

Modified: trunk/usr.bin/mkcsmapper/mkcsmapper.1
===================================================================
--- trunk/usr.bin/mkcsmapper/mkcsmapper.1	2015-07-18 19:56:50 UTC (rev 7107)
+++ trunk/usr.bin/mkcsmapper/mkcsmapper.1	2015-07-18 19:58:54 UTC (rev 7108)
@@ -32,7 +32,7 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"     http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/10/usr.bin/mkcsmapper/mkcsmapper.1 222286 2011-05-25 14:13:53Z ru $
 .\"
 .Dd Sep 6, 2009
 .Dt MKCSMAPPER 1

Modified: trunk/usr.bin/mkcsmapper/yacc.y
===================================================================
--- trunk/usr.bin/mkcsmapper/yacc.y	2015-07-18 19:56:50 UTC (rev 7107)
+++ trunk/usr.bin/mkcsmapper/yacc.y	2015-07-18 19:58:54 UTC (rev 7108)
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: stable/10/usr.bin/mkcsmapper/yacc.y 250984 2013-05-25 15:36:15Z ed $ */
 /* $NetBSD: yacc.y,v 1.7 2006/09/09 14:35:17 tnozaki Exp $	*/
 
 %{
@@ -203,7 +203,7 @@
 warning(const char *s)
 {
 
-	fprintf(stderr, "%s in %d\n", s, line_number);
+	fprintf(stderr, "%s in %d\n", s, linenumber);
 }
 
 int