Hi,
After removing National Language Support (NLS) from base, I think
the directory /usr/share/nls should go. Having a non-existing
default path in catopen(3) does not make sense, so I also removed
that.
ok?
bluhm
Index: etc/mtree/4.4BSD.dist
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/etc/mtree/4.4BSD.dist,v
retrieving revision 1.274
diff -u -p -r1.274 4.4BSD.dist
--- etc/mtree/4.4BSD.dist 10 Oct 2015 09:45:15 -0000 1.274
+++ etc/mtree/4.4BSD.dist 1 Nov 2015 19:03:51 -0000
@@ -613,8 +613,6 @@ usr
..
mk
..
- nls
- ..
# ./usr/share/snmp
snmp
Index: lib/libc/nls/catopen.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/lib/libc/nls/catopen.c,v
retrieving revision 1.18
diff -u -p -r1.18 catopen.c
--- lib/libc/nls/catopen.c 23 Oct 2015 18:49:07 -0000 1.18
+++ lib/libc/nls/catopen.c 1 Nov 2015 19:11:52 -0000
@@ -43,7 +43,6 @@
#define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b))
-#define NLS_DEFAULT_PATH
"/usr/share/nls/%L/%N.cat:/usr/share/nls/%l.%c/%N.cat:/usr/share/nls/%l/%N.cat"
#define NLS_DEFAULT_LANG "C"
static nl_catd load_msgcat(const char *);
@@ -67,7 +66,7 @@ catopen(const char *name, int oflag)
return load_msgcat(name);
if (issetugid() != 0 || (nlspath = getenv("NLSPATH")) == NULL)
- nlspath = NLS_DEFAULT_PATH;
+ return (nl_catd) -1;
lang = NULL;
if (oflag & NL_CAT_LOCALE) {
Index: share/man/man7/hier.7
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/share/man/man7/hier.7,v
retrieving revision 1.144
diff -u -p -r1.144 hier.7
--- share/man/man7/hier.7 24 Aug 2015 11:16:41 -0000 1.144
+++ share/man/man7/hier.7 1 Nov 2015 19:04:39 -0000
@@ -421,8 +421,6 @@ Additional i386 console fonts.
.It mk/
Templates for
.Xr make 1 .
-.It nls/
-National Language Support (NLS) catalogs.
.It snmp/
Data files for
.Xr snmpd 8 .
