[Midnightbsd-cvs] src [7110] U trunk/usr.bin/mklocale: sync mklocale with FreeBSD 10 stable

[laffer1 at midnightbsd.org]

Revision: 7110
          http://svnweb.midnightbsd.org/src/?rev=7110
Author:   laffer1
Date:     2015-07-18 16:58:04 -0400 (Sat, 18 Jul 2015)
Log Message:
-----------
sync mklocale with FreeBSD 10 stable

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

Property Changed:
----------------
    trunk/usr.bin/mklocale/lex.l
    trunk/usr.bin/mklocale/mklocale.1
    trunk/usr.bin/mklocale/yacc.y

Modified: trunk/usr.bin/mklocale/Makefile
===================================================================
--- trunk/usr.bin/mklocale/Makefile	2015-07-18 20:55:30 UTC (rev 7109)
+++ trunk/usr.bin/mklocale/Makefile	2015-07-18 20:58:04 UTC (rev 7110)
@@ -1,4 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/7/93
+# $FreeBSD: stable/10/usr.bin/mklocale/Makefile 249657 2013-04-19 19:45:00Z ed $
 # $MidnightBSD$
 
 PROG=	mklocale
@@ -5,4 +6,6 @@
 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>

Modified: trunk/usr.bin/mklocale/extern.h
===================================================================
--- trunk/usr.bin/mklocale/extern.h	2015-07-18 20:55:30 UTC (rev 7109)
+++ trunk/usr.bin/mklocale/extern.h	2015-07-18 20:58:04 UTC (rev 7110)
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.bin/mklocale/extern.h 235789 2012-05-22 16:33:10Z bapt $
  */
 
 int yylex(void);
-int yyparse(void);

Modified: trunk/usr.bin/mklocale/ldef.h
===================================================================
--- trunk/usr.bin/mklocale/ldef.h	2015-07-18 20:55:30 UTC (rev 7109)
+++ trunk/usr.bin/mklocale/ldef.h	2015-07-18 20:58:04 UTC (rev 7110)
@@ -30,6 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ldef.h	8.1 (Berkeley) 6/6/93
+ *	$FreeBSD: stable/10/usr.bin/mklocale/ldef.h 216370 2010-12-11 08:32:16Z joel $
  *	$MidnightBSD$
  */
 

Modified: trunk/usr.bin/mklocale/lex.l
===================================================================
--- trunk/usr.bin/mklocale/lex.l	2015-07-18 20:55:30 UTC (rev 7109)
+++ trunk/usr.bin/mklocale/lex.l	2015-07-18 20:58:04 UTC (rev 7110)
@@ -38,7 +38,7 @@
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__MBSDID("$MidnightBSD$");
 
 #include <ctype.h>
 #include <stdio.h>
@@ -47,6 +47,8 @@
 #include "ldef.h"
 #include "y.tab.h"
 #include "extern.h"
+
+#define	YY_DECL	int yylex(void)
 %}
 
 ODIGIT	[0-7]


Property changes on: trunk/usr.bin/mklocale/lex.l
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/mklocale/mklocale.1
===================================================================
--- trunk/usr.bin/mklocale/mklocale.1	2015-07-18 20:55:30 UTC (rev 7109)
+++ trunk/usr.bin/mklocale/mklocale.1	2015-07-18 20:58:04 UTC (rev 7110)
@@ -29,6 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mklocale.1	8.2 (Berkeley) 4/18/94
+.\" $FreeBSD: stable/10/usr.bin/mklocale/mklocale.1 235400 2012-05-13 14:16:04Z joel $
 .\" $MidnightBSD$
 .\"
 .Dd October 17, 2004
@@ -123,7 +124,7 @@
 .It Dv ">\|\^)\|]"
 Used to end a mapping.
 All are equivalent.
-.It Dv :
+.It Dv ":"
 Used as a delimiter in mappings.
 .El
 .El


Property changes on: trunk/usr.bin/mklocale/mklocale.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/mklocale/yacc.y
===================================================================
--- trunk/usr.bin/mklocale/yacc.y	2015-07-18 20:55:30 UTC (rev 7109)
+++ trunk/usr.bin/mklocale/yacc.y	2015-07-18 20:58:04 UTC (rev 7110)
@@ -38,7 +38,7 @@
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$MidnightBSD$");
+__MBSDID("$MidnightBSD$");
 
 #include <arpa/inet.h>
 


Property changes on: trunk/usr.bin/mklocale/yacc.y
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property