Fri Oct 11 20:25:34 2013 UTC ()
More fixes for lua-5.2. From https://github.com/arunpersaud/osbf-lua
with the help of John R. Shannon.
Bump PKGREVISION.


(wiz)
diff -r1.9 -r1.10 pkgsrc/mail/OSBF-lua/Makefile
diff -r1.2 -r1.3 pkgsrc/mail/OSBF-lua/PLIST
diff -r1.4 -r1.5 pkgsrc/mail/OSBF-lua/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/mail/OSBF-lua/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/mail/OSBF-lua/patches/patch-losbflib.c
cvs diff -r1.9 -r1.10 pkgsrc/mail/OSBF-lua/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/OSBF-lua/Makefile 2013/07/04 21:27:57 1.9
+++ pkgsrc/mail/OSBF-lua/Makefile 2013/10/11 20:25:34 1.10
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: Makefile,v 1.9 2013/07/04 21:27:57 adam Exp $ 1# $NetBSD: Makefile,v 1.10 2013/10/11 20:25:34 wiz Exp $
2# 2#
3 3
4DISTNAME= osbf-lua-2.0.4 4DISTNAME= osbf-lua-2.0.4
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= http://luaforge.net/frs/download.php/2094/ 7MASTER_SITES= http://luaforge.net/frs/download.php/2094/
8 8
9MAINTAINER= wiz@NetBSD.org 9MAINTAINER= wiz@NetBSD.org
10HOMEPAGE= http://osbf-lua.luaforge.net/ 10HOMEPAGE= http://osbf-lua.luaforge.net/
11COMMENT= Lua C module for text classification 11COMMENT= Lua C module for text classification
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PREV_PKGPATH= mail/lua-OSBF 14PREV_PKGPATH= mail/lua-OSBF
15 15
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17 17
18INSTALL_TARGET= install install_spamfilter 18INSTALL_TARGET= install install_spamfilter
19 19
20SUBST_CLASSES+= path 20SUBST_CLASSES+= path
21SUBST_STAGE.path= post-patch 21SUBST_STAGE.path= post-patch
22SUBST_MESSAGE.path= Fixing paths in config 22SUBST_MESSAGE.path= Fixing paths in config
23SUBST_FILES.path= config 23SUBST_FILES.path= config
24SUBST_FILES.path+= spamfilter/cache_report.lua 24SUBST_FILES.path+= spamfilter/cache_report.lua
25SUBST_FILES.path+= spamfilter/classify.sample 25SUBST_FILES.path+= spamfilter/classify.sample
26SUBST_FILES.path+= spamfilter/create_databases.lua 26SUBST_FILES.path+= spamfilter/create_databases.lua
27SUBST_FILES.path+= spamfilter/database_status.lua 27SUBST_FILES.path+= spamfilter/database_status.lua
28SUBST_FILES.path+= spamfilter/getopt.lua 28SUBST_FILES.path+= spamfilter/getopt.lua
29SUBST_FILES.path+= spamfilter/promailrc.sample 29SUBST_FILES.path+= spamfilter/promailrc.sample
30SUBST_FILES.path+= spamfilter/random.lua 30SUBST_FILES.path+= spamfilter/random.lua
31SUBST_FILES.path+= spamfilter/roc.lua 31SUBST_FILES.path+= spamfilter/roc.lua
32SUBST_FILES.path+= spamfilter/spamfilter.lua 32SUBST_FILES.path+= spamfilter/spamfilter.lua
33SUBST_FILES.path+= spamfilter/spamfilter_commands.lua 33SUBST_FILES.path+= spamfilter/spamfilter_commands.lua
34SUBST_FILES.path+= spamfilter/toer.lua 34SUBST_FILES.path+= spamfilter/toer.lua
35SUBST_FILES.path+= spamfilter/train.sample 35SUBST_FILES.path+= spamfilter/train.sample
36SUBST_FILES.path+= docs/index.html 36SUBST_FILES.path+= docs/index.html
37SUBST_SED.path= -e 's,/usr/local,${PREFIX},g' 37SUBST_SED.path= -e 's,/usr/local,${PREFIX},g'
 38SUBST_SED.path+= -e 's,lib/lua/5.1,lib/lua/5.2,g'
