Module Name: src Committed By: jmmv Date: Sat Feb 16 21:40:46 UTC 2013
Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/debug: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/misc: mi src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.base NetBSD.dist.tests src/external/bsd: Makefile src/lib: Makefile src/share/mk: bsd.README bsd.hostprog.mk src/tests/lib: Makefile src/tests/share/examples: Makefile Log Message: Hook Lutok into the build. This is all protected by the MKKYUA guard. To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/distrib/sets/lists/base/ad.mips64eb \ src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.190 -r1.191 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.178 -r1.179 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.650 -r1.651 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/comp/ad.mips64eb cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.190 -r1.191 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.165 -r1.166 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1803 -r1.1804 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.245 -r1.246 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug/ad.mips64eb \ src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug/ad.mips64el \ src/distrib/sets/lists/debug/md.amd64 \ src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.180 -r1.181 src/distrib/sets/lists/misc/mi cvs rdiff -u -r1.517 -r1.518 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.108 -r1.109 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.91 -r1.92 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r1.35 -r1.36 src/external/bsd/Makefile cvs rdiff -u -r1.197 -r1.198 src/lib/Makefile cvs rdiff -u -r1.312 -r1.313 src/share/mk/bsd.README cvs rdiff -u -r1.67 -r1.68 src/share/mk/bsd.hostprog.mk cvs rdiff -u -r1.22 -r1.23 src/tests/lib/Makefile cvs rdiff -u -r1.1 -r1.2 src/tests/share/examples/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.113 src/distrib/sets/lists/base/ad.mips64eb:1.114 --- src/distrib/sets/lists/base/ad.mips64eb:1.113 Tue Feb 5 23:42:21 2013 +++ src/distrib/sets/lists/base/ad.mips64eb Sat Feb 16 21:40:08 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.113 2013/02/05 23:42:21 christos Exp $ +# $NetBSD: ad.mips64eb,v 1.114 2013/02/16 21:40:08 jmmv Exp $ ./libexec/ld.elf_so-64 base-compat-shlib compat,pic ./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -163,6 +163,8 @@ ./usr/lib/64/libldap_r.so.4.2 base-compat-shlib compat,pic,ldap ./usr/lib/64/liblua.so.1 base-compat-shlib compat,pic ./usr/lib/64/liblua.so.1.0 base-compat-shlib compat,pic +./usr/lib/64/liblutok.so.1 base-compat-shlib compat,pic,kyua +./usr/lib/64/liblutok.so.1.0 base-compat-shlib compat,pic,kyua ./usr/lib/64/liblwres.so.5 base-compat-shlib compat,pic ./usr/lib/64/liblwres.so.5.8 base-compat-shlib compat,pic ./usr/lib/64/liblzf.so.1 base-compat-shlib compat,pic @@ -477,6 +479,8 @@ ./usr/lib/o32/libldap_r.so.4.2 base-compat-shlib compat,pic,ldap ./usr/lib/o32/liblua.so.1 base-compat-shlib compat,pic ./usr/lib/o32/liblua.so.1.0 base-compat-shlib compat,pic +./usr/lib/o32/liblutok.so.1 base-compat-shlib compat,pic,kyua +./usr/lib/o32/liblutok.so.1.0 base-compat-shlib compat,pic,kyua ./usr/lib/o32/liblwres.so.5 base-compat-shlib compat,pic ./usr/lib/o32/liblwres.so.5.8 base-compat-shlib compat,pic ./usr/lib/o32/liblzf.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.113 src/distrib/sets/lists/base/ad.mips64el:1.114 --- src/distrib/sets/lists/base/ad.mips64el:1.113 Tue Feb 5 23:42:21 2013 +++ src/distrib/sets/lists/base/ad.mips64el Sat Feb 16 21:40:09 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.113 2013/02/05 23:42:21 christos Exp $ +# $NetBSD: ad.mips64el,v 1.114 2013/02/16 21:40:09 jmmv Exp $ ./libexec/ld.elf_so-64 base-compat-shlib compat,pic ./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -161,6 +161,8 @@ ./usr/lib/64/libldap_r.so.4.2 base-compat-shlib compat,pic,ldap ./usr/lib/64/liblua.so.1 base-compat-shlib compat,pic ./usr/lib/64/liblua.so.1.0 base-compat-shlib compat,pic +./usr/lib/64/liblutok.so.1 base-compat-shlib compat,pic,kyua +./usr/lib/64/liblutok.so.1.0 base-compat-shlib compat,pic,kyua ./usr/lib/64/liblwres.so.5 base-compat-shlib compat,pic ./usr/lib/64/liblwres.so.5.8 base-compat-shlib compat,pic ./usr/lib/64/liblzf.so.1 base-compat-shlib compat,pic @@ -477,6 +479,8 @@ ./usr/lib/o32/libldap_r.so.4.2 base-compat-shlib compat,pic,ldap ./usr/lib/o32/liblua.so.1 base-compat-shlib compat,pic ./usr/lib/o32/liblua.so.1.0 base-compat-shlib compat,pic +./usr/lib/o32/liblutok.so.1 base-compat-shlib compat,pic,kyua +./usr/lib/o32/liblutok.so.1.0 base-compat-shlib compat,pic,kyua ./usr/lib/o32/liblwres.so.5 base-compat-shlib compat,pic ./usr/lib/o32/liblwres.so.5.8 base-compat-shlib compat,pic ./usr/lib/o32/liblzf.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.190 src/distrib/sets/lists/base/md.amd64:1.191 --- src/distrib/sets/lists/base/md.amd64:1.190 Fri Feb 8 02:32:32 2013 +++ src/distrib/sets/lists/base/md.amd64 Sat Feb 16 21:40:10 2013 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.190 2013/02/08 02:32:32 christos Exp $ +# $NetBSD: md.amd64,v 1.191 2013/02/16 21:40:10 jmmv Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -173,6 +173,9 @@ ./usr/lib/i386/liblua.so base-compat-shlib compat,pic ./usr/lib/i386/liblua.so.1 base-compat-shlib compat,pic ./usr/lib/i386/liblua.so.1.0 base-compat-shlib compat,pic +./usr/lib/i386/liblutok.so base-compat-shlib compat,pic,kyua +./usr/lib/i386/liblutok.so.1 base-compat-shlib compat,pic,kyua +./usr/lib/i386/liblutok.so.1.0 base-compat-shlib compat,pic,kyua ./usr/lib/i386/liblwres.so.5 base-compat-shlib compat,pic ./usr/lib/i386/liblwres.so.5.8 base-compat-shlib compat,pic ./usr/lib/i386/liblzf.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.178 src/distrib/sets/lists/base/md.sparc64:1.179 --- src/distrib/sets/lists/base/md.sparc64:1.178 Tue Feb 5 23:42:21 2013 +++ src/distrib/sets/lists/base/md.sparc64 Sat Feb 16 21:40:11 2013 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.178 2013/02/05 23:42:21 christos Exp $ +# $NetBSD: md.sparc64,v 1.179 2013/02/16 21:40:11 jmmv Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root obsolete ./usr/bin/fdformat base-util-bin @@ -163,6 +163,9 @@ ./usr/lib/sparc/liblua.so base-compat-shlib compat,pic ./usr/lib/sparc/liblua.so.1 base-compat-shlib compat,pic ./usr/lib/sparc/liblua.so.1.0 base-compat-shlib compat,pic +./usr/lib/sparc/liblutok.so base-compat-shlib compat,pic,kyua +./usr/lib/sparc/liblutok.so.1 base-compat-shlib compat,pic,kyua +./usr/lib/sparc/liblutok.so.1.0 base-compat-shlib compat,pic,kyua ./usr/lib/sparc/liblwres.so.5 base-compat-shlib compat,pic ./usr/lib/sparc/liblwres.so.5.8 base-compat-shlib compat,pic ./usr/lib/sparc/liblzf.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.650 src/distrib/sets/lists/base/shl.mi:1.651 --- src/distrib/sets/lists/base/shl.mi:1.650 Fri Feb 8 02:32:32 2013 +++ src/distrib/sets/lists/base/shl.mi Sat Feb 16 21:40:13 2013 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.650 2013/02/08 02:32:32 christos Exp $ +# $NetBSD: shl.mi,v 1.651 2013/02/16 21:40:13 jmmv Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -331,6 +331,9 @@ ./usr/lib/liblua.so base-sys-shlib ./usr/lib/liblua.so.1 base-sys-shlib ./usr/lib/liblua.so.1.0 base-sys-shlib +./usr/lib/liblutok.so base-sys-shlib kyua +./usr/lib/liblutok.so.1 base-sys-shlib kyua +./usr/lib/liblutok.so.1.0 base-sys-shlib kyua ./usr/lib/liblwres.so base-bind-shlib ./usr/lib/liblwres.so.5 base-bind-shlib ./usr/lib/liblwres.so.5.8 base-bind-shlib Index: src/distrib/sets/lists/comp/ad.mips64eb diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.98 src/distrib/sets/lists/comp/ad.mips64eb:1.99 --- src/distrib/sets/lists/comp/ad.mips64eb:1.98 Wed Jan 16 16:01:05 2013 +++ src/distrib/sets/lists/comp/ad.mips64eb Sat Feb 16 21:40:15 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.98 2013/01/16 16:01:05 christos Exp $ +# $NetBSD: ad.mips64eb,v 1.99 2013/02/16 21:40:15 jmmv Exp $ ./usr/bin/elf2aout comp-obsolete obsolete ./usr/bin/elf2ecoff comp-sysutil-bin ./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45 @@ -407,6 +407,10 @@ ./usr/lib/64/liblua.so base-sys-shlib compat,pic ./usr/lib/64/liblua_p.a comp-c-proflib compat,profile ./usr/lib/64/liblua_pic.a comp-c-piclib compat,pic +./usr/lib/64/liblutok.a comp-c-lib compat,kyua +./usr/lib/64/liblutok.so base-sys-shlib compat,pic,kyua +./usr/lib/64/liblutok_p.a comp-c-proflib compat,profile,kyua +./usr/lib/64/liblutok_pic.a comp-c-piclib compat,pic,kyua ./usr/lib/64/liblwres.a comp-c-lib compat ./usr/lib/64/liblwres.so base-sys-shlib compat,pic ./usr/lib/64/liblwres_p.a comp-c-proflib compat,profile @@ -996,6 +1000,10 @@ ./usr/lib/o32/liblua.so base-sys-shlib compat,pic ./usr/lib/o32/liblua_p.a comp-c-proflib compat,profile ./usr/lib/o32/liblua_pic.a comp-c-piclib compat,pic +./usr/lib/o32/liblutok.a comp-c-lib compat,kyua +./usr/lib/o32/liblutok.so base-sys-shlib compat,pic,kyua +./usr/lib/o32/liblutok_p.a comp-c-proflib compat,profile,kyua +./usr/lib/o32/liblutok_pic.a comp-c-piclib compat,pic,kyua ./usr/lib/o32/liblwres.a comp-c-lib compat ./usr/lib/o32/liblwres.so base-sys-shlib compat,pic ./usr/lib/o32/liblwres_p.a comp-c-proflib compat,profile Index: src/distrib/sets/lists/comp/ad.mips64el diff -u src/distrib/sets/lists/comp/ad.mips64el:1.100 src/distrib/sets/lists/comp/ad.mips64el:1.101 --- src/distrib/sets/lists/comp/ad.mips64el:1.100 Wed Jan 16 16:01:05 2013 +++ src/distrib/sets/lists/comp/ad.mips64el Sat Feb 16 21:40:17 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.100 2013/01/16 16:01:05 christos Exp $ +# $NetBSD: ad.mips64el,v 1.101 2013/02/16 21:40:17 jmmv Exp $ ./usr/bin/elf2aout comp-obsolete obsolete ./usr/bin/elf2ecoff comp-sysutil-bin ./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45 @@ -407,6 +407,10 @@ ./usr/lib/64/liblua.so base-sys-shlib compat,pic ./usr/lib/64/liblua_p.a comp-c-proflib compat,profile ./usr/lib/64/liblua_pic.a comp-c-piclib compat,pic +./usr/lib/64/liblutok.a comp-c-lib compat,kyua +./usr/lib/64/liblutok.so base-sys-shlib compat,pic,kyua +./usr/lib/64/liblutok_p.a comp-c-proflib compat,profile,kyua +./usr/lib/64/liblutok_pic.a comp-c-piclib compat,pic,kyua ./usr/lib/64/liblwres.a comp-c-lib compat ./usr/lib/64/liblwres.so base-sys-shlib compat,pic ./usr/lib/64/liblwres_p.a comp-c-proflib compat,profile @@ -996,6 +1000,10 @@ ./usr/lib/o32/liblua.so base-sys-shlib compat,pic ./usr/lib/o32/liblua_p.a comp-c-proflib compat,profile ./usr/lib/o32/liblua_pic.a comp-c-piclib compat,pic +./usr/lib/o32/liblutok.a comp-c-lib compat,kyua +./usr/lib/o32/liblutok.so base-sys-shlib compat,pic,kyua +./usr/lib/o32/liblutok_p.a comp-c-proflib compat,profile,kyua +./usr/lib/o32/liblutok_pic.a comp-c-piclib compat,pic,kyua ./usr/lib/o32/liblwres.a comp-c-lib compat ./usr/lib/o32/liblwres.so base-sys-shlib compat,pic ./usr/lib/o32/liblwres_p.a comp-c-proflib compat,profile Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.190 src/distrib/sets/lists/comp/md.amd64:1.191 --- src/distrib/sets/lists/comp/md.amd64:1.190 Fri Feb 8 02:32:32 2013 +++ src/distrib/sets/lists/comp/md.amd64 Sat Feb 16 21:40:18 2013 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.190 2013/02/08 02:32:32 christos Exp $ +# $NetBSD: md.amd64,v 1.191 2013/02/16 21:40:18 jmmv Exp $ ./usr/include/amd64 comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -692,6 +692,10 @@ ./usr/lib/i386/liblua.a comp-c-lib compat ./usr/lib/i386/liblua_p.a comp-c-proflib compat,profile ./usr/lib/i386/liblua_pic.a comp-c-piclib compat,pic +./usr/lib/i386/liblutok.a comp-c-lib compat,kyua +./usr/lib/i386/liblutok_g.a comp-c-proflib compat,debuglib,kyua +./usr/lib/i386/liblutok_p.a comp-c-proflib compat,profile,kyua +./usr/lib/i386/liblutok_pic.a comp-c-piclib compat,pic,kyua ./usr/lib/i386/liblwres.a comp-c-lib compat ./usr/lib/i386/liblwres.so comp-sys-shlib compat,pic ./usr/lib/i386/liblwres_p.a comp-c-proflib compat,profile Index: src/distrib/sets/lists/comp/md.sparc64 diff -u src/distrib/sets/lists/comp/md.sparc64:1.165 src/distrib/sets/lists/comp/md.sparc64:1.166 --- src/distrib/sets/lists/comp/md.sparc64:1.165 Wed Jan 16 16:01:06 2013 +++ src/distrib/sets/lists/comp/md.sparc64 Sat Feb 16 21:40:19 2013 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.165 2013/01/16 16:01:06 christos Exp $ +# $NetBSD: md.sparc64,v 1.166 2013/02/16 21:40:19 jmmv Exp $ ./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 ./usr/include/ieeefp.h comp-c-include ./usr/include/sparc comp-c-include @@ -481,6 +481,10 @@ ./usr/lib/sparc/liblua.a comp-c-lib compat ./usr/lib/sparc/liblua_p.a comp-c-proflib compat,profile ./usr/lib/sparc/liblua_pic.a comp-c-piclib compat,pic +./usr/lib/sparc/liblutok.a comp-c-lib compat,kyua +./usr/lib/sparc/liblutok_g.a -unknown- compat,debuglib,kyua +./usr/lib/sparc/liblutok_p.a comp-c-proflib compat,profile,kyua +./usr/lib/sparc/liblutok_pic.a comp-c-piclib compat,pic,kyua ./usr/lib/sparc/liblwres.a comp-c-lib compat ./usr/lib/sparc/liblwres.so base-sys-shlib compat,pic ./usr/lib/sparc/liblwres_p.a comp-c-proflib compat,profile Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1803 src/distrib/sets/lists/comp/mi:1.1804 --- src/distrib/sets/lists/comp/mi:1.1803 Fri Feb 15 20:07:00 2013 +++ src/distrib/sets/lists/comp/mi Sat Feb 16 21:40:20 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1803 2013/02/15 20:07:00 jmmv Exp $ +# $NetBSD: mi,v 1.1804 2013/02/16 21:40:20 jmmv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1746,6 +1746,14 @@ ./usr/include/lua.hpp comp-c-include ./usr/include/luaconf.h comp-c-include ./usr/include/lualib.h comp-c-include +./usr/include/lutok comp-c-include +./usr/include/lutok/c_gate.hpp comp-c-include kyua +./usr/include/lutok/debug.hpp comp-c-include kyua +./usr/include/lutok/exceptions.hpp comp-c-include kyua +./usr/include/lutok/operations.hpp comp-c-include kyua +./usr/include/lutok/stack_cleaner.hpp comp-c-include kyua +./usr/include/lutok/state.hpp comp-c-include kyua +./usr/include/lutok/state.ipp comp-c-include kyua ./usr/include/lwp.h comp-c-include ./usr/include/lzf.h comp-c-include ./usr/include/lzfP.h comp-c-include @@ -2875,6 +2883,8 @@ ./usr/lib/libldap_r_p.a comp-ldap-proflib profile,ldap ./usr/lib/liblua.a comp-c-lib ./usr/lib/liblua_p.a comp-c-proflib profile +./usr/lib/liblutok.a comp-c-lib kyua +./usr/lib/liblutok_p.a comp-c-proflib profile,kyua ./usr/lib/liblwres.a comp-bind-lib ./usr/lib/liblwres_p.a comp-bind-proflib profile ./usr/lib/liblzf.a comp-c-lib @@ -3177,6 +3187,7 @@ ./usr/lib/pkgconfig/atf.pc comp-obsolete obsolete ./usr/lib/pkgconfig/libcrypto.pc comp-crypto-lib crypto,share ./usr/lib/pkgconfig/libssl.pc comp-crypto-lib crypto,share +./usr/lib/pkgconfig/lutok.pc comp-crypto-lib kyua,share ./usr/lib/pkgconfig/openssl.pc comp-crypto-lib crypto,share ./usr/lib/pkgconfig/sqlite3.pc comp-c-lib ./usr/libdata/ldscripts/kmodule comp-util-share binutils,kmod Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.245 src/distrib/sets/lists/comp/shl.mi:1.246 --- src/distrib/sets/lists/comp/shl.mi:1.245 Wed Jan 16 16:01:07 2013 +++ src/distrib/sets/lists/comp/shl.mi Sat Feb 16 21:40:36 2013 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.245 2013/01/16 16:01:07 christos Exp $ +# $NetBSD: shl.mi,v 1.246 2013/02/16 21:40:36 jmmv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -78,6 +78,7 @@ ./usr/lib/libldap_pic.a comp-ldap-piclib ldap ./usr/lib/libldap_r_pic.a comp-ldap-piclib ldap ./usr/lib/liblua_pic.a comp-c-piclib +./usr/lib/liblutok_pic.a comp-c-piclib kyua ./usr/lib/liblwres_pic.a comp-bind-piclib ./usr/lib/liblzf_pic.a comp-c-piclib ./usr/lib/liblzma_pic.a comp-c-piclib Index: src/distrib/sets/lists/debug/ad.mips64eb diff -u src/distrib/sets/lists/debug/ad.mips64eb:1.5 src/distrib/sets/lists/debug/ad.mips64eb:1.6 --- src/distrib/sets/lists/debug/ad.mips64eb:1.5 Fri Feb 8 02:32:35 2013 +++ src/distrib/sets/lists/debug/ad.mips64eb Sat Feb 16 21:40:37 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.5 2013/02/08 02:32:35 christos Exp $ +# $NetBSD: ad.mips64eb,v 1.6 2013/02/16 21:40:37 jmmv Exp $ ./usr/libdata/debug/usr/bin/elf2aout.debug comp-obsolete obsolete ./usr/libdata/debug/usr/bin/elf2ecoff.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/lib/64/i18n/libBIG5.so.5.0.debug comp-i18n-debug debug,compat @@ -95,6 +95,7 @@ ./usr/libdata/debug/usr/lib/64/libldap.so.4.2.debug comp-ldap-debug ldap,debug,compat ./usr/libdata/debug/usr/lib/64/libldap_r.so.4.2.debug comp-ldap-debug ldap,debug,compat ./usr/libdata/debug/usr/lib/64/liblua.so.1.0.debug comp-sys-debug debug,compat +./usr/libdata/debug/usr/lib/64/liblutok.so.1.0.debug comp-kyua-debug kyua,debug,compat ./usr/libdata/debug/usr/lib/64/liblwres.so.5.8.debug comp-bind-debug debug,compat ./usr/libdata/debug/usr/lib/64/liblzf.so.1.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/64/liblzma.so.1.1.debug comp-sys-debug debug,compat @@ -256,6 +257,7 @@ ./usr/libdata/debug/usr/lib/o32/libldap.so.4.2.debug comp-ldap-debug ldap,debug,compat ./usr/libdata/debug/usr/lib/o32/libldap_r.so.4.2.debug comp-ldap-debug ldap,debug,compat ./usr/libdata/debug/usr/lib/o32/liblua.so.1.0.debug comp-sys-debug debug,compat +./usr/libdata/debug/usr/lib/o32/liblutok.so.1.0.debug comp-kyua-debug kyua,debug,compat ./usr/libdata/debug/usr/lib/o32/liblwres.so.5.8.debug comp-bind-debug debug,compat ./usr/libdata/debug/usr/lib/o32/liblzf.so.1.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/o32/liblzma.so.1.1.debug comp-sys-debug debug,compat Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.5 src/distrib/sets/lists/debug/mi:1.6 --- src/distrib/sets/lists/debug/mi:1.5 Fri Feb 15 22:14:21 2013 +++ src/distrib/sets/lists/debug/mi Sat Feb 16 21:40:38 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.5 2013/02/15 22:14:21 jmmv Exp $ +# $NetBSD: mi,v 1.6 2013/02/16 21:40:38 jmmv Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/libdata/debug/bin/cat.debug comp-util-debug debug ./usr/libdata/debug/bin/chio.debug comp-util-debug debug @@ -1568,6 +1568,12 @@ ./usr/libdata/debug/usr/tests/lib/semaphore/pthread/t_sem_pth.debug tests-lib-debug debug,atf,rump ./usr/libdata/debug/usr/tests/lib/libevent/h_event.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libexecinfo/t_backtrace.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/liblutok/c_gate_test.debug tests-lutok-debug debug,atf,kyua +./usr/libdata/debug/usr/tests/lib/liblutok/debug_test.debug tests-lutok-debug debug,atf,kyua +./usr/libdata/debug/usr/tests/lib/liblutok/exceptions_test.debug tests-lutok-debug debug,atf,kyua +./usr/libdata/debug/usr/tests/lib/liblutok/operations_test.debug tests-lutok-debug debug,atf,kyua +./usr/libdata/debug/usr/tests/lib/liblutok/stack_cleaner_test.debug tests-lutok-debug debug,atf,kyua +./usr/libdata/debug/usr/tests/lib/liblutok/state_test.debug tests-lutok-debug debug,atf,kyua ./usr/libdata/debug/usr/tests/lib/libm/t_acos.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libm/t_asin.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libm/t_atan.debug tests-lib-debug debug,atf Index: src/distrib/sets/lists/debug/ad.mips64el diff -u src/distrib/sets/lists/debug/ad.mips64el:1.6 src/distrib/sets/lists/debug/ad.mips64el:1.7 --- src/distrib/sets/lists/debug/ad.mips64el:1.6 Thu Feb 14 00:52:03 2013 +++ src/distrib/sets/lists/debug/ad.mips64el Sat Feb 16 21:40:37 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.6 2013/02/14 00:52:03 matt Exp $ +# $NetBSD: ad.mips64el,v 1.7 2013/02/16 21:40:37 jmmv Exp $ ./usr/libdata/debug/usr/bin/elf2aout.debug comp-obsolete obsolete ./usr/libdata/debug/usr/bin/elf2ecoff.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/lib/64/i18n/libBIG5.so.5.0.debug comp-i18n-debug debug,compat @@ -95,6 +95,7 @@ ./usr/libdata/debug/usr/lib/64/libldap.so.4.2.debug comp-ldap-debug ldap,debug,compat ./usr/libdata/debug/usr/lib/64/libldap_r.so.4.2.debug comp-ldap-debug ldap,debug,compat ./usr/libdata/debug/usr/lib/64/liblua.so.1.0.debug comp-sys-debug debug,compat +./usr/libdata/debug/usr/lib/64/liblutok.so.1.0.debug comp-kyua-debug kyua,debug,compat ./usr/libdata/debug/usr/lib/64/liblwres.so.5.8.debug comp-bind-debug debug,compat ./usr/libdata/debug/usr/lib/64/liblzf.so.1.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/64/liblzma.so.1.1.debug comp-sys-debug debug,compat @@ -256,6 +257,7 @@ ./usr/libdata/debug/usr/lib/o32/libldap.so.4.2.debug comp-ldap-debug ldap,debug,compat ./usr/libdata/debug/usr/lib/o32/libldap_r.so.4.2.debug comp-ldap-debug ldap,debug,compat ./usr/libdata/debug/usr/lib/o32/liblua.so.1.0.debug comp-sys-debug debug,compat +./usr/libdata/debug/usr/lib/o32/liblutok.so.1.0.debug comp-kyua-debug kyua,debug,compat ./usr/libdata/debug/usr/lib/o32/liblwres.so.5.8.debug comp-bind-debug debug,compat ./usr/libdata/debug/usr/lib/o32/liblzf.so.1.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/o32/liblzma.so.1.1.debug comp-sys-debug debug,compat Index: src/distrib/sets/lists/debug/md.amd64 diff -u src/distrib/sets/lists/debug/md.amd64:1.6 src/distrib/sets/lists/debug/md.amd64:1.7 --- src/distrib/sets/lists/debug/md.amd64:1.6 Fri Feb 8 02:32:35 2013 +++ src/distrib/sets/lists/debug/md.amd64 Sat Feb 16 21:40:38 2013 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.6 2013/02/08 02:32:35 christos Exp $ +# $NetBSD: md.amd64,v 1.7 2013/02/16 21:40:38 jmmv Exp $ ./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/iasl.debug comp-util-debug debug ./usr/libdata/debug/usr/lib/i386/i18n/libBIG5.so.5.0.debug comp-i18n-shlib compat,pic,debug @@ -92,6 +92,7 @@ ./usr/libdata/debug/usr/lib/i386/libldap.so.4.2.debug comp-compat-shlib compat,pic,ldap,debug ./usr/libdata/debug/usr/lib/i386/libldap_r.so.4.2.debug comp-compat-shlib compat,pic,ldap,debug ./usr/libdata/debug/usr/lib/i386/liblua.so.1.0.debug comp-compat-shlib compat,pic,debug +./usr/libdata/debug/usr/lib/i386/liblutok.so.1.0.debug comp-compat-shlib compat,pic,debug,kyua ./usr/libdata/debug/usr/lib/i386/liblwres.so.5.8.debug comp-compat-shlib compat,pic,debug ./usr/libdata/debug/usr/lib/i386/liblzf.so.1.0.debug comp-compat-shlib compat,pic,debug ./usr/libdata/debug/usr/lib/i386/liblzma.so.1.1.debug comp-compat-shlib compat,pic,debug @@ -245,6 +246,7 @@ ./usr/lib/i386/libldap_g.a comp-c-proflib compat,debuglib,ldap ./usr/lib/i386/libldap_r_g.a comp-c-proflib compat,debuglib,ldap ./usr/lib/i386/liblua_g.a comp-c-proflib compat,debuglib +./usr/lib/i386/liblutok_g.a comp-c-proflib compat,debuglib,kyua ./usr/lib/i386/liblwres_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/liblzf_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/liblzma_g.a comp-c-proflib compat,debuglib Index: src/distrib/sets/lists/debug/md.sparc64 diff -u src/distrib/sets/lists/debug/md.sparc64:1.6 src/distrib/sets/lists/debug/md.sparc64:1.7 --- src/distrib/sets/lists/debug/md.sparc64:1.6 Fri Feb 8 02:32:35 2013 +++ src/distrib/sets/lists/debug/md.sparc64 Sat Feb 16 21:40:38 2013 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.6 2013/02/08 02:32:35 christos Exp $ +# $NetBSD: md.sparc64,v 1.7 2013/02/16 21:40:38 jmmv Exp $ ./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug obsolete ./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug ./usr/libdata/debug/usr/lib/sparc/i18n/libBIG5.so.5.0.debug comp-i18n-shlib compat,pic,debug @@ -90,6 +90,7 @@ ./usr/libdata/debug/usr/lib/sparc/libldap.so.4.2.debug comp-compat-shlib compat,pic,debug,ldap ./usr/libdata/debug/usr/lib/sparc/libldap_r.so.4.2.debug comp-compat-shlib compat,pic,debug,ldap ./usr/libdata/debug/usr/lib/sparc/liblua.so.1.0.debug comp-compat-shlib compat,pic,debug +./usr/libdata/debug/usr/lib/sparc/liblutok.so.1.0.debug comp-compat-shlib compat,pic,debug,kyua ./usr/libdata/debug/usr/lib/sparc/liblwres.so.5.8.debug comp-compat-shlib compat,pic,debug ./usr/libdata/debug/usr/lib/sparc/liblzf.so.1.0.debug comp-compat-shlib compat,pic,debug ./usr/libdata/debug/usr/lib/sparc/liblzma.so.1.1.debug comp-compat-shlib compat,pic,debug @@ -236,6 +237,7 @@ ./usr/lib/sparc/libldap_g.a -unknown- compat,debuglib,ldap ./usr/lib/sparc/libldap_r_g.a -unknown- compat,debuglib,ldap ./usr/lib/sparc/liblua_g.a -unknown- compat,debuglib +./usr/lib/sparc/liblutok_g.a -unknown- compat,debuglib,kyua ./usr/lib/sparc/liblwres_g.a -unknown- compat,debuglib ./usr/lib/sparc/liblzf_g.a -unknown- compat,debuglib ./usr/lib/sparc/liblzma_g.a -unknown- compat,debuglib Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.7 src/distrib/sets/lists/debug/shl.mi:1.8 --- src/distrib/sets/lists/debug/shl.mi:1.7 Fri Feb 8 04:36:35 2013 +++ src/distrib/sets/lists/debug/shl.mi Sat Feb 16 21:40:39 2013 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.7 2013/02/08 04:36:35 matt Exp $ +# $NetBSD: shl.mi,v 1.8 2013/02/16 21:40:39 jmmv Exp $ ./usr/libdata/debug/usr/lib/i18n/libBIG5.so.5.0.debug comp-i18n-debug debug ./usr/libdata/debug/usr/lib/i18n/libDECHanyu.so.5.0.debug comp-i18n-debug debug ./usr/libdata/debug/usr/lib/i18n/libEUC.so.5.0.debug comp-i18n-debug debug @@ -86,6 +86,7 @@ ./usr/libdata/debug/usr/lib/libldap.so.4.2.debug comp-ldap-debug ldap,debug ./usr/libdata/debug/usr/lib/libldap_r.so.4.2.debug comp-ldap-debug ldap,debug ./usr/libdata/debug/usr/lib/liblua.so.1.0.debug comp-sys-debug debug +./usr/libdata/debug/usr/lib/liblutok.so.1.0.debug comp-kyua-debug kyua,debug ./usr/libdata/debug/usr/lib/liblwres.so.5.8.debug comp-bind-debug debug ./usr/libdata/debug/usr/lib/liblzf.so.1.0.debug comp-sys-debug debug ./usr/libdata/debug/usr/lib/liblzma.so.1.1.debug comp-sys-debug debug Index: src/distrib/sets/lists/misc/mi diff -u src/distrib/sets/lists/misc/mi:1.180 src/distrib/sets/lists/misc/mi:1.181 --- src/distrib/sets/lists/misc/mi:1.180 Wed Jan 16 21:11:10 2013 +++ src/distrib/sets/lists/misc/mi Sat Feb 16 21:40:40 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.180 2013/01/16 21:11:10 christos Exp $ +# $NetBSD: mi,v 1.181 2013/02/16 21:40:40 jmmv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -757,6 +757,11 @@ ./usr/share/examples/libsaslc/mech/GSSAPI.conf misc-libsaslc-examples share ./usr/share/examples/libsaslc/mech/LOGIN.conf misc-libsaslc-examples share ./usr/share/examples/libsaslc/mech/PLAIN.conf misc-libsaslc-examples share +./usr/share/examples/lutok misc-lutok-examples +./usr/share/examples/lutok/bindings.cpp misc-lutok-examples share,kyua +./usr/share/examples/lutok/hello.cpp misc-lutok-examples share,kyua +./usr/share/examples/lutok/interpreter.cpp misc-lutok-examples share,kyua +./usr/share/examples/lutok/raii.cpp misc-lutok-examples share,kyua ./usr/share/examples/mount_portal/advanced.1 misc-sys-examples share ./usr/share/examples/mount_portal/advanced.1.conf misc-sys-examples share ./usr/share/examples/mount_portal/cvs.1 misc-sys-examples share Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.517 src/distrib/sets/lists/tests/mi:1.518 --- src/distrib/sets/lists/tests/mi:1.517 Sat Feb 16 12:44:25 2013 +++ src/distrib/sets/lists/tests/mi Sat Feb 16 21:40:42 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.517 2013/02/16 12:44:25 jmmv Exp $ +# $NetBSD: mi,v 1.518 2013/02/16 21:40:42 jmmv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -93,6 +93,7 @@ ./usr/libdata/debug/usr/tests/lib/semaphore/pthread tests-lib-debug ./usr/libdata/debug/usr/tests/lib/libevent tests-lib-debug ./usr/libdata/debug/usr/tests/lib/libexecinfo tests-lib-debug +./usr/libdata/debug/usr/tests/lib/liblutok tests-lutok-debug ./usr/libdata/debug/usr/tests/lib/libm tests-lib-debug ./usr/libdata/debug/usr/tests/lib/libobjc tests-lib-debug ./usr/libdata/debug/usr/tests/lib/libposix tests-lib-debug @@ -1998,6 +1999,14 @@ ./usr/tests/lib/libexecinfo tests-lib-tests ./usr/tests/lib/libexecinfo/Atffile tests-lib-tests atf ./usr/tests/lib/libexecinfo/t_backtrace tests-lib-tests atf +./usr/tests/lib/liblutok tests-lutok-tests +./usr/tests/lib/liblutok/Atffile tests-lutok-tests atf,kyua +./usr/tests/lib/liblutok/c_gate_test tests-lutok-tests atf,kyua +./usr/tests/lib/liblutok/debug_test tests-lutok-tests atf,kyua +./usr/tests/lib/liblutok/exceptions_test tests-lutok-tests atf,kyua +./usr/tests/lib/liblutok/operations_test tests-lutok-tests atf,kyua +./usr/tests/lib/liblutok/stack_cleaner_test tests-lutok-tests atf,kyua +./usr/tests/lib/liblutok/state_test tests-lutok-tests atf,kyua ./usr/tests/lib/libm tests-lib-tests atf ./usr/tests/lib/libm/Atffile tests-lib-tests atf ./usr/tests/lib/libm/t_acos tests-lib-tests atf @@ -2304,6 +2313,9 @@ ./usr/tests/share/examples/Atffile tests-asm-tests atf,share ./usr/tests/share/examples/t_asm tests-asm-tests atf,share ./usr/tests/share/Atffile tests-sys-tests atf +./usr/tests/share/examples/lutok tests-lutok-tests +./usr/tests/share/examples/lutok/Atffile tests-lutok-tests atf,kyua,share +./usr/tests/share/examples/lutok/examples_test tests-lutok-tests atf,kyua,share ./usr/tests/share/mk tests-mk-tests ./usr/tests/share/mk/Atffile tests-mk-tests atf ./usr/tests/share/mk/t_lib tests-mk-tests atf Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.108 src/etc/mtree/NetBSD.dist.base:1.109 --- src/etc/mtree/NetBSD.dist.base:1.108 Wed Jan 23 15:02:53 2013 +++ src/etc/mtree/NetBSD.dist.base Sat Feb 16 21:40:44 2013 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.108 2013/01/23 15:02:53 joerg Exp $ +# $NetBSD: NetBSD.dist.base,v 1.109 2013/02/16 21:40:44 jmmv Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -141,6 +141,7 @@ ./usr/include/isofs/cd9660 ./usr/include/kadm5 ./usr/include/krb5 +./usr/include/lutok ./usr/include/lzma ./usr/include/miscfs ./usr/include/miscfs/fdesc @@ -346,6 +347,7 @@ ./usr/share/examples/libsaslc ./usr/share/examples/libsaslc/mech ./usr/share/examples/lua +./usr/share/examples/lutok ./usr/share/examples/mount_portal ./usr/share/examples/npf ./usr/share/examples/openssl Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.91 src/etc/mtree/NetBSD.dist.tests:1.92 --- src/etc/mtree/NetBSD.dist.tests:1.91 Sat Feb 16 12:44:26 2013 +++ src/etc/mtree/NetBSD.dist.tests Sat Feb 16 21:40:44 2013 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.91 2013/02/16 12:44:26 jmmv Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.92 2013/02/16 21:40:44 jmmv Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -80,6 +80,7 @@ ./usr/libdata/debug/usr/tests/lib/libexecinfo ./usr/libdata/debug/usr/tests/lib/semaphore ./usr/libdata/debug/usr/tests/lib/semaphore/pthread +./usr/libdata/debug/usr/tests/lib/liblutok ./usr/libdata/debug/usr/tests/lib/libm ./usr/libdata/debug/usr/tests/lib/libobjc ./usr/libdata/debug/usr/tests/lib/libposix @@ -225,6 +226,7 @@ ./usr/tests/lib/libbpfjit ./usr/tests/lib/libevent ./usr/tests/lib/libexecinfo +./usr/tests/lib/liblutok ./usr/tests/lib/libm ./usr/tests/lib/libobjc ./usr/tests/lib/libposix @@ -278,6 +280,7 @@ ./usr/tests/sbin/sysctl ./usr/tests/share ./usr/tests/share/examples +./usr/tests/share/examples/lutok ./usr/tests/share/mk ./usr/tests/sys ./usr/tests/sys/rc Index: src/external/bsd/Makefile diff -u src/external/bsd/Makefile:1.35 src/external/bsd/Makefile:1.36 --- src/external/bsd/Makefile:1.35 Tue Feb 12 20:32:11 2013 +++ src/external/bsd/Makefile Sat Feb 16 21:40:05 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2013/02/12 20:32:11 christos Exp $ +# $NetBSD: Makefile,v 1.36 2013/02/16 21:40:05 jmmv Exp $ .include <bsd.own.mk> @@ -19,6 +19,9 @@ SUBDIR+=ipf .if (${MKISCSI} != "no") SUBDIR+= iscsi .endif +.if (${MKKYUA} != "no") +SUBDIR+= lutok +.endif .if (${MKLDAP} != "no") SUBDIR+= openldap .endif Index: src/lib/Makefile diff -u src/lib/Makefile:1.197 src/lib/Makefile:1.198 --- src/lib/Makefile:1.197 Mon Jan 28 18:57:09 2013 +++ src/lib/Makefile Sat Feb 16 21:40:06 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.197 2013/01/28 18:57:09 matt Exp $ +# $NetBSD: Makefile,v 1.198 2013/02/16 21:40:06 jmmv Exp $ # from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91 .include <bsd.own.mk> @@ -154,6 +154,10 @@ SUBDIR+= .WAIT SUBDIR+= ../external/bsd/atf/lib # depends on libstdc++ .endif +.if (${MKKYUA} != "no") +SUBDIR+= ../external/bsd/lutok/lib # depends on lua and libstdc++ +.endif + SUBDIR+= libform # depends on libcurses SUBDIR+= libmenu # depends on libcurses SUBDIR+= libradius # depends on libcrypto if (${MKCRYPTO} != "no") Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.312 src/share/mk/bsd.README:1.313 --- src/share/mk/bsd.README:1.312 Fri Feb 15 19:49:48 2013 +++ src/share/mk/bsd.README Sat Feb 16 21:40:45 2013 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.312 2013/02/15 19:49:48 jmmv Exp $ +# $NetBSD: bsd.README,v 1.313 2013/02/16 21:40:45 jmmv Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -1505,6 +1505,7 @@ DPADD Additional dependencies for the p LIBLDAP?= ${DESTDIR}/usr/lib/libldap.a LIBLDAP_R?= ${DESTDIR}/usr/lib/libldap_r.a LIBLUA?= ${DESTDIR}/usr/lib/liblua.a + LIBLUTOK?= ${DESTDIR}/usr/lib/liblutok.a LIBLWRES?= ${DESTDIR}/usr/lib/liblwres.a LIBM?= ${DESTDIR}/usr/lib/libm.a LIBMAGIC?= ${DESTDIR}/usr/lib/libmagic.a Index: src/share/mk/bsd.hostprog.mk diff -u src/share/mk/bsd.hostprog.mk:1.67 src/share/mk/bsd.hostprog.mk:1.68 --- src/share/mk/bsd.hostprog.mk:1.67 Wed Feb 29 20:07:57 2012 +++ src/share/mk/bsd.hostprog.mk Sat Feb 16 21:40:45 2013 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.hostprog.mk,v 1.67 2012/02/29 20:07:57 tron Exp $ +# $NetBSD: bsd.hostprog.mk,v 1.68 2013/02/16 21:40:45 jmmv Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .include <bsd.init.mk> @@ -30,6 +30,7 @@ LIBINTL?= /usr/lib/libintl.a LIBIPSEC?= /usr/lib/libipsec.a LIBKVM?= /usr/lib/libkvm.a LIBL?= /usr/lib/libl.a +LIBLUTOK?= /usr/lib/liblutok.a LIBLZMA?= /usr/lib/liblzma.a LIBM?= /usr/lib/libm.a LIBMAGIC?= /usr/lib/libmagic.a Index: src/tests/lib/Makefile diff -u src/tests/lib/Makefile:1.22 src/tests/lib/Makefile:1.23 --- src/tests/lib/Makefile:1.22 Sun Nov 11 17:41:31 2012 +++ src/tests/lib/Makefile Sat Feb 16 21:40:07 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2012/11/11 17:41:31 alnsn Exp $ +# $NetBSD: Makefile,v 1.23 2013/02/16 21:40:07 jmmv Exp $ .include <bsd.own.mk> @@ -14,6 +14,12 @@ TESTS_SUBDIRS+= librumpclient librumphij TESTS_SUBDIRS+= libdes .endif +.if ${MKKYUA} != "no" +# These tests come from external/bsd/lutok/tests/lib/liblutok. Ensure they +# get registered in the Atffile only when installed. +ATFFILE_EXTRA_TPS= liblutok +.endif + .if (${MKSKEY} != "no") TESTS_SUBDIRS+= libskey .endif Index: src/tests/share/examples/Makefile diff -u src/tests/share/examples/Makefile:1.1 src/tests/share/examples/Makefile:1.2 --- src/tests/share/examples/Makefile:1.1 Sat Feb 16 12:44:26 2013 +++ src/tests/share/examples/Makefile Sat Feb 16 21:40:07 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/02/16 12:44:26 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2013/02/16 21:40:07 jmmv Exp $ .include <bsd.own.mk> @@ -6,4 +6,10 @@ TESTSDIR= ${TESTSBASE}/share/examples TESTS_SH= t_asm +.if ${MKKYUA} != "no" +# These examples come from external/bsd/lutok/tests/share/examples/lutok. +# Ensure they get registered in the Atffile only when installed. +ATFFILE_EXTRA_TPS= lutok +.endif + .include <bsd.test.mk>