Index: contrib/lua/lcurses/ext/include/_helpers.c
===================================================================
--- contrib/lua/lcurses/ext/include/_helpers.c
+++ contrib/lua/lcurses/ext/include/_helpers.c
@@ -53,7 +53,7 @@
 #  endif
 #endif
 
-#if LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503
+#if LUA_VERSION_NUM >= 502
 #  define lua_objlen lua_rawlen
 #  define lua_strlen lua_rawlen
 #  define luaL_openlib(L,n,l,nup) luaL_setfuncs((L),(l),(nup))
@@ -317,7 +317,6 @@
 static const char *
 optstringfield(lua_State *L, int index, const char *k, const char *def)
 {
-	const char *r;
 	int got_type;
 	got_type = lua_type(L, -1);
 	lua_pop(L, 1);
Index: lib/flua/Makefile
===================================================================
--- lib/flua/Makefile
+++ lib/flua/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=	libjail
+SUBDIR=		lcurses
+SUBDIR+=	libjail
 
 .include <bsd.subdir.mk>
Index: lib/flua/lcurses/Makefile
===================================================================
--- /dev/null
+++ lib/flua/lcurses/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+LUASRC?=	${SRCTOP}/contrib/lua/src
+LCURSESSRC?=	${SRCTOP}/contrib/lua/lcurses/ext
+.PATH: ${LCURSESSRC}
+
+SHLIB_NAME=	curses_c.so
+WARNS?=	2
+LIBDIR=	/usr/lib/flua
+
+SRCS=	curses.c
+
+LDFLAGS=	-Wl,-E
+
+CFLAGS+=	-I${.CURDIR} -I${LCURSESSRC} -I${LCURSESSRC}/include -I${LUASRC}
+CFLAGS+=	-I${SRCTOP}/lib/liblua
+
+.include <bsd.lib.mk>
Index: lib/flua/lcurses/config.h
===================================================================
--- /dev/null
+++ lib/flua/lcurses/config.h
@@ -0,0 +1,145 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if a SysV or X/Open compatible Curses library is present */
+#define HAVE_CURSES 1
+
+/* Define to 1 if library supports color (enhanced functions) */
+#define HAVE_CURSES_COLOR 1
+
+/* Define to 1 if library supports X/Open Enhanced functions */
+#define HAVE_CURSES_ENHANCED 1
+
+/* Define to 1 if <curses.h> is present */
+/* #undef HAVE_CURSES_H */
+
+/* Define to 1 if library supports certain obsolete features */
+#define HAVE_CURSES_OBSOLETE 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <lauxlib.h> header file. */
+#define HAVE_LAUXLIB_H 1
+
+/* Define to 1 if you have the <luaconf.h> header file. */
+#define HAVE_LUACONF_H 1
+
+/* Define to 1 if you have the <lualib.h> header file. */
+#define HAVE_LUALIB_H 1
+
+/* Define to 1 if you have the <lua.h> header file. */
+#define HAVE_LUA_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if the Ncurses library is present */
+/* #undef HAVE_NCURSES */
+
+/* Define to 1 if the NcursesW library is present */
+#define HAVE_NCURSESW 1
+
+/* Define to 1 if <ncursesw/curses.h> is present */
+/* #undef HAVE_NCURSESW_CURSES_H */
+
+/* Define to 1 if <ncursesw.h> is present */
+/* #undef HAVE_NCURSESW_H */
+
+/* Define to 1 if <ncurses/curses.h> is present */
+/* #undef HAVE_NCURSES_CURSES_H */
+
+/* Define to 1 if <ncurses.h> is present */
+#define HAVE_NCURSES_H 1
+
+/* Define to 1 if you have the `resizeterm' function. */
+#define HAVE_RESIZETERM 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 `strlcpy' function. */
+#define HAVE_STRLCPY 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 <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "lcurses"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "http://github.com/lcurses/lcurses/issues"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "lcurses"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "lcurses 9.0.0"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "lcurses"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "9.0.0"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* 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
+
+
+/* Version number of package */
+#define VERSION "9.0.0"
+
+/* 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 */