38 39
39.include "../../lang/lua/buildlink3.mk" 40.include "../../lang/lua/buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/mail/OSBF-lua/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/OSBF-lua/PLIST 2009/06/14 18:04:26 1.2
+++ pkgsrc/mail/OSBF-lua/PLIST 2013/10/11 20:25:34 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:04:26 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.3 2013/10/11 20:25:34 wiz Exp $
2lib/lua/5.1/libosbf.so.${PKGVERSION} 2lib/lua/5.2/libosbf.so.${PKGVERSION}
3lib/lua/5.1/osbf.so 3lib/lua/5.2/osbf.so
4osbf-lua/cache_report.lua 4osbf-lua/cache_report.lua
5osbf-lua/classify.sample 5osbf-lua/classify.sample
6osbf-lua/create_databases.lua 6osbf-lua/create_databases.lua
7osbf-lua/database_status.lua 7osbf-lua/database_status.lua
8osbf-lua/getopt.lua 8osbf-lua/getopt.lua
9osbf-lua/promailrc.sample 9osbf-lua/promailrc.sample
10osbf-lua/random.lua 10osbf-lua/random.lua
11osbf-lua/roc.lua 11osbf-lua/roc.lua
12osbf-lua/spamfilter.help 12osbf-lua/spamfilter.help
13osbf-lua/spamfilter.lua 13osbf-lua/spamfilter.lua
14osbf-lua/spamfilter_commands.lua 14osbf-lua/spamfilter_commands.lua
15osbf-lua/spamfilter_config.lua 15osbf-lua/spamfilter_config.lua
16osbf-lua/toer.lua 16osbf-lua/toer.lua
cvs diff -r1.4 -r1.5 pkgsrc/mail/OSBF-lua/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/OSBF-lua/distinfo 2013/07/05 14:31:40 1.4
+++ pkgsrc/mail/OSBF-lua/distinfo 2013/10/11 20:25:34 1.5
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.4 2013/07/05 14:31:40 wiz Exp $ 1$NetBSD: distinfo,v 1.5 2013/10/11 20:25:34 wiz Exp $
2 2
3SHA1 (osbf-lua-2.0.4.tar.gz) = 6fd4fb6496c20e9340cdcff4820c50a793e2ea27 3SHA1 (osbf-lua-2.0.4.tar.gz) = 6fd4fb6496c20e9340cdcff4820c50a793e2ea27
4RMD160 (osbf-lua-2.0.4.tar.gz) = ba808072739de2bcb40ce81f0177ef7588508670 4RMD160 (osbf-lua-2.0.4.tar.gz) = ba808072739de2bcb40ce81f0177ef7588508670
5Size (osbf-lua-2.0.4.tar.gz) = 82343 bytes 5Size (osbf-lua-2.0.4.tar.gz) = 82343 bytes
6SHA1 (patch-aa) = 25fe0abc6543893d88d147e418027cee9a544502 6SHA1 (patch-aa) = 318255203a7ce8dda28200d9405fa0e948e3d2ef
7SHA1 (patch-bb) = ead9d141481c2eabd510dd26eb39b5f88ede9e04 7SHA1 (patch-bb) = ead9d141481c2eabd510dd26eb39b5f88ede9e04
8SHA1 (patch-losbflib.c) = 53ef00a5db3e8f892d4edd41204dc13b8d17f32e 8SHA1 (patch-losbflib.c) = 9ee6438b61d6702d2faa6d5a3fdcf88f57555339
cvs diff -r1.1.1.1 -r1.2 pkgsrc/mail/OSBF-lua/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/OSBF-lua/patches/patch-aa 2008/10/13 11:29:53 1.1.1.1
+++ pkgsrc/mail/OSBF-lua/patches/patch-aa 2013/10/11 20:25:34 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-aa,v 1.1.1.1 2008/10/13 11:29:53 shannonjr Exp $ 1$NetBSD: patch-aa,v 1.2 2013/10/11 20:25:34 wiz Exp $
2 2
3--- config.orig 2007-01-14 11:57:19.000000000 -0700 3--- config.orig 2007-01-14 18:57:19.000000000 +0000
4+++ config 4+++ config
5@@ -20,20 +20,8 @@ LIB_DIR= /usr/local/lib 5@@ -20,20 +20,8 @@ LIB_DIR= /usr/local/lib
6 # OS dependent 6 # OS dependent
7 LIB_EXT= .so 7 LIB_EXT= .so
8  8
9-# if this "autoconf" doesn't work for you, set LIB_OPTION for shared 9-# if this "autoconf" doesn't work for you, set LIB_OPTION for shared
10-# object manually. 10-# object manually.
11-LD=$(shell ld -V -o /dev/null 2>&1) 11-LD=$(shell ld -V -o /dev/null 2>&1)
12-ifneq (,$(findstring Solaris,$(LD))) 12-ifneq (,$(findstring Solaris,$(LD)))
13- # Solaris - tested with 2.6, gcc 2.95.3 20010315 and Solaris ld 13- # Solaris - tested with 2.6, gcc 2.95.3 20010315 and Solaris ld
14- LIB_OPTION= -G -dy 14- LIB_OPTION= -G -dy
15-else 15-else
16- ifneq (,$(findstring GNU,$(LD))) 16- ifneq (,$(findstring GNU,$(LD)))
cvs diff -r1.1 -r1.2 pkgsrc/mail/OSBF-lua/patches/patch-losbflib.c (expand / switch to unified diff)

