Sun Oct 31 11:52:53 2010 UTC ()
Link Lua to the build and add the resulting files to the distribution sets.
Document the addition of Lua and the change we made to the default settings.
(mbalmer)
diff -r1.883 -r1.884 src/distrib/sets/lists/base/mi
diff -r1.551 -r1.552 src/distrib/sets/lists/base/shl.mi
diff -r1.1515 -r1.1516 src/distrib/sets/lists/comp/mi
diff -r1.133 -r1.134 src/distrib/sets/lists/comp/shl.mi
diff -r1.1243 -r1.1244 src/distrib/sets/lists/man/mi
diff -r1.781 -r1.782 src/doc/3RDPARTY
diff -r1.53 -r1.54 src/etc/mtree/NetBSD.dist.base
diff -r1.11 -r1.12 src/external/Makefile
diff -r1.151 -r1.152 src/lib/Makefile
diff -r1.276 -r1.277 src/share/mk/bsd.README
diff -r1.249 -r1.250 src/share/mk/bsd.prog.mk
--- src/distrib/sets/lists/base/mi 2010/10/30 21:16:08 1.883
+++ src/distrib/sets/lists/base/mi 2010/10/31 11:52:51 1.884
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.883 2010/10/30 21:16:08 haad Exp $
+# $NetBSD: mi,v 1.884 2010/10/31 11:52:51 mbalmer Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -489,6 +489,7 @@
./usr/bin/lpr base-lpr-bin
./usr/bin/lprm base-lpr-bin
./usr/bin/lsextattr base-util-bin
+./usr/bin/lua base-util-bin
./usr/bin/m4 base-util-bin
./usr/bin/machine base-util-bin
./usr/bin/mail base-mail-bin
@@ -833,6 +834,8 @@
./usr/lib/libssp.so base-obsolete obsolete
./usr/lib/libusb.a base-obsolete obsolete
./usr/lib/libusb.so base-obsolete obsolete
+./usr/lib/lua base-sys-root
+./usr/lib/lua/5.1 base-sys-root
./usr/lib/runemodule base-obsolete obsolete
./usr/lib/runemodule/libBIG5.a base-obsolete obsolete
./usr/lib/runemodule/libBIG5.so base-obsolete obsolete
@@ -3245,6 +3248,8 @@
./usr/share/locale/zh_TW.eucTW/LC_TIME base-locale-zh nls
./usr/share/locale/zh_TW/LC_MESSAGES base-locale-zh
./usr/share/locale/zh_TW/LC_MESSAGES/texinfo.mo base-texinfo_locale-zh nls
+./usr/share/lua base-sys-root
+./usr/share/lua/5.1 base-sys-root
./usr/share/man base-man-share
./usr/share/man/COPYRIGHT base-obsolete obsolete
./usr/share/man/cat1 base-man-share
--- src/distrib/sets/lists/base/shl.mi 2010/09/24 18:01:39 1.551
+++ src/distrib/sets/lists/base/shl.mi 2010/10/31 11:52:51 1.552
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.551 2010/09/24 18:01:39 skrll Exp $
+# $NetBSD: shl.mi,v 1.552 2010/10/31 11:52:51 mbalmer Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -281,6 +281,9 @@
./usr/lib/libldap_r.so base-ldap-shlib ldap
./usr/lib/libldap_r.so.4 base-ldap-shlib ldap
./usr/lib/libldap_r.so.4.1 base-ldap-shlib ldap
+./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/liblwres.so base-bind-shlib
./usr/lib/liblwres.so.5 base-bind-shlib
./usr/lib/liblwres.so.5.1 base-bind-shlib
--- src/distrib/sets/lists/comp/mi 2010/10/24 06:57:04 1.1515
+++ src/distrib/sets/lists/comp/mi 2010/10/31 11:52:51 1.1516
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1515 2010/10/24 06:57:04 jruoho Exp $
+# $NetBSD: mi,v 1.1516 2010/10/31 11:52:51 mbalmer Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -45,6 +45,7 @@
./usr/bin/lex comp-c-bin
./usr/bin/lint comp-c-bin
./usr/bin/lorder comp-util-bin
+./usr/bin/luac comp-util-bin
./usr/bin/menuc comp-c-bin
./usr/bin/mkstr comp-c-bin
./usr/bin/mkubootimage comp-util-bin
@@ -1379,6 +1380,7 @@
./usr/include/krb5/xdbm.h comp-krb5-include kerberos
./usr/include/kvm.h comp-c-include
./usr/include/langinfo.h comp-c-include
+./usr/include/lauxlib.h comp-c-include
./usr/include/lber.h comp-ldap-include ldap
./usr/include/lber_types.h comp-ldap-include ldap
./usr/include/ldap.h comp-ldap-include ldap
@@ -1398,6 +1400,9 @@
./usr/include/link_elf.h comp-c-include
./usr/include/locale.h comp-c-include
./usr/include/login_cap.h comp-c-include
+./usr/include/lua.h comp-c-include
+./usr/include/luaconf.h comp-c-include
+./usr/include/lualib.h comp-c-include
./usr/include/lwp.h comp-c-include
./usr/include/lzf.h comp-c-include
./usr/include/lzfP.h comp-c-include
@@ -2503,6 +2508,8 @@
./usr/lib/libldap_r.a comp-ldap-lib ldap
./usr/lib/libldap_r_g.a -unknown- debuglib,ldap
./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/liblwres.a comp-bind-lib
./usr/lib/liblwres_g.a -unknown- debuglib
./usr/lib/liblwres_p.a comp-bind-proflib profile
@@ -3815,6 +3822,7 @@
./usr/libdata/lint/llib-llber.ln comp-ldap-lintlib lint,ldap
./usr/libdata/lint/llib-lldap.ln comp-ldap-lintlib lint,ldap
./usr/libdata/lint/llib-lldap_r.ln comp-ldap-lintlib lint,ldap
+./usr/libdata/lint/llib-llua.ln comp-c-lintlib lint
./usr/libdata/lint/llib-llwres.ln comp-bind-lintlib lint
./usr/libdata/lint/llib-llzf.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lm.ln comp-c-lintlib lint
@@ -4046,6 +4054,7 @@
./usr/share/man/cat1/lexdoc.0 comp-obsolete obsolete
./usr/share/man/cat1/lint.0 comp-c-catman .cat
./usr/share/man/cat1/lorder.0 comp-util-catman .cat
+./usr/share/man/cat1/luac.0 comp-util-catman .cat
./usr/share/man/cat1/menuc.0 comp-c-catman .cat
./usr/share/man/cat1/mkstr.0 comp-c-catman .cat
./usr/share/man/cat1/msg_clear.0 comp-obsolete obsolete
@@ -10082,6 +10091,7 @@
./usr/share/man/html1/lex.html comp-c-htmlman html
./usr/share/man/html1/lint.html comp-c-htmlman html
./usr/share/man/html1/lorder.html comp-util-htmlman html
+./usr/share/man/html1/luac.html comp-util-htmlman html
./usr/share/man/html1/menuc.html comp-c-htmlman html
./usr/share/man/html1/mkstr.html comp-c-htmlman html
./usr/share/man/html1/msgc.html comp-c-htmlman html
@@ -15858,6 +15868,7 @@
./usr/share/man/man1/lex.1 comp-c-man .man
./usr/share/man/man1/lint.1 comp-c-man .man
./usr/share/man/man1/lorder.1 comp-util-man .man
+./usr/share/man/man1/luac.1 comp-util-man .man
./usr/share/man/man1/menuc.1 comp-c-man .man
./usr/share/man/man1/mkstr.1 comp-c-man .man
./usr/share/man/man1/msg_clear.1 comp-obsolete obsolete
--- src/distrib/sets/lists/comp/shl.mi 2010/09/24 18:01:39 1.133
+++ src/distrib/sets/lists/comp/shl.mi 2010/10/31 11:52:52 1.134
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.133 2010/09/24 18:01:39 skrll Exp $
+# $NetBSD: shl.mi,v 1.134 2010/10/31 11:52:52 mbalmer Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -63,6 +63,7 @@
./usr/lib/liblber_pic.a comp-ldap-piclib ldap
./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/liblwres_pic.a comp-bind-piclib
./usr/lib/liblzf_pic.a comp-c-piclib
./usr/lib/libm_pic.a comp-c-piclib
--- src/distrib/sets/lists/man/mi 2010/10/30 21:16:08 1.1243
+++ src/distrib/sets/lists/man/mi 2010/10/31 11:52:52 1.1244
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1243 2010/10/30 21:16:08 haad Exp $
+# $NetBSD: mi,v 1.1244 2010/10/31 11:52:52 mbalmer Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -264,6 +264,7 @@
./usr/share/man/cat1/lptest.0 man-lpr-catman .cat
./usr/share/man/cat1/ls.0 man-util-catman .cat
./usr/share/man/cat1/lsextattr.0 man-util-catman .cat
+./usr/share/man/cat1/lua.0 man-util-catman .cat
./usr/share/man/cat1/m4.0 man-util-catman .cat
./usr/share/man/cat1/machine.0 man-util-catman .cat
./usr/share/man/cat1/mail.0 man-mail-catman .cat
@@ -3019,6 +3020,7 @@
./usr/share/man/html1/lptest.html man-lpr-htmlman html
./usr/share/man/html1/ls.html man-util-htmlman html
./usr/share/man/html1/lsextattr.html man-util-htmlman html
+./usr/share/man/html1/lua.html man-util-htmlman html
./usr/share/man/html1/m4.html man-util-htmlman html
./usr/share/man/html1/machine.html man-util-htmlman html
./usr/share/man/html1/mail.html man-mail-htmlman html
@@ -5420,6 +5422,7 @@
./usr/share/man/man1/lptest.1 man-lpr-man .man
./usr/share/man/man1/ls.1 man-util-man .man
./usr/share/man/man1/lsextattr.1 man-util-man .man
+./usr/share/man/man1/lua.1 man-util-man .man
./usr/share/man/man1/m4.1 man-util-man .man
./usr/share/man/man1/machine.1 man-util-man .man
./usr/share/man/man1/mail.1 man-mail-man .man
--- src/doc/3RDPARTY 2010/10/07 14:41:02 1.781
+++ src/doc/3RDPARTY 2010/10/31 11:52:52 1.782
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.781 2010/10/07 14:41:02 roy Exp $
+# $NetBSD: 3RDPARTY,v 1.782 2010/10/31 11:52:52 mbalmer Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -603,6 +603,18 @@
We import only libwrap (under src/lib), tcpdchk and tcpdmatch (both
under src/usr.sbin). We don't use tcpd; that functionality is built
into inetd. The provided libwrap2netbsd script handles just libwrap.
+
+Package: Lua
+Version: Lua 5.1.4
+Current Vers: Lua 5.1.4
+Maintainer: PUC Rio
+Home Page: http://www.lua.org/
+Mailing List:
+Responsible: mbalmer
+License: MIT
+Notes:
+The default module paths have been changed to not include the current
+working director '.' to avoid potential security problems.
Package: m4
Version: 20091026
--- src/etc/mtree/NetBSD.dist.base 2010/10/20 09:22:32 1.53
+++ src/etc/mtree/NetBSD.dist.base 2010/10/31 11:52:53 1.54
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.53 2010/10/20 09:22:32 jmmv Exp $
+# $NetBSD: NetBSD.dist.base,v 1.54 2010/10/31 11:52:53 mbalmer Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -172,6 +172,8 @@
./usr/include/uvm
./usr/lib
./usr/lib/i18n
+./usr/lib/lua
+./usr/lib/lua/5.1
./usr/lib/pkgconfig
./usr/lib/security
./usr/libdata
@@ -756,6 +758,8 @@
./usr/share/locale/zh_TW.Big5/LC_MESSAGES
./usr/share/locale/zh_TW.eucTW
./usr/share/locale/zh_TW.eucTW/LC_MESSAGES
+./usr/share/lua
+./usr/share/lua/5.1
./usr/share/man
./usr/share/man/cat1
./usr/share/man/cat1/atari
--- src/external/Makefile 2010/08/27 16:50:30 1.11
+++ src/external/Makefile 2010/10/31 11:52:53 1.12
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/08/27 16:50:30 christos Exp $
+# $NetBSD: Makefile,v 1.12 2010/10/31 11:52:53 mbalmer Exp $
SUBDIR+= lib .WAIT
SUBDIR+= apache2 bsd intel-fw-eula intel-fw-public gpl2 gpl3 historical
-SUBDIR+= ibm-public intel-public cddl
+SUBDIR+= ibm-public intel-public cddl mit
.include <bsd.subdir.mk>
--- src/lib/Makefile 2010/09/01 16:01:27 1.151
+++ src/lib/Makefile 2010/10/31 11:52:50 1.152
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.151 2010/09/01 16:01:27 agc Exp $
+# $NetBSD: Makefile,v 1.152 2010/10/31 11:52:50 mbalmer Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -12,6 +12,7 @@
libterminfo libusbhid libutil libwrap liby libz
SUBDIR+=../external/bsd/flex/lib
+SUBDIR+=../external/mit/lua/lib
# libcurses needs libtermlib
SUBDIR+= .WAIT libcurses
--- src/share/mk/bsd.README 2010/08/25 15:24:29 1.276
+++ src/share/mk/bsd.README 2010/10/31 11:52:53 1.277
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.276 2010/08/25 15:24:29 reed Exp $
+# $NetBSD: bsd.README,v 1.277 2010/10/31 11:52:53 mbalmer Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1350,6 +1350,7 @@
LIBLBER?= ${DESTDIR}/usr/lib/liblber.a
LIBLDAP?= ${DESTDIR}/usr/lib/libldap.a
LIBLDAP_R?= ${DESTDIR}/usr/lib/libldap_r.a
+ LIBLUA?= ${DESTDIR}/usr/lib/liblua.a
LIBM?= ${DESTDIR}/usr/lib/libm.a
LIBMENU?= ${DESTDIR}/usr/lib/libmenu.a
LIBOBJC?= ${DESTDIR}/usr/lib/libobjc.a
--- src/share/mk/bsd.prog.mk 2010/07/06 05:59:56 1.249
+++ src/share/mk/bsd.prog.mk 2010/10/31 11:52:53 1.250
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.249 2010/07/06 05:59:56 mrg Exp $
+# $NetBSD: bsd.prog.mk,v 1.250 2010/10/31 11:52:53 mbalmer Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -97,7 +97,7 @@
crypt crypto crypto_idea crypto_mdc2 crypto_rc5 \
curses dbm des edit event \
fetch form fl g2c gcc gnumalloc gssapi hdb heimntlm hx509 intl ipsec \
- kadm5clnt kadm5srv kafs krb5 kvm l lber ldap ldap_r \
+ kadm5clnt kadm5srv kafs krb5 kvm l lber ldap ldap_r lua \
m magic menu objc ossaudio pam pcap pci pmc posix pthread pthread_dbg \
puffs radius resolv rmt roken rpcsvc rt rump rumpuser skey sl ss \
ssh ssl termcap usbhid util wrap y z bind9 dns lwres isccfg isccc isc \