Adapt to Lua multiversion support.

35 files changed, 360 insertions, 135 deletions

diff --git a/chat/prosody/Makefile b/chat/prosody/Makefile
index 16a7eb1eece..2f5b01ba485 100644
--- a/chat/prosody/Makefile
+++ b/chat/prosody/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2014/04/07 20:32:20 fhajny Exp $
+# $NetBSD: Makefile,v 1.15 2014/05/03 13:01:24 alnsn Exp $
 #
 
 DISTNAME=		prosody-0.9.4
+PKGREVISION=		1
 CATEGORIES=		chat
 MASTER_SITES=		http://prosody.im/downloads/source/
 
@@ -19,6 +20,8 @@ HAS_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 BUILD_DEFS+=		VARBASE
 
+CONFIGURE_ARGS+=	--with-lua-include=${PREFIX}/${LUA_INCDIR}
+
 RCD_SCRIPTS=		prosody
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/databases/lua-sqlite/Makefile b/databases/lua-sqlite/Makefile
index 5293006e074..5247ce01846 100644
--- a/databases/lua-sqlite/Makefile
+++ b/databases/lua-sqlite/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2013/11/26 07:19:30 dholland Exp $
+# $NetBSD: Makefile,v 1.18 2014/05/03 13:01:24 alnsn Exp $
 #
 
 DISTNAME=	lsqlite_src
 PKGNAME=	${LUA_PKGPREFIX}-sqlite-20030228
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	databases
 MASTER_SITES=	http://lua-users.org/files/wiki_insecure/binary_modules/luasqlite/
 EXTRACT_SUFX=	.zip
@@ -19,18 +19,20 @@ LIBS+=		-llua -lsqlite
 
 LUA_VERSIONS_INCOMPATIBLE=	52
 
