Module Name: src
Committed By: christos
Date: Tue May 1 19:59:48 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile: Makefile
src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et: Makefile
src/crypto/external/bsd/heimdal/lib/libsl/slc: Makefile
src/distrib/amiga/stand: Makefile
src/distrib/cdrom/macppc_installboot: Makefile
src/distrib/cdrom/macppc_mkboothfs: Makefile
src/external/bsd/nvi/catalog: Makefile
src/external/bsd/openldap: Makefile
src/external/bsd/pcc/libexec/mkext: Makefile
src/external/gpl2/texinfo/makedoc: Makefile
src/external/mit/xorg/tools/bdftopcf: Makefile
src/external/mit/xorg/tools/fc-cache: Makefile
src/external/mit/xorg/tools/makekeys: Makefile
src/external/mit/xorg/tools/makestrs: Makefile
src/external/mit/xorg/tools/mkfontscale: Makefile
src/external/mit/xorg/tools/ucs2any: Makefile
src/games/boggle/mkdict: Makefile
src/games/boggle/mkindex: Makefile
src/sys/arch/amiga/stand/loadkmap/din: Makefile
src/sys/arch/amiga/stand/loadkmap/es: Makefile
src/sys/arch/amiga/stand/loadkmap/fr: Makefile
src/sys/arch/amiga/stand/loadkmap/pl_din: Makefile
src/sys/arch/amiga/stand/loadkmap/pl_us: Makefile
src/sys/arch/amiga/stand/loadkmap/sw: Makefile
src/sys/arch/amiga/stand/loadkmap/us: Makefile
src/sys/arch/atari/stand/keymaps/de: Makefile
src/sys/arch/atari/stand/keymaps/fr: Makefile
src/sys/arch/atari/stand/keymaps/uk: Makefile
src/sys/arch/atari/stand/keymaps/us: Makefile
src/sys/arch/i386/stand/genprom: Makefile
src/sys/arch/i386/stand/misc: Makefile
src/sys/arch/macppc/stand/fixcoff: Makefile
src/sys/arch/mvme68k/stand/wrtvid: Makefile
src/sys/arch/x68k/stand/aout2hux: Makefile
src/tools: Makefile.host
src/tools/binstall: Makefile
src/tools/binutils: Makefile
src/tools/compat: Makefile
src/tools/ctfconvert: Makefile
src/tools/ctfmerge: Makefile
src/tools/cvslatest: Makefile
src/tools/dbsym: Makefile
src/tools/dtc: Makefile
src/tools/gcc: Makefile
src/tools/gdb: Makefile
src/tools/genassym: Makefile
src/tools/gettext: Makefile
src/tools/host-mkdep: Makefile
src/tools/libctf: Makefile
src/tools/libdwarf: Makefile
src/tools/libelf: Makefile
src/tools/libfdt: Makefile
src/tools/llvm: Makefile
src/tools/llvm-lib: Makefile
src/tools/lorder: Makefile
src/tools/mandoc: Makefile
src/tools/mdsetimage: Makefile
src/usr.sbin/bta2dpd/cosdata-gen: Makefile
src/usr.sbin/bta2dpd/sbc_crc-gen: Makefile
Added Files:
src/share/mk: bsd.hostinit.mk
Removed Files:
src/external/mit/xorg/tools: Makefile.inc
src/tools: Makefile.inc
Log Message:
Create a new bsd.hostinit.mk file and put the build definitions for all host
programs there; make all Makefiles that use bsd.hostprog.mk include it.
Namely turn off MKREPRO and don't make lint, man pages, info files etc.
Remove the Makefile.inc files that contained these same settings, and
remove the settings from Makefile.host
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/amiga/stand/Makefile
cvs rdiff -u -r1.10 -r1.11 src/distrib/cdrom/macppc_installboot/Makefile
cvs rdiff -u -r1.5 -r1.6 src/distrib/cdrom/macppc_mkboothfs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/catalog/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pcc/libexec/mkext/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/texinfo/makedoc/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/tools/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/tools/bdftopcf/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/tools/fc-cache/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/tools/makekeys/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/tools/makestrs/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/tools/mkfontscale/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/tools/ucs2any/Makefile
cvs rdiff -u -r1.12 -r1.13 src/games/boggle/mkdict/Makefile
cvs rdiff -u -r1.10 -r1.11 src/games/boggle/mkindex/Makefile
cvs rdiff -u -r0 -r1.1 src/share/mk/bsd.hostinit.mk
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amiga/stand/loadkmap/din/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/stand/loadkmap/es/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/stand/loadkmap/fr/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/stand/loadkmap/pl_din/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/stand/loadkmap/pl_us/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/stand/loadkmap/sw/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amiga/stand/loadkmap/us/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/atari/stand/keymaps/de/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/atari/stand/keymaps/fr/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/atari/stand/keymaps/uk/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/atari/stand/keymaps/us/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/i386/stand/genprom/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/stand/misc/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/macppc/stand/fixcoff/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mvme68k/stand/wrtvid/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/aout2hux/Makefile
cvs rdiff -u -r1.32 -r1.33 src/tools/Makefile.host
cvs rdiff -u -r1.15 -r0 src/tools/Makefile.inc
cvs rdiff -u -r1.13 -r1.14 src/tools/binstall/Makefile
cvs rdiff -u -r1.27 -r1.28 src/tools/binutils/Makefile
cvs rdiff -u -r1.82 -r1.83 src/tools/compat/Makefile
cvs rdiff -u -r1.8 -r1.9 src/tools/ctfconvert/Makefile
cvs rdiff -u -r1.9 -r1.10 src/tools/ctfmerge/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tools/cvslatest/Makefile
cvs rdiff -u -r1.14 -r1.15 src/tools/dbsym/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tools/dtc/Makefile
cvs rdiff -u -r1.85 -r1.86 src/tools/gcc/Makefile
cvs rdiff -u -r1.35 -r1.36 src/tools/gdb/Makefile
cvs rdiff -u -r1.7 -r1.8 src/tools/genassym/Makefile
cvs rdiff -u -r1.7 -r1.8 src/tools/gettext/Makefile
cvs rdiff -u -r1.12 -r1.13 src/tools/host-mkdep/Makefile
cvs rdiff -u -r1.7 -r1.8 src/tools/libctf/Makefile
cvs rdiff -u -r1.8 -r1.9 src/tools/libdwarf/Makefile
cvs rdiff -u -r1.9 -r1.10 src/tools/libelf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tools/libfdt/Makefile
cvs rdiff -u -r1.21 -r1.22 src/tools/llvm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tools/llvm-lib/Makefile
cvs rdiff -u -r1.13 -r1.14 src/tools/lorder/Makefile
cvs rdiff -u -r1.12 -r1.13 src/tools/mandoc/Makefile
cvs rdiff -u -r1.16 -r1.17 src/tools/mdsetimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/bta2dpd/cosdata-gen/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/bta2dpd/sbc_crc-gen/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile:1.3
--- src/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile:1.2 Fri Apr 15 15:41:11 2011
+++ src/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile Tue May 1 15:59:42 2018
@@ -1,9 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2011/04/15 19:41:11 elric Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:42 christos Exp $
-NOLINT= # defined
-NOMAN= # defined
-
-.include <bsd.own.mk>
+.include <bsd.hostinit.mk>
.include <${.CURDIR}/../../../Makefile.inc>
.PATH: ${HEIMDIST}/lib/asn1 \
Index: src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile:1.4 Sun Jan 29 21:38:50 2017
+++ src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile Tue May 1 15:59:42 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2017/01/30 02:38:50 jakllsch Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:42 christos Exp $
-NOMAN= # defined
-
-.include <bsd.own.mk>
+.include <bsd.hostinit.mk>
.include <${.CURDIR}/../../../Makefile.inc>
.PATH: ${HEIMDIST}/lib/com_err \
Index: src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile:1.4 Sun Jan 29 21:38:50 2017
+++ src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile Tue May 1 15:59:43 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2017/01/30 02:38:50 jakllsch Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:43 christos Exp $
-NOMAN= # defined
-
-.include <bsd.own.mk>
+.include <bsd.hostinit.mk>
.include <${.CURDIR}/../../../Makefile.inc>
.PATH: ${HEIMDIST}/lib/sl ${HEIMDIST}/lib/roken ${HEIMDIST}/lib/vers
Index: src/distrib/amiga/stand/Makefile
diff -u src/distrib/amiga/stand/Makefile:1.4 src/distrib/amiga/stand/Makefile:1.5
--- src/distrib/amiga/stand/Makefile:1.4 Wed Nov 11 11:13:55 2015
+++ src/distrib/amiga/stand/Makefile Tue May 1 15:59:43 2018
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2015/11/11 16:13:55 phx Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:43 christos Exp $
#
+#include <bsd.hostinit.mk>
+
MISC_FILES= runbootblock.README
UUDECODE_FILES= device-streams.tar.gz \
loadbsd rdbinfo runbootblock xstreamtodev
Index: src/distrib/cdrom/macppc_installboot/Makefile
diff -u src/distrib/cdrom/macppc_installboot/Makefile:1.10 src/distrib/cdrom/macppc_installboot/Makefile:1.11
--- src/distrib/cdrom/macppc_installboot/Makefile:1.10 Wed Mar 9 10:44:49 2016
+++ src/distrib/cdrom/macppc_installboot/Makefile Tue May 1 15:59:43 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2016/03/09 15:44:49 christos Exp $
+# $NetBSD: Makefile,v 1.11 2018/05/01 19:59:43 christos Exp $
-NOMAN= # defined
-
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROG= macppc_installboot
SRCS= installboot.c cd9660.c cd9660_util.c
Index: src/distrib/cdrom/macppc_mkboothfs/Makefile
diff -u src/distrib/cdrom/macppc_mkboothfs/Makefile:1.5 src/distrib/cdrom/macppc_mkboothfs/Makefile:1.6
--- src/distrib/cdrom/macppc_mkboothfs/Makefile:1.5 Sun Dec 2 07:55:27 2012
+++ src/distrib/cdrom/macppc_mkboothfs/Makefile Tue May 1 15:59:43 2018
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2012/12/02 12:55:27 apb Exp $
+# $NetBSD: Makefile,v 1.6 2018/05/01 19:59:43 christos Exp $
HOSTPROG= macppc_mkboothfs
SRCS= mkboothfs.c
-NOMAN= # defined
CLEANFILES+= boothfs
-.include <bsd.own.mk>
+.include <bsd.hostinit.mk>
.ifndef NOCOMPATLIB
.-include "${TOOLDIR}/share/compat/defs.mk"
Index: src/external/bsd/nvi/catalog/Makefile
diff -u src/external/bsd/nvi/catalog/Makefile:1.2 src/external/bsd/nvi/catalog/Makefile:1.3
--- src/external/bsd/nvi/catalog/Makefile:1.2 Fri Nov 22 11:11:08 2013
+++ src/external/bsd/nvi/catalog/Makefile Tue May 1 15:59:43 2018
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2013/11/22 16:11:08 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:43 christos Exp $
#
# @(#)Makefile 8.29 (Berkeley) 10/19/96
-NOMAN= # defined
-
-.include "../Makefile.inc"
+.include <bsd.hostinit.mk>
.PATH: ${DIST}/catalog
Index: src/external/bsd/openldap/Makefile
diff -u src/external/bsd/openldap/Makefile:1.2 src/external/bsd/openldap/Makefile:1.3
--- src/external/bsd/openldap/Makefile:1.2 Tue Jul 22 20:21:19 2008
+++ src/external/bsd/openldap/Makefile Tue May 1 15:59:43 2018
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/07/23 00:21:19 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:43 christos Exp $
.include "openldap.mk"
+.include <bsd.hostinit.mk>
+
SUBDIR= include
SUBDIR+= lib .WAIT
Index: src/external/bsd/pcc/libexec/mkext/Makefile
diff -u src/external/bsd/pcc/libexec/mkext/Makefile:1.2 src/external/bsd/pcc/libexec/mkext/Makefile:1.3
--- src/external/bsd/pcc/libexec/mkext/Makefile:1.2 Fri Apr 29 04:33:02 2011
+++ src/external/bsd/pcc/libexec/mkext/Makefile Tue May 1 15:59:43 2018
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2011/04/29 08:33:02 plunky Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:43 christos Exp $
#
# this is really part of ccom, but HOSTPROG and PROG don't mix
#
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
.PATH: ${PCC_DIST}/mip \
${PCC_DIST}/arch/${TARGMACH}
HOSTPROG= mkext
-MAN=
SRCS= mkext.c table.c common.c
HOST_CPPFLAGS+= -DMKEXT
Index: src/external/gpl2/texinfo/makedoc/Makefile
diff -u src/external/gpl2/texinfo/makedoc/Makefile:1.1 src/external/gpl2/texinfo/makedoc/Makefile:1.2
--- src/external/gpl2/texinfo/makedoc/Makefile:1.1 Wed Jan 13 19:34:53 2016
+++ src/external/gpl2/texinfo/makedoc/Makefile Tue May 1 15:59:43 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2016/01/14 00:34:53 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/01 19:59:43 christos Exp $
-NOMAN=
-MAKEDOC=
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROG= makedoc
SRCS= makedoc.c xexit.c xmalloc.c xstrdup.c
Index: src/external/mit/xorg/tools/bdftopcf/Makefile
diff -u src/external/mit/xorg/tools/bdftopcf/Makefile:1.8 src/external/mit/xorg/tools/bdftopcf/Makefile:1.9
--- src/external/mit/xorg/tools/bdftopcf/Makefile:1.8 Tue May 1 13:42:00 2018
+++ src/external/mit/xorg/tools/bdftopcf/Makefile Tue May 1 15:59:43 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2018/05/01 17:42:00 christos Exp $
+# $NetBSD: Makefile,v 1.9 2018/05/01 19:59:43 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROG= bdftopcf
.PATH: ${X11SRCDIR.bdftopcf}
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.12 src/external/mit/xorg/tools/fc-cache/Makefile:1.13
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.12 Tue May 1 13:42:01 2018
+++ src/external/mit/xorg/tools/fc-cache/Makefile Tue May 1 15:59:43 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2018/05/01 17:42:01 christos Exp $
+# $NetBSD: Makefile,v 1.13 2018/05/01 19:59:43 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROG= fc-cache
Index: src/external/mit/xorg/tools/makekeys/Makefile
diff -u src/external/mit/xorg/tools/makekeys/Makefile:1.6 src/external/mit/xorg/tools/makekeys/Makefile:1.7
--- src/external/mit/xorg/tools/makekeys/Makefile:1.6 Tue May 1 13:42:01 2018
+++ src/external/mit/xorg/tools/makekeys/Makefile Tue May 1 15:59:44 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2018/05/01 17:42:01 christos Exp $
+# $NetBSD: Makefile,v 1.7 2018/05/01 19:59:44 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
.PATH: ${X11SRCDIR.X11}/src/util
Index: src/external/mit/xorg/tools/makestrs/Makefile
diff -u src/external/mit/xorg/tools/makestrs/Makefile:1.5 src/external/mit/xorg/tools/makestrs/Makefile:1.6
--- src/external/mit/xorg/tools/makestrs/Makefile:1.5 Tue May 1 13:42:01 2018
+++ src/external/mit/xorg/tools/makestrs/Makefile Tue May 1 15:59:44 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2018/05/01 17:42:01 christos Exp $
+# $NetBSD: Makefile,v 1.6 2018/05/01 19:59:44 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
.PATH: ${X11SRCDIR.Xt}/util
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.9 src/external/mit/xorg/tools/mkfontscale/Makefile:1.10
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.9 Tue May 1 13:42:01 2018
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Tue May 1 15:59:44 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2018/05/01 17:42:01 christos Exp $
+# $NetBSD: Makefile,v 1.10 2018/05/01 19:59:44 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROG= mkfontscale
Index: src/external/mit/xorg/tools/ucs2any/Makefile
diff -u src/external/mit/xorg/tools/ucs2any/Makefile:1.3 src/external/mit/xorg/tools/ucs2any/Makefile:1.4
--- src/external/mit/xorg/tools/ucs2any/Makefile:1.3 Tue May 1 13:42:01 2018
+++ src/external/mit/xorg/tools/ucs2any/Makefile Tue May 1 15:59:44 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2018/05/01 17:42:01 christos Exp $
+# $NetBSD: Makefile,v 1.4 2018/05/01 19:59:44 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROG= ucs2any
.PATH: ${X11SRCDIR.font-util}
Index: src/games/boggle/mkdict/Makefile
diff -u src/games/boggle/mkdict/Makefile:1.12 src/games/boggle/mkdict/Makefile:1.13
--- src/games/boggle/mkdict/Makefile:1.12 Wed Sep 18 02:16:40 2002
+++ src/games/boggle/mkdict/Makefile Tue May 1 15:59:44 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2002/09/18 06:16:40 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2018/05/01 19:59:44 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/11/93
-NOMAN= # defined
+.include <bsd.hostinit.mk>
HOSTPROG= mkdict
HOST_CPPFLAGS+= -I${.CURDIR}/../boggle
Index: src/games/boggle/mkindex/Makefile
diff -u src/games/boggle/mkindex/Makefile:1.10 src/games/boggle/mkindex/Makefile:1.11
--- src/games/boggle/mkindex/Makefile:1.10 Wed Sep 18 02:16:40 2002
+++ src/games/boggle/mkindex/Makefile Tue May 1 15:59:44 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2002/09/18 06:16:40 lukem Exp $
+# $NetBSD: Makefile,v 1.11 2018/05/01 19:59:44 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/11/93
-NOMAN= # defined
+.include <bsd.hostinit.mk>
HOSTPROG= mkindex
HOST_CPPFLAGS+= -I${.CURDIR}/../boggle
Index: src/sys/arch/amiga/stand/loadkmap/din/Makefile
diff -u src/sys/arch/amiga/stand/loadkmap/din/Makefile:1.7 src/sys/arch/amiga/stand/loadkmap/din/Makefile:1.8
--- src/sys/arch/amiga/stand/loadkmap/din/Makefile:1.7 Tue Dec 11 20:49:35 2001
+++ src/sys/arch/amiga/stand/loadkmap/din/Makefile Tue May 1 15:59:44 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2001/12/12 01:49:35 tv Exp $
+# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:44 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG= din-kbdmap
NOMAN= # defined
Index: src/sys/arch/amiga/stand/loadkmap/es/Makefile
diff -u src/sys/arch/amiga/stand/loadkmap/es/Makefile:1.4 src/sys/arch/amiga/stand/loadkmap/es/Makefile:1.5
--- src/sys/arch/amiga/stand/loadkmap/es/Makefile:1.4 Tue Dec 11 20:49:35 2001
+++ src/sys/arch/amiga/stand/loadkmap/es/Makefile Tue May 1 15:59:44 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2001/12/12 01:49:35 tv Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:44 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG= es-kbdmap
NOMAN= # defined
Index: src/sys/arch/amiga/stand/loadkmap/fr/Makefile
diff -u src/sys/arch/amiga/stand/loadkmap/fr/Makefile:1.4 src/sys/arch/amiga/stand/loadkmap/fr/Makefile:1.5
--- src/sys/arch/amiga/stand/loadkmap/fr/Makefile:1.4 Tue Dec 11 20:49:36 2001
+++ src/sys/arch/amiga/stand/loadkmap/fr/Makefile Tue May 1 15:59:44 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2001/12/12 01:49:36 tv Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:44 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG= fr-kbdmap
NOMAN= # defined
Index: src/sys/arch/amiga/stand/loadkmap/pl_din/Makefile
diff -u src/sys/arch/amiga/stand/loadkmap/pl_din/Makefile:1.1 src/sys/arch/amiga/stand/loadkmap/pl_din/Makefile:1.2
--- src/sys/arch/amiga/stand/loadkmap/pl_din/Makefile:1.1 Thu Apr 4 19:55:06 2002
+++ src/sys/arch/amiga/stand/loadkmap/pl_din/Makefile Tue May 1 15:59:44 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2002/04/05 00:55:06 heinz Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/01 19:59:44 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG= pl_din-kbdmap
NOMAN= # defined
Index: src/sys/arch/amiga/stand/loadkmap/pl_us/Makefile
diff -u src/sys/arch/amiga/stand/loadkmap/pl_us/Makefile:1.1 src/sys/arch/amiga/stand/loadkmap/pl_us/Makefile:1.2
--- src/sys/arch/amiga/stand/loadkmap/pl_us/Makefile:1.1 Thu Apr 4 19:55:07 2002
+++ src/sys/arch/amiga/stand/loadkmap/pl_us/Makefile Tue May 1 15:59:44 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2002/04/05 00:55:07 heinz Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/01 19:59:44 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG= pl_us-kbdmap
NOMAN= # defined
Index: src/sys/arch/amiga/stand/loadkmap/sw/Makefile
diff -u src/sys/arch/amiga/stand/loadkmap/sw/Makefile:1.8 src/sys/arch/amiga/stand/loadkmap/sw/Makefile:1.9
--- src/sys/arch/amiga/stand/loadkmap/sw/Makefile:1.8 Tue Dec 11 20:49:36 2001
+++ src/sys/arch/amiga/stand/loadkmap/sw/Makefile Tue May 1 15:59:45 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2001/12/12 01:49:36 tv Exp $
+# $NetBSD: Makefile,v 1.9 2018/05/01 19:59:45 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG= sw-kbdmap
NOMAN= # defined
Index: src/sys/arch/amiga/stand/loadkmap/us/Makefile
diff -u src/sys/arch/amiga/stand/loadkmap/us/Makefile:1.7 src/sys/arch/amiga/stand/loadkmap/us/Makefile:1.8
--- src/sys/arch/amiga/stand/loadkmap/us/Makefile:1.7 Tue Dec 11 20:49:36 2001
+++ src/sys/arch/amiga/stand/loadkmap/us/Makefile Tue May 1 15:59:45 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2001/12/12 01:49:36 tv Exp $
+# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:45 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG= us-kbdmap
NOMAN= # defined
Index: src/sys/arch/atari/stand/keymaps/de/Makefile
diff -u src/sys/arch/atari/stand/keymaps/de/Makefile:1.2 src/sys/arch/atari/stand/keymaps/de/Makefile:1.3
--- src/sys/arch/atari/stand/keymaps/de/Makefile:1.2 Mon Apr 15 13:27:34 2002
+++ src/sys/arch/atari/stand/keymaps/de/Makefile Tue May 1 15:59:45 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2002/04/15 17:27:34 bjh21 Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:45 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG=de-kbdmap
MAP=de.map
Index: src/sys/arch/atari/stand/keymaps/fr/Makefile
diff -u src/sys/arch/atari/stand/keymaps/fr/Makefile:1.2 src/sys/arch/atari/stand/keymaps/fr/Makefile:1.3
--- src/sys/arch/atari/stand/keymaps/fr/Makefile:1.2 Mon Apr 15 13:27:34 2002
+++ src/sys/arch/atari/stand/keymaps/fr/Makefile Tue May 1 15:59:45 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2002/04/15 17:27:34 bjh21 Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:45 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG=fr-kbdmap
MAP=fr.map
Index: src/sys/arch/atari/stand/keymaps/uk/Makefile
diff -u src/sys/arch/atari/stand/keymaps/uk/Makefile:1.2 src/sys/arch/atari/stand/keymaps/uk/Makefile:1.3
--- src/sys/arch/atari/stand/keymaps/uk/Makefile:1.2 Mon Apr 15 13:27:34 2002
+++ src/sys/arch/atari/stand/keymaps/uk/Makefile Tue May 1 15:59:45 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2002/04/15 17:27:34 bjh21 Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:45 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG=uk-kbdmap
MAP=uk.map
Index: src/sys/arch/atari/stand/keymaps/us/Makefile
diff -u src/sys/arch/atari/stand/keymaps/us/Makefile:1.2 src/sys/arch/atari/stand/keymaps/us/Makefile:1.3
--- src/sys/arch/atari/stand/keymaps/us/Makefile:1.2 Mon Apr 15 13:27:34 2002
+++ src/sys/arch/atari/stand/keymaps/us/Makefile Tue May 1 15:59:45 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2002/04/15 17:27:34 bjh21 Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:45 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG=us-kbdmap
MAP=us.map
Index: src/sys/arch/i386/stand/genprom/Makefile
diff -u src/sys/arch/i386/stand/genprom/Makefile:1.6 src/sys/arch/i386/stand/genprom/Makefile:1.7
--- src/sys/arch/i386/stand/genprom/Makefile:1.6 Sun Feb 17 15:03:10 2002
+++ src/sys/arch/i386/stand/genprom/Makefile Tue May 1 15:59:45 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2002/02/17 20:03:10 thorpej Exp $
+# $NetBSD: Makefile,v 1.7 2018/05/01 19:59:45 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG= genprom
NOMAN= # defined
Index: src/sys/arch/i386/stand/misc/Makefile
diff -u src/sys/arch/i386/stand/misc/Makefile:1.7 src/sys/arch/i386/stand/misc/Makefile:1.8
--- src/sys/arch/i386/stand/misc/Makefile:1.7 Wed Oct 27 14:29:46 2010
+++ src/sys/arch/i386/stand/misc/Makefile Tue May 1 15:59:45 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2010/10/27 18:29:46 martin Exp $
+# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:45 christos Exp $
+
+.include <bsd.hostinit.mk>
MISC_FILES= rawrite.c
UUDECODE_FILES= pfdisk.doc pfdisk.exe pfdisktc.zip \
Index: src/sys/arch/macppc/stand/fixcoff/Makefile
diff -u src/sys/arch/macppc/stand/fixcoff/Makefile:1.9 src/sys/arch/macppc/stand/fixcoff/Makefile:1.10
--- src/sys/arch/macppc/stand/fixcoff/Makefile:1.9 Fri Sep 15 20:57:49 2006
+++ src/sys/arch/macppc/stand/fixcoff/Makefile Tue May 1 15:59:45 2018
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2006/09/16 00:57:49 uwe Exp $
-
-NOMAN= # defined
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.10 2018/05/01 19:59:45 christos Exp $
.if ${USETOOLS} == "yes"
+.include <bsd.init.mk>
PROG= fixcoff
.include <bsd.prog.mk>
.else
+.include <bsd.hostinit.mk>
HOSTPROG= fixcoff
.include <bsd.hostprog.mk>
.endif
Index: src/sys/arch/mvme68k/stand/wrtvid/Makefile
diff -u src/sys/arch/mvme68k/stand/wrtvid/Makefile:1.11 src/sys/arch/mvme68k/stand/wrtvid/Makefile:1.12
--- src/sys/arch/mvme68k/stand/wrtvid/Makefile:1.11 Wed Jan 23 16:06:28 2002
+++ src/sys/arch/mvme68k/stand/wrtvid/Makefile Tue May 1 15:59:45 2018
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2002/01/23 21:06:28 scw Exp $
+# $NetBSD: Makefile,v 1.12 2018/05/01 19:59:45 christos Exp $
S=${.CURDIR}/../../../../
+.include <bsd.hostinit.mk>
+
HOSTPROG= wrtvid
-NOMAN=
# only needed during build
proginstall::
Index: src/sys/arch/x68k/stand/aout2hux/Makefile
diff -u src/sys/arch/x68k/stand/aout2hux/Makefile:1.4 src/sys/arch/x68k/stand/aout2hux/Makefile:1.5
--- src/sys/arch/x68k/stand/aout2hux/Makefile:1.4 Tue Dec 11 20:49:55 2001
+++ src/sys/arch/x68k/stand/aout2hux/Makefile Tue May 1 15:59:45 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2001/12/12 01:49:55 tv Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:45 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG= aout2hux
NOMAN= # defined
Index: src/tools/Makefile.host
diff -u src/tools/Makefile.host:1.32 src/tools/Makefile.host:1.33
--- src/tools/Makefile.host:1.32 Mon Apr 30 20:04:34 2018
+++ src/tools/Makefile.host Tue May 1 15:59:46 2018
@@ -1,11 +1,6 @@
-# $NetBSD: Makefile.host,v 1.32 2018/05/01 00:04:34 christos Exp $
+# $NetBSD: Makefile.host,v 1.33 2018/05/01 19:59:46 christos Exp $
-NOINFO= # defined
-NOLINT= # defined
-NOMAN= # defined
-MKREPRO=no # Native toolchain might be unable to do it
-
-.include <bsd.own.mk>
+.include <bsd.hostinit.mk>
.ifndef NOCOMPATLIB
# Use TOOLDIR copy of libnbcompat and associated *.h files
Index: src/tools/binstall/Makefile
diff -u src/tools/binstall/Makefile:1.13 src/tools/binstall/Makefile:1.14
--- src/tools/binstall/Makefile:1.13 Tue May 1 08:38:39 2018
+++ src/tools/binstall/Makefile Tue May 1 15:59:46 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2018/05/01 12:38:39 christos Exp $
+# $NetBSD: Makefile,v 1.14 2018/05/01 19:59:46 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-install
HOST_SRCDIR= usr.bin/xinstall
Index: src/tools/binutils/Makefile
diff -u src/tools/binutils/Makefile:1.27 src/tools/binutils/Makefile:1.28
--- src/tools/binutils/Makefile:1.27 Mon Apr 30 20:04:34 2018
+++ src/tools/binutils/Makefile Tue May 1 15:59:46 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2018/05/01 00:04:34 christos Exp $
+# $NetBSD: Makefile,v 1.28 2018/05/01 19:59:46 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
MODULE= binutils
Index: src/tools/compat/Makefile
diff -u src/tools/compat/Makefile:1.82 src/tools/compat/Makefile:1.83
--- src/tools/compat/Makefile:1.82 Mon Apr 30 20:04:35 2018
+++ src/tools/compat/Makefile Tue May 1 15:59:46 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.82 2018/05/01 00:04:35 christos Exp $
+# $NetBSD: Makefile,v 1.83 2018/05/01 19:59:46 christos Exp $
HOSTLIB= nbcompat
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
SRCS= atoll.c basename.c cdbr.c cdbw.c dirname.c \
dprintf.c fgetln.c flock.c fparseln.c fpurge.c \
Index: src/tools/ctfconvert/Makefile
diff -u src/tools/ctfconvert/Makefile:1.8 src/tools/ctfconvert/Makefile:1.9
--- src/tools/ctfconvert/Makefile:1.8 Tue May 1 08:38:39 2018
+++ src/tools/ctfconvert/Makefile Tue May 1 15:59:46 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2018/05/01 12:38:39 christos Exp $
+# $NetBSD: Makefile,v 1.9 2018/05/01 19:59:46 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROGNAME= ${_TOOL_PREFIX}ctfconvert
HOST_SRCDIR= external/cddl/osnet/usr.bin/ctfconvert
Index: src/tools/ctfmerge/Makefile
diff -u src/tools/ctfmerge/Makefile:1.9 src/tools/ctfmerge/Makefile:1.10
--- src/tools/ctfmerge/Makefile:1.9 Tue May 1 08:38:39 2018
+++ src/tools/ctfmerge/Makefile Tue May 1 15:59:46 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2018/05/01 12:38:39 christos Exp $
+# $NetBSD: Makefile,v 1.10 2018/05/01 19:59:46 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROGNAME= ${_TOOL_PREFIX}ctfmerge
HOST_SRCDIR= external/cddl/osnet/usr.bin/ctfmerge
Index: src/tools/cvslatest/Makefile
diff -u src/tools/cvslatest/Makefile:1.3 src/tools/cvslatest/Makefile:1.4
--- src/tools/cvslatest/Makefile:1.3 Tue May 1 08:38:39 2018
+++ src/tools/cvslatest/Makefile Tue May 1 15:59:46 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2018/05/01 12:38:39 christos Exp $
+# $NetBSD: Makefile,v 1.4 2018/05/01 19:59:46 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROGNAME= ${_TOOL_PREFIX}cvslatest
HOST_SRCDIR= usr.bin/cvslatest
Index: src/tools/dbsym/Makefile
diff -u src/tools/dbsym/Makefile:1.14 src/tools/dbsym/Makefile:1.15
--- src/tools/dbsym/Makefile:1.14 Tue May 1 08:38:39 2018
+++ src/tools/dbsym/Makefile Tue May 1 15:59:46 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2018/05/01 12:38:39 christos Exp $
+# $NetBSD: Makefile,v 1.15 2018/05/01 19:59:46 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-dbsym
Index: src/tools/dtc/Makefile
diff -u src/tools/dtc/Makefile:1.4 src/tools/dtc/Makefile:1.5
--- src/tools/dtc/Makefile:1.4 Tue May 1 08:38:39 2018
+++ src/tools/dtc/Makefile Tue May 1 15:59:46 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/05/01 12:38:39 christos Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:46 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
LIBFDT_DIR= ${.CURDIR}/../../sys/external/bsd/libfdt/dist
HOST_CPPFLAGS+= -I${LIBFDT_DIR}
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.85 src/tools/gcc/Makefile:1.86
--- src/tools/gcc/Makefile:1.85 Mon Apr 30 20:04:35 2018
+++ src/tools/gcc/Makefile Tue May 1 15:59:46 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.85 2018/05/01 00:04:35 christos Exp $
+# $NetBSD: Makefile,v 1.86 2018/05/01 19:59:46 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
GCC_LANGUAGES=c c++ objc
MODULE= gcc4
Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.35 src/tools/gdb/Makefile:1.36
--- src/tools/gdb/Makefile:1.35 Mon Apr 30 20:04:35 2018
+++ src/tools/gdb/Makefile Tue May 1 15:59:46 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2018/05/01 00:04:35 christos Exp $
+# $NetBSD: Makefile,v 1.36 2018/05/01 19:59:46 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
MODULE= gdb
GDBDIR= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GDB_SUBDIR}
Index: src/tools/genassym/Makefile
diff -u src/tools/genassym/Makefile:1.7 src/tools/genassym/Makefile:1.8
--- src/tools/genassym/Makefile:1.7 Mon Apr 30 20:04:35 2018
+++ src/tools/genassym/Makefile Tue May 1 15:59:46 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2018/05/01 00:04:35 christos Exp $
+# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:46 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
.PATH.sh: ${.CURDIR}/../../usr.bin/genassym
Index: src/tools/gettext/Makefile
diff -u src/tools/gettext/Makefile:1.7 src/tools/gettext/Makefile:1.8
--- src/tools/gettext/Makefile:1.7 Mon Apr 30 20:04:35 2018
+++ src/tools/gettext/Makefile Tue May 1 15:59:47 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2018/05/01 00:04:35 christos Exp $
+# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:47 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
MODULE= gettext
Index: src/tools/host-mkdep/Makefile
diff -u src/tools/host-mkdep/Makefile:1.12 src/tools/host-mkdep/Makefile:1.13
--- src/tools/host-mkdep/Makefile:1.12 Sun Dec 2 07:44:06 2012
+++ src/tools/host-mkdep/Makefile Tue May 1 15:59:47 2018
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2012/12/02 12:44:06 apb Exp $
+# $NetBSD: Makefile,v 1.13 2018/05/01 19:59:47 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG= host-mkdep
HOSTPROGNAME= ${_TOOL_PREFIX}host-mkdep
HOST_BINDIR= ${TOOLDIR}/bin
-NOMAN= # defined
SRCS= # empty
CLEANFILES+= config.cache config.log config.status host-mkdep
Index: src/tools/libctf/Makefile
diff -u src/tools/libctf/Makefile:1.7 src/tools/libctf/Makefile:1.8
--- src/tools/libctf/Makefile:1.7 Mon Apr 30 20:04:36 2018
+++ src/tools/libctf/Makefile Tue May 1 15:59:47 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2018/05/01 00:04:36 christos Exp $
+# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:47 christos Exp $
HOSTLIB= ctf
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
SRCS= ctf_create.c \
ctf_decl.c \
Index: src/tools/libdwarf/Makefile
diff -u src/tools/libdwarf/Makefile:1.8 src/tools/libdwarf/Makefile:1.9
--- src/tools/libdwarf/Makefile:1.8 Mon Apr 30 20:04:36 2018
+++ src/tools/libdwarf/Makefile Tue May 1 15:59:47 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2018/05/01 00:04:36 christos Exp $
+# $NetBSD: Makefile,v 1.9 2018/05/01 19:59:47 christos Exp $
HOSTLIB=dwarf
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
SRCS= \
dwarf_abbrev.c \
Index: src/tools/libelf/Makefile
diff -u src/tools/libelf/Makefile:1.9 src/tools/libelf/Makefile:1.10
--- src/tools/libelf/Makefile:1.9 Mon Apr 30 20:04:36 2018
+++ src/tools/libelf/Makefile Tue May 1 15:59:47 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2018/05/01 00:04:36 christos Exp $
+# $NetBSD: Makefile,v 1.10 2018/05/01 19:59:47 christos Exp $
HOSTLIB= elf
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
SRCS= elf_begin.c \
elf_cntl.c \
Index: src/tools/libfdt/Makefile
diff -u src/tools/libfdt/Makefile:1.3 src/tools/libfdt/Makefile:1.4
--- src/tools/libfdt/Makefile:1.3 Mon Apr 30 20:04:36 2018
+++ src/tools/libfdt/Makefile Tue May 1 15:59:47 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2018/05/01 00:04:36 christos Exp $
+# $NetBSD: Makefile,v 1.4 2018/05/01 19:59:47 christos Exp $
HOSTLIB= fdt
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
LIBFDT_DIR= ${.CURDIR}/../../sys/external/bsd/libfdt/dist
Index: src/tools/llvm/Makefile
diff -u src/tools/llvm/Makefile:1.21 src/tools/llvm/Makefile:1.22
--- src/tools/llvm/Makefile:1.21 Wed Jan 11 07:08:34 2017
+++ src/tools/llvm/Makefile Tue May 1 15:59:47 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2017/01/11 12:08:34 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2018/05/01 19:59:47 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
#
# Do *not* set HOSTPROG or HOSTLIB at this point otherwise
Index: src/tools/llvm-lib/Makefile
diff -u src/tools/llvm-lib/Makefile:1.2 src/tools/llvm-lib/Makefile:1.3
--- src/tools/llvm-lib/Makefile:1.2 Tue Jul 5 13:15:51 2011
+++ src/tools/llvm-lib/Makefile Tue May 1 15:59:47 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2011/07/05 17:15:51 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:47 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
NO_LLVM_DEVELOPER= yes
Index: src/tools/lorder/Makefile
diff -u src/tools/lorder/Makefile:1.13 src/tools/lorder/Makefile:1.14
--- src/tools/lorder/Makefile:1.13 Mon Apr 30 20:04:36 2018
+++ src/tools/lorder/Makefile Tue May 1 15:59:47 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2018/05/01 00:04:36 christos Exp $
+# $NetBSD: Makefile,v 1.14 2018/05/01 19:59:47 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
.-include "${TOOLDIR}/share/compat/defs.mk"
Index: src/tools/mandoc/Makefile
diff -u src/tools/mandoc/Makefile:1.12 src/tools/mandoc/Makefile:1.13
--- src/tools/mandoc/Makefile:1.12 Tue May 1 08:38:40 2018
+++ src/tools/mandoc/Makefile Tue May 1 15:59:47 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2018/05/01 12:38:40 christos Exp $
+# $NetBSD: Makefile,v 1.13 2018/05/01 19:59:47 christos Exp $
HOSTPROGNAME= ${_TOOL_PREFIX}mandoc
HOST_SRCDIR= external/bsd/mdocml/bin/mandoc
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
NETBSD_MINOR!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -n
NETBSD_OSNAME= "NetBSD ${NETBSD_MINOR}"
Index: src/tools/mdsetimage/Makefile
diff -u src/tools/mdsetimage/Makefile:1.16 src/tools/mdsetimage/Makefile:1.17
--- src/tools/mdsetimage/Makefile:1.16 Tue May 1 08:38:40 2018
+++ src/tools/mdsetimage/Makefile Tue May 1 15:59:47 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2018/05/01 12:38:40 christos Exp $
+# $NetBSD: Makefile,v 1.17 2018/05/01 19:59:47 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-mdsetimage
Index: src/usr.sbin/bta2dpd/cosdata-gen/Makefile
diff -u src/usr.sbin/bta2dpd/cosdata-gen/Makefile:1.1 src/usr.sbin/bta2dpd/cosdata-gen/Makefile:1.2
--- src/usr.sbin/bta2dpd/cosdata-gen/Makefile:1.1 Sat Jan 28 11:55:54 2017
+++ src/usr.sbin/bta2dpd/cosdata-gen/Makefile Tue May 1 15:59:48 2018
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2017/01/28 16:55:54 nat Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/01 19:59:48 christos Exp $
WARNS?= 6
+.include <bsd.hostinit.mk>
+
HOSTPROG= cosdata
MAN=
Index: src/usr.sbin/bta2dpd/sbc_crc-gen/Makefile
diff -u src/usr.sbin/bta2dpd/sbc_crc-gen/Makefile:1.1 src/usr.sbin/bta2dpd/sbc_crc-gen/Makefile:1.2
--- src/usr.sbin/bta2dpd/sbc_crc-gen/Makefile:1.1 Sat Jan 28 11:55:54 2017
+++ src/usr.sbin/bta2dpd/sbc_crc-gen/Makefile Tue May 1 15:59:48 2018
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2017/01/28 16:55:54 nat Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/01 19:59:48 christos Exp $
WARNS?= 6
+.include <bsd.hostinit.mk>
+
HOSTPROG= sbc_crc
-MAN=
.include <bsd.hostprog.mk>
Added files:
Index: src/share/mk/bsd.hostinit.mk
diff -u /dev/null src/share/mk/bsd.hostinit.mk:1.1
--- /dev/null Tue May 1 15:59:48 2018
+++ src/share/mk/bsd.hostinit.mk Tue May 1 15:59:44 2018
@@ -0,0 +1,13 @@
+# $NetBSD: bsd.hostinit.mk,v 1.1 2018/05/01 19:59:44 christos Exp $
+
+.if !defined(_BSD_HOSTINIT_MK_)
+_BSD_HOSTINIT_MK_=1
+
+NOINFO= # defined
+NOLINT= # defined
+NOMAN= # defined
+MKREPRO=no # Native toolchain might be unable to do it
+
+.include <bsd.init.mk>
+
+.endif # !defined(_BSD_HOSTINIT_MK_)
