[src/trunk]: src/external/mit/lua/dist fix import conflicts

[mbalmer <mbalmer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/67f837949fa8
branches:  trunk
changeset: 823565:67f837949fa8
user:      mbalmer <mbalmer%NetBSD.org@localhost>
date:      Wed Apr 26 13:00:46 2017 +0000

description:
fix import conflicts

diffstat:

 external/mit/lua/dist/Makefile   |  2 +-
 external/mit/lua/dist/README     |  2 +-
 external/mit/lua/dist/doc/lua.1  |  2 +-
 external/mit/lua/dist/doc/luac.1 |  2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r ad056e30b5c6 -r 67f837949fa8 external/mit/lua/dist/Makefile
--- a/external/mit/lua/dist/Makefile    Wed Apr 26 12:49:34 2017 +0000
+++ b/external/mit/lua/dist/Makefile    Wed Apr 26 13:00:46 2017 +0000
@@ -46,7 +46,7 @@
 
 # Lua version and release.
 V= 5.3
-R= $V.3
+R= $V.4
 
 # Targets start here.
 all:   $(PLAT)
diff -r ad056e30b5c6 -r 67f837949fa8 external/mit/lua/dist/README
--- a/external/mit/lua/dist/README      Wed Apr 26 12:49:34 2017 +0000
+++ b/external/mit/lua/dist/README      Wed Apr 26 13:00:46 2017 +0000
@@ -1,5 +1,5 @@
 
-This is Lua 5.3.3, released on 30 May 2016.
+This is Lua 5.3.4, released on 12 Jan 2017.
 
 For installation instructions, license details, and
 further information about Lua, see doc/readme.html.
diff -r ad056e30b5c6 -r 67f837949fa8 external/mit/lua/dist/doc/lua.1
--- a/external/mit/lua/dist/doc/lua.1   Wed Apr 26 12:49:34 2017 +0000
+++ b/external/mit/lua/dist/doc/lua.1   Wed Apr 26 13:00:46 2017 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: lua.1,v 1.6 2017/04/26 12:36:53 mbalmer Exp $
+.\"    $NetBSD: lua.1,v 1.7 2017/04/26 13:00:46 mbalmer Exp $
 .\"
 .\" Id: lua.man,v 1.14 2016/10/17 15:43:50 lhf Exp 
 .TH LUA 1 "Date: 2016/10/17 15:43:50 "
diff -r ad056e30b5c6 -r 67f837949fa8 external/mit/lua/dist/doc/luac.1
--- a/external/mit/lua/dist/doc/luac.1  Wed Apr 26 12:49:34 2017 +0000
+++ b/external/mit/lua/dist/doc/luac.1  Wed Apr 26 13:00:46 2017 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: luac.1,v 1.5 2017/04/26 12:36:53 mbalmer Exp $
+.\"    $NetBSD: luac.1,v 1.6 2017/04/26 13:00:46 mbalmer Exp $
 .\"
 .\" Id: luac.man,v 1.29 2011/11/16 13:53:40 lhf Exp 
 .TH LUAC 1 "Date: 2011/11/16 13:53:40 "