-AUTO_MKDIRS=	yes
+AUTO_MKDIRS=		yes
+INSTALLATION_DIRS+=	${LUA_CDIR} ${LUA_DOCDIR} ${LUA_EXAMPLESDIR}
 
 do-build:
 	cd ${WRKSRC}; ${CC} -shared ${CFLAGS} ${LDFLAGS} lsqlite.c	\
 		-o libluasqlite.so ${LIBS}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libluasqlite.so ${DESTDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libluasqlite.so \
+	    ${DESTDIR}${PREFIX}/${LUA_CDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.txt \
-		${DESTDIR}${PREFIX}/share/doc/lua-sqlite
+		${DESTDIR}${PREFIX}/${LUA_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/test.lua \
-		${DESTDIR}${PREFIX}/share/examples/lua-sqlite
+		${DESTDIR}${PREFIX}/${LUA_EXAMPLESDIR}
 
 .include "../../databases/sqlite/buildlink3.mk"
 .include "../../lang/lua/module.mk"
diff --git a/databases/lua-sqlite/PLIST b/databases/lua-sqlite/PLIST
index 53351799904..a6b91799d01 100644
--- a/databases/lua-sqlite/PLIST
+++ b/databases/lua-sqlite/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/06/04 07:37:58 rillig Exp $
-lib/libluasqlite.so
-share/doc/lua-sqlite/readme.txt
-share/examples/lua-sqlite/test.lua
+@comment $NetBSD: PLIST,v 1.3 2014/05/03 13:01:24 alnsn Exp $
+${LUA_CDIR}/libluasqlite.so
+${LUA_DOCDIR}/readme.txt
+${LUA_EXAMPLESDIR}/test.lua
diff --git a/databases/lua-sqlite3/Makefile b/databases/lua-sqlite3/Makefile
index b26acb524c2..11aec9905db 100644
--- a/databases/lua-sqlite3/Makefile
+++ b/databases/lua-sqlite3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2014/04/09 07:27:04 obache Exp $
+# $NetBSD: Makefile,v 1.5 2014/05/03 13:01:24 alnsn Exp $
 
 DISTNAME=	lua-sqlite3-0.4.1
 PKGNAME=	${LUA_PKGPREFIX}-sqlite3-0.4.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	http://www.mroth.net/lua-sqlite3/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,6 +13,16 @@ COMMENT=	SQLite3 binding for LUA
 LICENSE=	mit
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/${LUA_CDIR}
+CONFIGURE_ARGS+=	--with-lua=${LUA_INTERPRETER:Q}
+
+CFLAGS+=		-fPIC
+
+INSTALLATION_DIRS+= 	${LUA_LDIR} ${LUA_CDIR}
+
+post-install:
+	mv ${DESTDIR}${PREFIX}/${LUA_CDIR}/*.lua \
+	   ${DESTDIR}${PREFIX}/${LUA_LDIR}
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/lua/module.mk"
diff --git a/databases/lua-sqlite3/PLIST b/databases/lua-sqlite3/PLIST
index b2d04e09e25..ab4f082b31f 100644
--- a/databases/lua-sqlite3/PLIST
+++ b/databases/lua-sqlite3/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2013/07/04 18:06:24 adam Exp $
-lib/lua/libluasqlite3-loader.lua
-lib/lua/libluasqlite3.so
-lib/lua/luasql-sqlite3.lua
-lib/lua/sqlite3.lua
+@comment $NetBSD: PLIST,v 1.2 2014/05/03 13:01:24 alnsn Exp $
+${LUA_CDIR}/libluasqlite3.so
+${LUA_LDIR}/libluasqlite3-loader.lua
+${LUA_LDIR}/luasql-sqlite3.lua
+${LUA_LDIR}/sqlite3.lua
diff --git a/databases/lua-sqlite3/distinfo b/databases/lua-sqlite3/distinfo
index 7a09b0c9ee8..6f7ee7b950f 100644
--- a/databases/lua-sqlite3/distinfo
+++ b/databases/lua-sqlite3/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1 2013/07/04 18:06:24 adam Exp $
+$NetBSD: distinfo,v 1.2 2014/05/03 13:01:24 alnsn Exp $
 
 SHA1 (lua-sqlite3-0.4.1.tar.bz2) = cdc1043c1c5a0d5456e5b5e9bfb23ad64644fb99
 RMD160 (lua-sqlite3-0.4.1.tar.bz2) = ab502207f8cdaaf7749500b2f02cf7990da1f87c
 Size (lua-sqlite3-0.4.1.tar.bz2) = 54780 bytes
-SHA1 (patch-configure) = b0e6f7045da2be407b3babe8098aa4d2a87248d8
+SHA1 (patch-Makefile.in) = 6a1482242354c6b1b5c935695fd49154312a9a5d
+SHA1 (patch-configure) = a9950af9c314bf3bc2ab813d3cc7d8e6c410b4dd
+SHA1 (patch-libluasqlite3.c) = 7eccef9ebdbc9e33b6bb52ce0b214a19786aa230
diff --git a/databases/lua-sqlite3/patches/patch-Makefile.in b/databases/lua-sqlite3/patches/patch-Makefile.in
new file mode 100644
index 00000000000..f3cfafd7e53
--- /dev/null
+++ b/databases/lua-sqlite3/patches/patch-Makefile.in
@@ -0,0 +1,30 @@
+$NetBSD: patch-Makefile.in,v 1.1 2014/05/03 13:01:24 alnsn Exp $
+
+--- Makefile.in.orig	2006-05-11 11:07:19.000000000 +0000
++++ Makefile.in
+@@ -9,7 +9,7 @@ libdir			:= @libdir@
+ libexecdir		:= @libexecdir@
+ mandir			:= @mandir@
+ 
+-luadir			:= @libdir@/lua
++luadir			:= @libdir@
+ 
+ install			:= install
+ install-data		:= $(install) -p -m 644
+@@ -27,7 +27,6 @@ LIBS			:= @LIBS@
+ 
+ COMPILE			= $(CC) -c $(CFLAGS) -o $@ $<
+ LINK			= $(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
+-LINKSHARED		= $(CC) -shared  $(LDFLAGS) -o $@ $+ $(LIBS)
+ 
+ DESTDIR			=
+ 
+@@ -127,7 +126,7 @@ libluasqlite3.o:	libluasqlite3.c
+ 			$(COMPILE)
+ 
+ libluasqlite3.so:	libluasqlite3.o
+-			$(LINKSHARED)
++			$(CC) -shared  $(LDFLAGS) libluasqlite3.o -o $@ $(LIBS)
+ 
+ libluasqlite3-loader.lua.install: libluasqlite3-loader.lua.in
+ 			m4 -DSHARED_LIB_PATH=$(luadir)				\
diff --git a/databases/lua-sqlite3/patches/patch-configure b/databases/lua-sqlite3/patches/patch-configure
index e4bbbb50907..01db515a726 100644
--- a/databases/lua-sqlite3/patches/patch-configure
+++ b/databases/lua-sqlite3/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.1 2013/07/04 18:06:24 adam Exp $
+$NetBSD: patch-configure,v 1.2 2014/05/03 13:01:24 alnsn Exp $
 
 nm -D is not portable, but -llua is needed anyway.
 
---- configure.orig	2013-07-04 17:48:44.000000000 +0000
+--- configure.orig	2006-05-11 11:23:29.000000000 +0000
 +++ configure
 @@ -3513,7 +3513,6 @@ fi
  echo "$as_me:$LINENO: checking if we need -llua" >&5
diff --git a/databases/lua-sqlite3/patches/patch-libluasqlite3.c b/databases/lua-sqlite3/patches/patch-libluasqlite3.c
new file mode 100644
index 00000000000..0a18418fbd9
--- /dev/null
+++ b/databases/lua-sqlite3/patches/patch-libluasqlite3.c
@@ -0,0 +1,122 @@
+$NetBSD: patch-libluasqlite3.c,v 1.1 2014/05/03 13:01:24 alnsn Exp $
+
+--- libluasqlite3.c.orig	2006-05-11 11:06:16.000000000 +0000
++++ libluasqlite3.c
+@@ -302,10 +302,28 @@ static void report_error(lua_State * L, 
+ #define checkint(L, narg)	( (int)		checknumber((L), (narg)) )
+ #define checkdouble(L, narg)	( (double)	checknumber((L), (narg)) )
+ 
++#if LUA_VERSION_NUM >= 502 /* Lua 5.2 */
++#define stringlen(L, narg) lua_rawlen(L, narg)
++#else
++#define stringlen(L, narg) lua_strlen(L, narg)
++#endif
++
++/*
++ * Quote from http://www.lua.org/manual/5.2/manual.html#8.3:
++ * luaL_typerror was removed. Write your own version if you need it. 
++ */
++static int typerror(lua_State *L, int narg, const char *tname)
++{
++  const char *msg;
++
++  msg = lua_pushfstring(L, "%s expected, got %s", tname, luaL_typename(L, narg));
++  return luaL_argerror(L, narg, msg);
++}
++
+ static void * checkudata(lua_State * L, int narg)
+ {
+   if (!lua_isuserdata(L, narg))
+-    luaL_typerror(L, narg, "userdata");
++    typerror(L, narg, "userdata");
+   return lua_touserdata(L, narg);
+ }
+ 
+@@ -330,7 +348,7 @@ static int checknilornoneorfunc(lua_Stat
+     return 0;
+   if (lua_isfunction(L, narg))
+     return 1;
+-  luaL_typerror(L, narg, "nil, none or function");
++  typerror(L, narg, "nil, none or function");
+   return 0; /* never reached, make compiler happy... */
+ }
+ 
+@@ -348,14 +366,14 @@ FUNC( l_sqlite3_bind_null )
+ 
+ FUNC( l_sqlite3_bind_text )
+ {
+-  lua_pushnumber(L, sqlite3_bind_text(checkstmt_stmt(L, 1), checkint(L, 2), checkstr(L, 3), lua_strlen(L, 3), SQLITE_TRANSIENT) );
++  lua_pushnumber(L, sqlite3_bind_text(checkstmt_stmt(L, 1), checkint(L, 2), checkstr(L, 3), stringlen(L, 3), SQLITE_TRANSIENT) );
+   return 1;
+ }
+ 
+ 
+ FUNC( l_sqlite3_bind_blob )
+ {
+-  lua_pushnumber(L, sqlite3_bind_blob(checkstmt_stmt(L, 1), checkint(L, 2), checkstr(L, 3), lua_strlen(L, 3), SQLITE_TRANSIENT) );
++  lua_pushnumber(L, sqlite3_bind_blob(checkstmt_stmt(L, 1), checkint(L, 2), checkstr(L, 3), stringlen(L, 3), SQLITE_TRANSIENT) );
+   return 1;
+ }
+ 
+@@ -420,7 +438,7 @@ FUNC( l_sqlite3_bind )
+       break;
+     
+     case LUA_TSTRING:
+-      lua_pushnumber(L, sqlite3_bind_text(stmt, index, lua_tostring(L, 3), lua_strlen(L, 3), SQLITE_TRANSIENT) );
++      lua_pushnumber(L, sqlite3_bind_text(stmt, index, lua_tostring(L, 3), stringlen(L, 3), SQLITE_TRANSIENT) );
+       break;
+     
+     default:
+@@ -764,7 +782,7 @@ FUNC( l_sqlite3_prepare )
+   
+   DB * db			= checkdb(L, 1);
+   const char * sql		= checkstr(L, 2);
+-  int sql_size			= lua_strlen(L, 2);
++  int sql_size			= stringlen(L, 2);
+   const char * leftover		= 0;
+   sqlite3_stmt * sqlite3_stmt 	= 0;
+   int error, leftover_size;
+@@ -898,7 +916,7 @@ static void func_callback_wrapper(int wh
+   if (lua_pcall(L, values ? 3 : 1, 0, 0))
+   {
+     fprintf(stderr, "libluasqlite3: func_callback_wrapper: Warning: user function error: %s\n", lua_tostring(L, -1));
+-    sqlite3_result_error(ctx, lua_tostring(L, -1), lua_strlen(L, -1));
++    sqlite3_result_error(ctx, lua_tostring(L, -1), stringlen(L, -1));
+     lua_pop(L, 1);
+   }
+ }
+@@ -1077,7 +1095,7 @@ FUNC( l_sqlite3_result_null )
+ 
+ FUNC( l_sqlite3_result_error )
+ {
+-  sqlite3_result_error(checkcontext(L, 1), checkstr(L, 2), lua_strlen(L, 2));
++  sqlite3_result_error(checkcontext(L, 1), checkstr(L, 2), stringlen(L, 2));
+   return 0;
+ }
+ 
+@@ -1111,14 +1129,14 @@ FUNC( l_sqlite3_result_number )
+ 
+ FUNC( l_sqlite3_result_blob )
+ {
+-  sqlite3_result_blob(checkcontext(L, 1), checkstr(L, 2), lua_strlen(L, 2), SQLITE_TRANSIENT);
++  sqlite3_result_blob(checkcontext(L, 1), checkstr(L, 2), stringlen(L, 2), SQLITE_TRANSIENT);
+   return 0;
+ }
+ 
+ 
+ FUNC( l_sqlite3_result_text )
+ {
+-  sqlite3_result_text(checkcontext(L, 1), checkstr(L, 2), lua_strlen(L, 2), SQLITE_TRANSIENT);
++  sqlite3_result_text(checkcontext(L, 1), checkstr(L, 2), stringlen(L, 2), SQLITE_TRANSIENT);
+   return 0;
+ }
+ 
+@@ -1161,7 +1179,7 @@ FUNC( l_sqlite3_result )
+       break;
+     
+     case LUA_TSTRING:
+-      sqlite3_result_text(context, lua_tostring(L, 2), lua_strlen(L, 2), SQLITE_TRANSIENT);
++      sqlite3_result_text(context, lua_tostring(L, 2), stringlen(L, 2), SQLITE_TRANSIENT);
+       break;
+     
+     default:
diff --git a/databases/lua-tokyocabinet/Makefile b/databases/lua-tokyocabinet/Makefile
index c5c489f40c5..0044f192ed8 100644
--- a/databases/lua-tokyocabinet/Makefile
+++ b/databases/lua-tokyocabinet/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2013/10/30 13:27:22 obache Exp $
+# $NetBSD: Makefile,v 1.21 2014/05/03 13:01:24 alnsn Exp $
 #
 
 DISTNAME=	tokyocabinet-lua-1.10
 PKGNAME=	${LUA_PKGPREFIX}-${DISTNAME:S/-lua-/-/}
+PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${HOMEPAGE:S/luadoc/luapkg/}
 
@@ -20,7 +21,7 @@ TEST_ENV+=	LUA_CDIR=${WRKSRC}
 
 REPLACE_LUA=		*.lua
 
-INSTALLATION_DIRS+=	share/tokyocabinet/doc/lua
+INSTALLATION_DIRS+=	${LUA_DOCDIR} ${LUA_EXAMPLESDIR}
 
 MAKE_ENV+=	INCLUDEDIR=${BUILDLINK_PREFIX.tokyocabinet}/include
 
@@ -29,12 +30,15 @@ post-extract:
 
 post-install:
 	cd ${WRKSRC}/doc && pax -rwpe . \
-		${DESTDIR}${PREFIX}/share/tokyocabinet/doc/lua
+		${DESTDIR}${PREFIX}/${LUA_DOCDIR}
+	mv ${DESTDIR}${PREFIX}/bin/*.lua \
+		${DESTDIR}${PREFIX}/${LUA_EXAMPLESDIR}
 
 BUILDLINK_API_DEPENDS.tokyocabinet+=	tokyocabinet>=1.4.29
 .include "../../databases/tokyocabinet/buildlink3.mk"
 .include "../../lang/lua/application.mk"
 .include "../../lang/lua/module.mk"
+.include "../../lang/lua/tool.mk"
 PTHREAD_AUTO_VARS=	yes
 .include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
diff --git a/databases/lua-tokyocabinet/PLIST b/databases/lua-tokyocabinet/PLIST
index 56032700a4e..dd5239dc8bb 100644
--- a/databases/lua-tokyocabinet/PLIST
+++ b/databases/lua-tokyocabinet/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:43:18 joerg Exp $
-bin/tcbtest.lua
-bin/tcftest.lua
-bin/tchtest.lua
-bin/tcutest.lua
+@comment $NetBSD: PLIST,v 1.3 2014/05/03 13:01:24 alnsn Exp $
+${LUA_EXAMPLESDIR}/tcbtest.lua
+${LUA_EXAMPLESDIR}/tcftest.lua
+${LUA_EXAMPLESDIR}/tchtest.lua
+${LUA_EXAMPLESDIR}/tcutest.lua
 ${LUA_CDIR}/tokyocabinet.so
-share/tokyocabinet/doc/lua/index.html
-share/tokyocabinet/doc/lua/luadoc.css
-share/tokyocabinet/doc/lua/modules/tokyocabinet.html
+${LUA_DOCDIR}/index.html
+${LUA_DOCDIR}/luadoc.css
+${LUA_DOCDIR}/modules/tokyocabinet.html
diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index 0d357dcfb7b..0e456584968 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2014/03/13 11:08:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.34 2014/05/03 13:01:24 alnsn Exp $
 #
 
 DISTNAME=	tokyotyrant-1.1.41
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	databases net
 MASTER_SITES=	${HOMEPAGE}
 
diff --git a/databases/tokyotyrant/options.mk b/databases/tokyotyrant/options.mk
index 8bdbe480361..4841fa4697d 100644
--- a/databases/tokyotyrant/options.mk
+++ b/databases/tokyotyrant/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2008/10/13 05:58:31 obache Exp $
+# $NetBSD: options.mk,v 1.2 2014/05/03 13:01:24 alnsn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tokyotyrant
 PKG_SUPPORTED_OPTIONS=	lua
@@ -8,6 +8,7 @@ PKG_SUGGESTED_OPTIONS=	lua
 
 .if !empty(PKG_OPTIONS:Mlua)
 CONFIGURE_ARGS+=	--enable-lua
+.include "../../lang/lua/tool.mk"
 .include "../../lang/lua/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-lua
diff --git a/devel/lua-lpeg/Makefile b/devel/lua-lpeg/Makefile
index 69a8856e8b0..92dcd692b57 100644
--- a/devel/lua-lpeg/Makefile
+++ b/devel/lua-lpeg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2013/10/30 06:03:37 dholland Exp $
+# $NetBSD: Makefile,v 1.5 2014/05/03 13:01:42 alnsn Exp $
 #
 
 DISTNAME=	lpeg-0.12
 PKGNAME=	${DISTNAME:S/lpeg/${LUA_PKGPREFIX}-lpeg/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.inf.puc-rio.br/~roberto/lpeg/
 
@@ -18,20 +18,9 @@ MAKE_FILE=	makefile
 BUILD_TARGET=	linux
 TEST_TARGET=	test
 
-SUBST_CLASSES+=		inc-path
-SUBST_STAGE.inc-path=	pre-build
-SUBST_MESSAGE.inc-path=	Fixing Lua include path.
-SUBST_FILES.inc-path=	makefile
-SUBST_SED.inc-path=	-e 's|^LUADIR[ \].*|LUADIR = ${PREFIX}/include|'
+REPLACE_LUA+=	test.lua
 
-SUBST_CLASSES+=		interp
-SUBST_STAGE.interp=	pre-build
-SUBST_MESSAGE.interp=	Fixing Lua include path.
-SUBST_FILES.interp=	test.lua
-SUBST_SED.interp=	-e 's|^\#!.*|\#!${PREFIX}/bin/lua|'
-
-LPEG_HTML_DIR=		share/doc/lua-lpeg
-INSTALLATION_DIRS+=	${LUA_CDIR} ${LUA_LDIR} ${LPEG_HTML_DIR}
+INSTALLATION_DIRS+=	${LUA_CDIR} ${LUA_LDIR} ${LUA_DOCDIR}
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/lpeg.so \
@@ -39,11 +28,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/re.lua \
 	                ${DESTDIR}${PREFIX}/${LUA_LDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html \
-	                ${DESTDIR}${PREFIX}/${LPEG_HTML_DIR}
+	                ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/lpeg-128.gif \
-	                ${DESTDIR}${PREFIX}/${LPEG_HTML_DIR}
+	                ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/HISTORY \
-	                ${DESTDIR}${PREFIX}/${LPEG_HTML_DIR}
+	                ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
 
 .include "../../lang/lua/module.mk"
+.include "../../lang/lua/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/lua-lpeg/PLIST b/devel/lua-lpeg/PLIST
index cf6402faf83..a7f8630c8ed 100644
--- a/devel/lua-lpeg/PLIST
+++ b/devel/lua-lpeg/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2013/07/14 20:31:45 alnsn Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/05/03 13:01:42 alnsn Exp $
 ${LUA_CDIR}/lpeg.so
-share/doc/lua-lpeg/lpeg.html
-share/doc/lua-lpeg/re.html
-share/doc/lua-lpeg/lpeg-128.gif
-share/doc/lua-lpeg/HISTORY
+${LUA_DOCDIR}/lpeg.html
+${LUA_DOCDIR}/re.html
+${LUA_DOCDIR}/lpeg-128.gif
+${LUA_DOCDIR}/HISTORY
 ${LUA_LDIR}/re.lua
diff --git a/devel/lua-posix/Makefile b/devel/lua-posix/Makefile
index f1c41489fa6..4e0ef57bf08 100644
--- a/devel/lua-posix/Makefile
+++ b/devel/lua-posix/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2014/01/28 11:53:07 obache Exp $
+# $NetBSD: Makefile,v 1.6 2014/05/03 13:01:24 alnsn Exp $
 
 DISTNAME=	luaposix-release-v31
 PKGNAME=	${DISTNAME:S/lua/${LUA_PKGPREFIX}-/:S/release-v//}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	-https://github.com/luaposix/luaposix/archive/release-v31.tar.gz
 
@@ -15,17 +16,21 @@ USE_TOOLS+=	perl:build
 USE_LIBTOOL=	yes
 
 GNU_CONFIGURE_LIBDIR=	${PREFIX}/${LUA_CDIR}
-CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/${PKGNAME_NOREV}
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/${PKGNAME_NOREV}
+CONFIGURE_ARGS+=	--docdir=${PREFIX}/${LUA_DOCDIR}
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/${LUA_LDIR}
+
+INSTALLATION_DIRS+=	${LUA_LDIR} ${LUA_CDIR}
+
+.include "../../lang/lua/luaversion.mk"
+
+.if ${LUA_PKGPREFIX} == "lua51"
+DEPENDS+=	lua51-BitOp:../../devel/lua-BitOp
+.endif
 
 post-patch:
 	${TOUCH} ${WRKSRC}/configure ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in
 
-post-install:
-	cd ${DESTDIR}${PREFIX}/${LUA_CDIR} && \
-	${LN} -fs ../../../share/${PKGNAME}/posix.lua && \
-	${LN} -fs ../../../share/${PKGNAME}/curses.lua
-
 .include "../../lang/lua/module.mk"
+.include "../../lang/lua/tool.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/lua-posix/PLIST b/devel/lua-posix/PLIST
index b38e153d1ae..b0de42fd71a 100644
--- a/devel/lua-posix/PLIST
+++ b/devel/lua-posix/PLIST
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2013/10/30 06:04:16 dholland Exp $
-${LUA_CDIR}/curses.lua
+@comment $NetBSD: PLIST,v 1.3 2014/05/03 13:01:24 alnsn Exp $
+${LUA_LDIR}/curses.lua
+${LUA_LDIR}/posix.lua
 ${LUA_CDIR}/curses_c.la
-${LUA_CDIR}/posix.lua
 ${LUA_CDIR}/posix_c.la
-share/doc/${PKGNAME}/curses.html
-share/doc/${PKGNAME}/curses_c.html
-share/doc/${PKGNAME}/index.html
-share/doc/${PKGNAME}/ldoc.css
-share/${PKGNAME}/curses.lua
-share/${PKGNAME}/posix.lua
+${LUA_DOCDIR}/curses.html
+${LUA_DOCDIR}/curses_c.html
+${LUA_DOCDIR}/index.html
+${LUA_DOCDIR}/ldoc.css
diff --git a/devel/lua-stdlib/Makefile b/devel/lua-stdlib/Makefile
index c78b29f79b2..3507e1bde68 100644
--- a/devel/lua-stdlib/Makefile
+++ b/devel/lua-stdlib/Makefile
@@ -1,18 +1,30 @@
-# $NetBSD: Makefile,v 1.4 2013/08/15 06:32:06 obache Exp $
-
-.include "../../devel/lua-stdlib/Makefile.common"
+# $NetBSD: Makefile,v 1.5 2014/05/03 13:01:24 alnsn Exp $
 
+DISTNAME=		stdlib-28
 PKGNAME=		${DISTNAME:S/stdlib/${LUA_PKGPREFIX}-stdlib/}
-PKGREVISION=		1
+PKGREVISION=		2
+CATEGORIES=		devel
 COMMENT=		Standard library for Lua programming language
+MASTER_SITES=		http://cloud.github.com/downloads/rrthomas/lua-stdlib/
+EXTRACT_SUFX=		.zip
 MAINTAINER=		cheusov@NetBSD.org
 
-INSTALLATION_DIRS+=	${LUA_LDIR}
+HOMEPAGE=		https://github.com/rrthomas/lua-stdlib
+LICENSE=		mit
+
+NO_BUILD=		yes
+NO_CONFIGURE=		yes
+
+INSTALLATION_DIRS+=	${LUA_LDIR} ${LUA_DOCDIR}/modules
 
 .include "../../lang/lua/module.mk"
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/*.lua \
 	                ${DESTDIR}${PREFIX}/${LUA_LDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/*.html \
+	                ${DESTDIR}${PREFIX}/${LUA_DOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/src/modules/*.html \
+	                ${DESTDIR}${PREFIX}/${LUA_DOCDIR}/modules/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/lua-stdlib/PLIST b/devel/lua-stdlib/PLIST
index d782603f4f9..da0c90d2cdb 100644
--- a/devel/lua-stdlib/PLIST
+++ b/devel/lua-stdlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/12/02 09:26:08 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/05/03 13:01:24 alnsn Exp $
 ${LUA_LDIR}/base.lua
 ${LUA_LDIR}/bin.lua
 ${LUA_LDIR}/debug_ext.lua
@@ -22,3 +22,23 @@ ${LUA_LDIR}/string_ext.lua
 ${LUA_LDIR}/tree.lua
 ${LUA_LDIR}/table_ext.lua
 ${LUA_LDIR}/xml.lua
+${LUA_DOCDIR}/index.html
+${LUA_DOCDIR}/modules/base.html
+${LUA_DOCDIR}/modules/bin.html
+${LUA_DOCDIR}/modules/debug.html
+${LUA_DOCDIR}/modules/fstable.html
+${LUA_DOCDIR}/modules/getopt.html
+${LUA_DOCDIR}/modules/io.html
+${LUA_DOCDIR}/modules/lcs.html
+${LUA_DOCDIR}/modules/list.html
+${LUA_DOCDIR}/modules/math.html
+${LUA_DOCDIR}/modules/mbox.html
+${LUA_DOCDIR}/modules/object.html
+${LUA_DOCDIR}/modules/package.html
+${LUA_DOCDIR}/modules/parser.html
+${LUA_DOCDIR}/modules/set.html
+${LUA_DOCDIR}/modules/std.html
+${LUA_DOCDIR}/modules/strbuf.html
+${LUA_DOCDIR}/modules/string.html
+${LUA_DOCDIR}/modules/table.html
+${LUA_DOCDIR}/modules/tree.html
diff --git a/mail/OSBF-lua/Makefile b/mail/OSBF-lua/Makefile
index a9ae0217d6e..564566d4266 100644
--- a/mail/OSBF-lua/Makefile
+++ b/mail/OSBF-lua/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2013/10/30 06:49:54 dholland Exp $
+# $NetBSD: Makefile,v 1.12 2014/05/03 13:01:24 alnsn Exp $
 #
 
 DISTNAME=	osbf-lua-2.0.4
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://luaforge.net/frs/download.php/2094/
 
@@ -21,21 +21,24 @@ SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
 SUBST_MESSAGE.path=	Fixing paths in config
 SUBST_FILES.path=	config
-SUBST_FILES.path+=	spamfilter/cache_report.lua
-SUBST_FILES.path+=	spamfilter/classify.sample
-SUBST_FILES.path+=	spamfilter/create_databases.lua
-SUBST_FILES.path+=	spamfilter/database_status.lua
 SUBST_FILES.path+=	spamfilter/getopt.lua
-SUBST_FILES.path+=	spamfilter/promailrc.sample
-SUBST_FILES.path+=	spamfilter/random.lua
-SUBST_FILES.path+=	spamfilter/roc.lua
-SUBST_FILES.path+=	spamfilter/spamfilter.lua
-SUBST_FILES.path+=	spamfilter/spamfilter_commands.lua
-SUBST_FILES.path+=	spamfilter/toer.lua
-SUBST_FILES.path+=	spamfilter/train.sample
 SUBST_FILES.path+=	docs/index.html
 SUBST_SED.path=		-e 's,/usr/local,${PREFIX},g'
 SUBST_SED.path+=	-e 's,lib/lua/5.1,lib/lua/5.2,g'
 
+REPLACE_LUA+=	spamfilter/cache_report.lua
+REPLACE_LUA+=	spamfilter/classify.sample
+REPLACE_LUA+=	spamfilter/create_databases.lua
+REPLACE_LUA+=	spamfilter/database_status.lua
+REPLACE_LUA+=	spamfilter/getopt.lua
+REPLACE_LUA+=	spamfilter/random.lua
+REPLACE_LUA+=	spamfilter/roc.lua
+REPLACE_LUA+=	spamfilter/spamfilter.lua
+REPLACE_LUA+=	spamfilter/spamfilter_commands.lua
+REPLACE_LUA+=	spamfilter/toer.lua
+REPLACE_LUA+=	spamfilter/train.sample
+
+.include "../../lang/lua/application.mk"
+
 .include "../../lang/lua/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/powerdns-recursor/Makefile b/net/powerdns-recursor/Makefile
index c74f69f45be..5d293b69a7f 100644
--- a/net/powerdns-recursor/Makefile
+++ b/net/powerdns-recursor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2013/10/30 06:49:54 dholland Exp $
+# $NetBSD: Makefile,v 1.14 2014/05/03 13:01:24 alnsn Exp $
 #
 
 DISTNAME=		pdns-recursor-3.3
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		net
 MASTER_SITES=		http://downloads.powerdns.com/releases/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/powerdns-recursor/options.mk b/net/powerdns-recursor/options.mk
index a90f996763e..a231ba87776 100644
--- a/net/powerdns-recursor/options.mk
+++ b/net/powerdns-recursor/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2012/02/28 10:49:27 roy Exp $
+# $NetBSD: options.mk,v 1.3 2014/05/03 13:01:24 alnsn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.powerdns-recursor
 PKG_SUPPORTED_OPTIONS=	lua
@@ -9,7 +9,9 @@ PKG_SUPPORTED_OPTIONS=	lua
 ### Build with Lua scripting support
 ###
 .if !empty(PKG_OPTIONS:Mlua)
+LUA_VERSIONS_INCOMPATIBLE=	52
 MAKE_ENV+=		LUA=1
 MAKE_ENV+=		LUA_LIBS_CONFIG=-llua
+MAKE_ENV+=		LUA_CPPFLAGS_CONFIG=-I${PREFIX}/${LUA_INCDIR}
 .include "../../lang/lua/buildlink3.mk"
 .endif
diff --git a/print/podofo/Makefile b/print/podofo/Makefile
index afade51b03f..f1e893c9105 100644
--- a/print/podofo/Makefile
+++ b/print/podofo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2014/04/07 11:15:52 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2014/05/03 13:01:24 alnsn Exp $
 
 DISTNAME=	podofo-0.9.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=podofo/}
 
diff --git a/print/podofo/options.mk b/print/podofo/options.mk
index b4f953e37b8..7855cb2068d 100644
--- a/print/podofo/options.mk
+++ b/print/podofo/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2011/05/02 11:53:51 shattered Exp $
+# $NetBSD: options.mk,v 1.2 2014/05/03 13:01:24 alnsn Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.podofo
 PKG_SUPPORTED_OPTIONS=		lua
@@ -9,6 +9,7 @@ PKG_SUPPORTED_OPTIONS=		lua
 ### Lua support
 ###
 .if !empty(PKG_OPTIONS:Mlua)
+LUA_VERSIONS_INCOMPATIBLE=	52
 .  include "../../lang/lua/buildlink3.mk"
 CMAKE_ARGS+=	-DLUA_ENABLED:LUA_ENABLED=true
 .endif
diff --git a/security/ap-modsecurity2/Makefile b/security/ap-modsecurity2/Makefile
index 48b8475c7f3..48b8a5e127d 100644
--- a/security/ap-modsecurity2/Makefile
+++ b/security/ap-modsecurity2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2014/02/12 23:18:31 tron Exp $
+# $NetBSD: Makefile,v 1.30 2014/05/03 13:01:24 alnsn Exp $
 
 DISTNAME=	modsecurity-apache_2.7.7
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/apache_//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www security
 MASTER_SITES=	https://www.modsecurity.org/tarball/${PKGVERSION_NOREV}/
 
@@ -19,10 +19,11 @@ USE_LANGUAGES=		c++ c
 .include "../../mk/apache.mk"
 .include "options.mk"
 
-GNU_CONFIGURE=		YES
-USE_TOOLS+=		pax
-USE_LIBTOOL=		yes
-BUILD_DIRS=		apache2
+GNU_CONFIGURE=			YES
+USE_TOOLS+=			pax
+USE_LIBTOOL=			yes
+BUILD_DIRS=			apache2
+LUA_VERSIONS_INCOMPATIBLE=	52
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 CONFIGURE_ARGS+=	--with-pcre=${BUILDLINK_PREFIX.pcre}
@@ -49,5 +50,6 @@ post-install:
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/lua-slnunicode/Makefile b/textproc/lua-slnunicode/Makefile
index c74bfca5615..8118f633c04 100644
--- a/textproc/lua-slnunicode/Makefile
+++ b/textproc/lua-slnunicode/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2013/10/30 06:24:57 dholland Exp $
+# $NetBSD: Makefile,v 1.5 2014/05/03 13:01:24 alnsn Exp $
 
 DISTNAME=	slnunicode-1.1apl1
 PKGNAME=	${LUA_PKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -12,10 +13,7 @@ COMMENT=	Unicode library for Lua
 BUILD_TARGET=	unicode.so
 LUA_VERSIONS_INCOMPATIBLE=	51
 
-FIND_PREFIX:=	LUADIR=lua
-.include "../../mk/find-prefix.mk"
-
-MAKE_ENV+=	LUADIR=${LUADIR}
+MAKE_ENV+=	LUA_EXECUTABLE=${LUA_INTERPRETER}
 
 INSTALLATION_DIRS=	${LUA_CDIR}
 
diff --git a/textproc/lua-slnunicode/PLIST b/textproc/lua-slnunicode/PLIST
index e6db5e9c4cf..49279914868 100644
--- a/textproc/lua-slnunicode/PLIST
+++ b/textproc/lua-slnunicode/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2013/09/03 16:18:41 ryoon Exp $
-lib/lua/5.2/unicode.so
+@comment $NetBSD: PLIST,v 1.2 2014/05/03 13:01:24 alnsn Exp $
+${LUA_CDIR}/unicode.so
diff --git a/textproc/lua-slnunicode/distinfo b/textproc/lua-slnunicode/distinfo
index 0dbbc2096ca..4f191ae0876 100644
--- a/textproc/lua-slnunicode/distinfo
+++ b/textproc/lua-slnunicode/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2013/09/03 16:18:41 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2014/05/03 13:01:24 alnsn Exp $
 
 SHA1 (slnunicode-1.1apl1.tar.gz) = 635cfd874afc88765358206172ecb28308dc9e50
 RMD160 (slnunicode-1.1apl1.tar.gz) = 0802483382f375036fdbbf1b00592dd2c309aa1b
 Size (slnunicode-1.1apl1.tar.gz) = 31369 bytes
-SHA1 (patch-Makefile) = 8f3fd40102ba6a7fd5dc81ec7ced0e68469b077f
+SHA1 (patch-Makefile) = ab5f6c7c971dc682883ac636f46c09065d64030a
diff --git a/textproc/lua-slnunicode/patches/patch-Makefile b/textproc/lua-slnunicode/patches/patch-Makefile
index 727a42976a4..5144ffa8d34 100644
--- a/textproc/lua-slnunicode/patches/patch-Makefile
+++ b/textproc/lua-slnunicode/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.1 2013/09/03 16:18:41 ryoon Exp $
+$NetBSD: patch-Makefile,v 1.2 2014/05/03 13:01:24 alnsn Exp $
 
 * for pkgsrc.
 
@@ -14,7 +14,7 @@ $NetBSD: patch-Makefile,v 1.1 2013/09/03 16:18:41 ryoon Exp $
 -	lua-5.1.4/src/lua slnunicode-1.1a/unitest
 +unicode.so: slnunico.c slnudata.c
 +	gcc -I. ${CFLAGS} -shared -Wall -Os -fpic -o unicode.so slnunico.c
-+	${LUADIR}/bin/lua unitest
++	${LUA_EXECUTABLE} unitest
  
  clean:
  	rm unicode.so
diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile
index 1f939a3c527..e0d79868cdd 100644
--- a/wm/awesome/Makefile
+++ b/wm/awesome/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2014/04/29 22:18:04 degroote Exp $
+# $NetBSD: Makefile,v 1.51 2014/05/03 13:01:25 alnsn Exp $
 #
 
 DISTNAME=	awesome-3.5.5
+PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
 EXTRACT_SUFX=	.tar.xz
@@ -12,6 +13,7 @@ COMMENT=	Tiling window manager based on dwm
 LICENSE=	gnu-gpl-v2
 
 CONFLICTS+=	awesome<3.0
+LUA_VERSIONS_INCOMPATIBLE=52
 
 USE_TOOLS+=	bash gmake pkg-config
 USE_CMAKE=	yes
diff --git a/wm/notion/Makefile b/wm/notion/Makefile
index 73e51e6b709..7493ddecaea 100644
--- a/wm/notion/Makefile
+++ b/wm/notion/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2013/10/30 06:49:55 dholland Exp $
+# $NetBSD: Makefile,v 1.15 2014/05/03 13:01:25 alnsn Exp $
 
 DISTNAME=	notion-3-2013030200-src
 PKGNAME=	${DISTNAME:S/3-/3./:S/-src//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=notion/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +18,10 @@ CONFLICTS=	ion3-[0-9]*
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 USE_LANGUAGES=	c99
 USE_TOOLS+=	gmake msgfmt pax pkg-config
+
 MAKE_FLAGS+=	X11_PREFIX=${BUILDLINK_PREFIX.libX11}
+MAKE_FLAGS+=	LUA_INTERPRETER=${LUA_INTERPRETER}
+MAKE_FLAGS+=	LUA_COMPILER=${LUA_COMPILER}
 
 EGDIR=		${PREFIX}/share/examples/notion
 EGFILES=	cfg_defaults.lua
diff --git a/wm/notion/distinfo b/wm/notion/distinfo
index d725fa8b1d6..3f7562aaa19 100644
--- a/wm/notion/distinfo
+++ b/wm/notion/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2013/10/20 17:48:54 joerg Exp $
+$NetBSD: distinfo,v 1.6 2014/05/03 13:01:25 alnsn Exp $
 
 SHA1 (notion-3-2013030200-src.tar.bz2) = 1c5d0cf140d1681a99c0fccbd8979846076d5dca
 RMD160 (notion-3-2013030200-src.tar.bz2) = 5330bcd7743b5756faf552912a1c10d481e50e1a
@@ -6,4 +6,4 @@ Size (notion-3-2013030200-src.tar.bz2) = 625211 bytes
 SHA1 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7
 SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89
 SHA1 (patch-mod__xrandr_Makefile) = 9299bebbd6a1f043a4095abfa19c917e4229456f
-SHA1 (patch-system-autodetect.mk) = d68a698a20db783de30c85482586681a2250b062
+SHA1 (patch-system-autodetect.mk) = 2cdaa0401ceccbf791aa4a52716762a3e43cce5f
diff --git a/wm/notion/patches/patch-system-autodetect.mk b/wm/notion/patches/patch-system-autodetect.mk
index e672c0023dd..ca4452765a2 100644
--- a/wm/notion/patches/patch-system-autodetect.mk
+++ b/wm/notion/patches/patch-system-autodetect.mk
@@ -1,4 +1,4 @@
-$NetBSD: patch-system-autodetect.mk,v 1.2 2013/10/20 17:48:54 joerg Exp $
+$NetBSD: patch-system-autodetect.mk,v 1.3 2014/05/03 13:01:25 alnsn Exp $
 
 Adapt for pkgsrc.
 
@@ -37,18 +37,31 @@ Adapt for pkgsrc.
  
  
  ##
-@@ -67,8 +69,8 @@ DL_LIBS=-ldl
+@@ -63,18 +65,14 @@ DL_LIBS=-ldl
+ 
+ # To skip auto-detection of lua uncomment this and edit the variables below to
+ # suit your installation of lua.
+-#LUA_MANUAL=1
++LUA_MANUAL=1
  
  # Default to paths and names that should work for a build installed from the
  # official Lua 5.1 source tarball.
 -LUA_DIR=/usr/local
 -LUA_LIBS=-L$(LUA_DIR)/lib -llua
-+LUA_DIR=$(PREFIX)
-+LUA_LIBS=${COMPILER_RPATH_FLAG}$(LUA_DIR)/lib -L$(LUA_DIR)/lib -llua
- LUA_INCLUDES = -I$(LUA_DIR)/include
+-LUA_INCLUDES = -I$(LUA_DIR)/include
+-
+-ifneq ($(shell which lua),)
+-LUA=$(LUA_DIR)/bin/lua
+-LUAC=$(LUA_DIR)/bin/luac
+-endif
++LUA_LIBS=`pkg-config --libs lua`
++LUA_INCLUDES=`pkg-config --cflags lua`
++LUA=$(LUA_INTERPRETER)
++LUAC=$(LUA_COMPILER)
+ 
+ # Attempt to autodect lua using pkg-config.
  
- ifneq ($(shell which lua),)
-@@ -132,11 +134,12 @@ endif # lua manual
+@@ -132,11 +130,12 @@ endif # lua manual
  ##
  
  # Paths
@@ -63,7 +76,7 @@ Adapt for pkgsrc.
  X11_INCLUDES=-I$(X11_PREFIX)/include
  
  # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
-@@ -164,7 +167,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR
+@@ -164,7 +163,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR
  #DEFINES += -DCF_NO_LOCALE -DCF_NO_GETTEXT
  
  # On some other systems you may need to explicitly link against libintl.
diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 49a6de4ba56..27c6b5e903b 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2014/03/18 20:09:08 adam Exp $
+# $NetBSD: Makefile,v 1.27 2014/05/03 13:01:25 alnsn Exp $
 
 DISTNAME=	httpd-2.4.9
 PKGNAME=	${DISTNAME:S/httpd/apache/}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/} \
 		http://archive.apache.org/dist/httpd/ \
@@ -192,4 +193,5 @@ post-install:
 .endif
 
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/lua-curl/Makefile b/www/lua-curl/Makefile
index b53a125da56..e9a3fcf724f 100644
--- a/www/lua-curl/Makefile
+++ b/www/lua-curl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2014/02/12 23:18:46 tron Exp $
+# $NetBSD: Makefile,v 1.10 2014/05/03 13:01:25 alnsn Exp $
 #
 
 DISTNAME=	lua-curl-0.2
 PKGNAME=	${LUA_PKGPREFIX}-curl-0.2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	http://luaforge.net/frs/download.php/2634/
 
@@ -21,5 +21,5 @@ AUTO_MKDIRS=	yes
 
 .include "../../www/curl/buildlink3.mk"
 .include "../../lang/lua/module.mk"
-
+.include "../../lang/lua/tool.mk"
 .include "../../mk/bsd.pkg.mk"