Nothing in base uses native language support anymore. Remove NLS

support from the makefiles.
OK naddy@

diff --git a/share/man/man5/mk.conf.5 b/share/man/man5/mk.conf.5
index 7c7ce23..7154483 100644 (file)
--- a/share/man/man5/mk.conf.5
+++ b/share/man/man5/mk.conf.5
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: mk.conf.5,v 1.29 2015/10/02 07:29:55 jmc Exp $
+.\"    $OpenBSD: mk.conf.5,v 1.30 2015/10/26 10:43:42 bluhm Exp $
 .\"
 .\" Copyright (c) 2003 Jason McIntyre
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 2 2015 $
+.Dd $Mdocdate: October 26 2015 $
 .Dt MK.CONF 5
 .Os
 .Sh NAME
@@ -144,18 +144,6 @@ Manual mode.
 .It Ev MANOWN
 Manual owner.
 .Bq root
-.It Ev NLSDIR
-Base path for National Language Support files installation.
-.Bq Pa /usr/share/nls
-.It Ev NLSGRP
-National Language Support files group.
-.Bq bin
-.It Ev NLSMODE
-National Language Support files mode.
-.Bq Ev ${NONBINMODE}
-.It Ev NLSOWN
-National Language Support files owner.
-.Bq root
 .It Ev NONBINMODE
 Mode for non-executable files.
 .Bq 444

diff --git a/share/mk/Makefile b/share/mk/Makefile
index c0da965..1cdbef3 100644 (file)
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,7 +1,7 @@
-#      $OpenBSD: Makefile,v 1.13 2014/10/09 04:44:09 tedu Exp $
+#      $OpenBSD: Makefile,v 1.14 2015/10/26 10:43:42 bluhm Exp $
 #      $NetBSD: Makefile,v 1.12 1995/10/22 00:45:53 christos Exp $
 
-FILES= bsd.README bsd.dep.mk bsd.lib.mk bsd.man.mk bsd.nls.mk \
+FILES= bsd.README bsd.dep.mk bsd.lib.mk bsd.man.mk \
        bsd.obj.mk bsd.own.mk bsd.port.arch.mk bsd.port.mk \
        bsd.port.subdir.mk bsd.prog.mk \
        bsd.regress.mk bsd.subdir.mk bsd.sys.mk sys.mk \

diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 10b91e9..3ef50e1 100644 (file)
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-#      $OpenBSD: bsd.README,v 1.60 2015/07/20 23:52:29 yasuoka Exp $
+#      $OpenBSD: bsd.README,v 1.61 2015/10/26 10:43:42 bluhm Exp $
 #      $NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $
 #      @(#)bsd.README  5.1 (Berkeley) 5/11/90
 
@@ -9,7 +9,6 @@ convention, named with the suffix ".mk".
 bsd.dep.mk             - handle Makefile dependencies
 bsd.lib.mk             - support for building libraries
 bsd.man.mk             - installing manual pages and their links
-bsd.nls.mk             - National Language Support
 bsd.obj.mk             - creating 'obj' directories and cleaning up
 bsd.own.mk             - define common variables
 bsd.port.mk            - building ports
@@ -190,15 +189,6 @@ DOCOWN             Documentation owner. [root]
 
 DOCMODE                Documentation mode. [${NONBINMODE}]
 
-NLSDIR         Base path for National Language Support files installation.
-               [/usr/share/nls]
-
-NLSGRP         National Language Support files group. [bin]
-
-NLSOWN         National Language Support files owner. [root]
-
-NLSMODE                National Language Support files mode. [${NONBINMODE}]
-
 INSTALL_STRIP  The flag passed to the install program to cause the binary
                to be stripped.  This is to be used when building your
                own install script so that the entire system can be made

diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 4270e7e..cf855b0 100644 (file)
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: bsd.lib.mk,v 1.73 2015/07/19 20:45:30 guenther Exp $
+#      $OpenBSD: bsd.lib.mk,v 1.74 2015/10/26 10:43:42 bluhm Exp $
 #      $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $
 #      @(#)bsd.lib.mk  5.26 (Berkeley) 5/2/91
 