--- pkgsrc/mail/OSBF-lua/patches/patch-losbflib.c 2013/07/05 14:31:40 1.1
+++ pkgsrc/mail/OSBF-lua/patches/patch-losbflib.c 2013/10/11 20:25:34 1.2
@@ -1,15 +1,57 @@ @@ -1,15 +1,57 @@
1$NetBSD: patch-losbflib.c,v 1.1 2013/07/05 14:31:40 wiz Exp $ 1$NetBSD: patch-losbflib.c,v 1.2 2013/10/11 20:25:34 wiz Exp $
2 2
3Fix build with lua-5.2. 3Fix build with lua-5.2.
4 4
5--- losbflib.c.orig 2007-01-14 18:57:19.000000000 +0000 5--- losbflib.c.orig 2007-01-14 18:57:19.000000000 +0000
6+++ losbflib.c 6+++ losbflib.c
 7@@ -170,7 +170,7 @@ lua_osbf_createdb (lua_State * L)
 8 luaL_checktype (L, 1, LUA_TTABLE);
 9
 10 /* get the number of classes to create */
 11- num_classes = luaL_getn (L, 1);
 12+ num_classes = (int) lua_rawlen (L, 1);
 13
 14 /* get number of buckets */
 15 buckets = luaL_checknumber (L, 2);
 16@@ -214,7 +214,7 @@ lua_osbf_removedb (lua_State * L)
 17 luaL_checktype (L, 1, LUA_TTABLE);
 18
 19 /* get the number of classes to remove */
 20- num_classes = luaL_getn (L, 1);
 21+ num_classes = (int) lua_rawlen (L, 1);
 22 removed = 0;
 23 lua_pushnil (L); /* first key */
 24 while (lua_next (L, 1) != 0)
7@@ -743,7 +743,7 @@ dir_gc (lua_State * L) 25@@ -743,7 +743,7 @@ dir_gc (lua_State * L)
8  26
9 /**********************************************************/ 27 /**********************************************************/
10  28
11-static const struct luaL_reg osbf[] = { 29-static const struct luaL_reg osbf[] = {
12+static const struct luaL_Reg osbf[] = { 30+static const struct luaL_Reg osbf[] = {
13 {"create_db", lua_osbf_createdb}, 31 {"create_db", lua_osbf_createdb},
14 {"remove_db", lua_osbf_removedb}, 32 {"remove_db", lua_osbf_removedb},
15 {"config", lua_osbf_config}, 33 {"config", lua_osbf_config},
 34@@ -767,6 +767,8 @@ static const struct luaL_reg osbf[] = {
 35 int
 36 luaopen_osbf (lua_State * L)
 37 {
 38+ size_t n_funcs;
 39+
 40 /* Open dir function */
 41 luaL_newmetatable (L, "LuaBook.dir");
 42 /* set its __gc field */
 43@@ -774,7 +776,13 @@ luaopen_osbf (lua_State * L)
 44 lua_pushcfunction (L, dir_gc);
 45 lua_settable (L, -3);
 46
 47- luaL_register (L, "osbf", osbf);
 48+ n_funcs = sizeof(osbf)/sizeof(*osbf) - 1;
 49+ lua_createtable( L, 0, n_funcs );
 50+ luaL_setfuncs( L, osbf, 0 );
 51+
 52+ lua_pushvalue( L, -1 );
 53+ lua_setglobal( L, "osbf" );
 54+
 55 set_info (L);
 56 return 1;
 57 }