diff options
| author | nikita <nikita@NetBSD.org> | 2023-04-16 20:46:16 +0000 |
|---|---|---|
| committer | nikita <nikita@NetBSD.org> | 2023-04-16 20:46:16 +0000 |
| commit | 5d7f68298a269c6bcf3c1983f0b9b44e52c5c2bf (patch) | |
| tree | 3da439acfeacea2d18f0ea1f8ebe5635d1a28fab /etc | |
| parent | 3381fb4f9d31004c79eeada1ad64b7e367e1c452 (diff) | |
Resolve conflicts for lua 5.4.4 import.
Adjust various files for lua 5.4.4.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/mtree/NetBSD.dist.base | 6 | ||||
| -rw-r--r-- | etc/mtree/NetBSD.dist.compat.in | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base index 7906d9c6d79..dbcfbf0bf7d 100644 --- a/etc/mtree/NetBSD.dist.base +++ b/etc/mtree/NetBSD.dist.base @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.246 2022/06/12 03:51:13 tsutsui Exp $ +# $NetBSD: NetBSD.dist.base,v 1.247 2023/04/16 20:46:17 nikita Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -353,7 +353,7 @@ ./usr/lib/clang/13.0.0/share ./usr/lib/i18n ./usr/lib/lua -./usr/lib/lua/5.3 +./usr/lib/lua/5.4 ./usr/lib/named ./usr/lib/pkgconfig ./usr/lib/postfix @@ -971,7 +971,7 @@ ./usr/share/locale/zh_TW.eucTW/LC_MESSAGES ./usr/share/locale/zh_TW/LC_MESSAGES ./usr/share/lua -./usr/share/lua/5.3 +./usr/share/lua/5.4 ./usr/share/man ./usr/share/man/cat1 ./usr/share/man/cat1/atari diff --git a/etc/mtree/NetBSD.dist.compat.in b/etc/mtree/NetBSD.dist.compat.in index ac519e94939..6166bacabcc 100644 --- a/etc/mtree/NetBSD.dist.compat.in +++ b/etc/mtree/NetBSD.dist.compat.in @@ -1,11 +1,11 @@ -# $NetBSD: NetBSD.dist.compat.in,v 1.1 2015/06/19 18:16:06 matt Exp $ +# $NetBSD: NetBSD.dist.compat.in,v 1.2 2023/04/16 20:46:17 nikita Exp $ ./lib/@ARCH_SUBDIR@ ./lib/@ARCH_SUBDIR@/npf ./usr/lib/@ARCH_SUBDIR@ ./usr/lib/@ARCH_SUBDIR@/i18n ./usr/lib/@ARCH_SUBDIR@/lua -./usr/lib/@ARCH_SUBDIR@/lua/5.3 +./usr/lib/@ARCH_SUBDIR@/lua/5.4 ./usr/lib/@ARCH_SUBDIR@/security ./usr/libdata/debug/lib/@ARCH_SUBDIR@ ./usr/libdata/debug/lib/@ARCH_SUBDIR@/npf |