@@ -310,10 +310,6 @@ realinstall: beforeinstall
 .include <bsd.man.mk>
 .endif
 
-.if !defined(NONLS)
-.include <bsd.nls.mk>
-.endif
-
 .include <bsd.obj.mk>
 .include <bsd.dep.mk>
 .include <bsd.subdir.mk>

diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
deleted file mode 100644 (file)
index b631be0..0000000
--- a/share/mk/bsd.nls.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#      $OpenBSD: bsd.nls.mk,v 1.7 2006/03/14 10:42:02 deraadt Exp $
-#      $NetBSD: bsd.nls.mk,v 1.2 1995/04/27 18:05:38 jtc Exp $
-
-.if !target(.MAIN)
-.MAIN: all
-.endif
-
-.SUFFIXES: .cat .msg
-
-.msg.cat:
-       @rm -f ${.TARGET}
-       gencat ${.TARGET} ${.IMPSRC}
-
-.if defined(NLS) && !empty(NLS)
-NLSALL= ${NLS:.msg=.cat}
-.endif
-
-.if !defined(NLSNAME)
-.if defined(PROG)
-NLSNAME=${PROG}
-.else
-NLSNAME=lib${LIB}
-.endif
-.endif
-
-nlsinstall:
-.if defined(NLSALL)
-       @for msg in ${NLSALL}; do \
-               NLSLANG=`basename $$msg .cat`; \
-               dir=${DESTDIR}${NLSDIR}/$${NLSLANG}; \
-               echo ${INSTALL} -d $$dir; \
-               ${INSTALL} -d $$dir; \
-               echo ${INSTALL} ${INSTALL_COPY} -o ${NLSOWN} -g ${NLSGRP} -m ${NLSMODE} $$msg $$dir/${NLSNAME}.cat; \
-               ${INSTALL} ${INSTALL_COPY} -o ${NLSOWN} -g ${NLSGRP} -m ${NLSMODE} $$msg $$dir/${NLSNAME}.cat; \
-       done
-.endif
-
-.if defined(NLSALL)
-all: ${NLSALL}
-
-install:  nlsinstall
-
-cleandir: cleannls
-cleannls:
-       rm -f ${NLSALL}
-.endif

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 6635692..4c3487e 100644 (file)
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: bsd.own.mk,v 1.171 2015/08/31 20:02:49 deraadt Exp $
+#      $OpenBSD: bsd.own.mk,v 1.172 2015/10/26 10:43:42 bluhm Exp $
 #      $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
 
 # Host-specific overrides
@@ -86,11 +86,6 @@ LKMGRP?=     ${BINGRP}
 LKMOWN?=       ${BINOWN}
 LKMMODE?=      ${NONBINMODE}
 
-NLSDIR?=       /usr/share/nls
-NLSGRP?=       bin
-NLSOWN?=       root
-NLSMODE?=      ${NONBINMODE}
-
 LOCALEDIR?=    /usr/share/locale
 LOCALEGRP?=    wheel
 LOCALEOWN?=    root
@@ -156,5 +151,5 @@ BSD_OWN_MK=Done
 
 .PHONY: spell clean cleandir obj manpages print all \
        depend beforedepend afterdepend cleandepend subdirdepend \
-       all cleanman nlsinstall cleannls includes \
+       all cleanman includes \
        beforeinstall realinstall maninstall afterinstall install

diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index d36787a..510b2d7 100644 (file)
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: bsd.prog.mk,v 1.68 2015/07/20 23:52:29 yasuoka Exp $
+#      $OpenBSD: bsd.prog.mk,v 1.69 2015/10/26 10:43:42 bluhm Exp $
 #      $NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $
 #      @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
 
@@ -140,10 +140,6 @@ realinstall: beforeinstall
 .include <bsd.man.mk>
 .endif
 
-.if !defined(NONLS)
-.include <bsd.nls.mk>
-.endif
-
 .include <bsd.obj.mk>
 .include <bsd.dep.mk>
 .include <bsd.subdir.mk>