[src/trunk]: src/external/mit/xorg/tools Apply the same fixes fr...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cbf78640bf17
branches:  trunk
changeset: 318621:cbf78640bf17
user:      christos <christos%NetBSD.org@localhost>
date:      Tue May 01 17:42:00 2018 +0000
description:
Apply the same fixes from the regular tools dir:

PR/53238: Robert Elz: Disable MKREPRO in tools; the host compiler might
not support the necessary options. This is done thusly:

1. Create Makefile.inc and set MKREPRO=no in it. Change the Makefiles that
   include bsd.own.mk, to include bsd.init.mk which includes Makefile.inc
   first. This will also allow us to control other tools options from a
   single location if we need to.
2. Centralize NOMAN handling.

XXX: pullup-8

diffstat:

 external/mit/xorg/tools/Makefile.inc         |  6 ++++++
 external/mit/xorg/tools/bdftopcf/Makefile    |  6 ++----
 external/mit/xorg/tools/fc-cache/Makefile    |  6 ++----
 external/mit/xorg/tools/makekeys/Makefile    |  6 ++----
 external/mit/xorg/tools/makestrs/Makefile    |  6 ++----
 external/mit/xorg/tools/mkfontscale/Makefile |  6 ++----
 external/mit/xorg/tools/ucs2any/Makefile     |  6 ++----
 7 files changed, 18 insertions(+), 24 deletions(-)

diffs (94 lines):

diff -r efc95b05eb7d -r cbf78640bf17 external/mit/xorg/tools/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/tools/Makefile.inc      Tue May 01 17:42:00 2018 +0000
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile.inc,v 1.1 2018/05/01 17:42:00 christos Exp $
+
+NOINFO=                # defined
+NOLINT=                # defined
+NOMAN=         # defined
+MKREPRO=no     # Native toolchain might be unable to do it
diff -r efc95b05eb7d -r cbf78640bf17 external/mit/xorg/tools/bdftopcf/Makefile
--- a/external/mit/xorg/tools/bdftopcf/Makefile Tue May 01 16:37:23 2018 +0000
+++ b/external/mit/xorg/tools/bdftopcf/Makefile Tue May 01 17:42:00 2018 +0000
@@ -1,8 +1,6 @@
-#      $NetBSD: Makefile,v 1.7 2018/03/11 11:01:07 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2018/05/01 17:42:00 christos Exp $
 
-NOMAN=         1
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 HOSTPROG=      bdftopcf
 .PATH:         ${X11SRCDIR.bdftopcf}
diff -r efc95b05eb7d -r cbf78640bf17 external/mit/xorg/tools/fc-cache/Makefile
--- a/external/mit/xorg/tools/fc-cache/Makefile Tue May 01 16:37:23 2018 +0000
+++ b/external/mit/xorg/tools/fc-cache/Makefile Tue May 01 17:42:00 2018 +0000
@@ -1,8 +1,6 @@
-#      $NetBSD: Makefile,v 1.11 2017/08/29 09:02:10 mrg Exp $
+#      $NetBSD: Makefile,v 1.12 2018/05/01 17:42:01 christos Exp $
 
-NOMAN=         1
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 HOSTPROG=      fc-cache
 
diff -r efc95b05eb7d -r cbf78640bf17 external/mit/xorg/tools/makekeys/Makefile
--- a/external/mit/xorg/tools/makekeys/Makefile Tue May 01 16:37:23 2018 +0000
+++ b/external/mit/xorg/tools/makekeys/Makefile Tue May 01 17:42:00 2018 +0000
@@ -1,8 +1,6 @@
-#      $NetBSD: Makefile,v 1.5 2018/03/14 23:41:05 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2018/05/01 17:42:01 christos Exp $
 
-NOMAN= 1
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 .PATH: ${X11SRCDIR.X11}/src/util
 
diff -r efc95b05eb7d -r cbf78640bf17 external/mit/xorg/tools/makestrs/Makefile
--- a/external/mit/xorg/tools/makestrs/Makefile Tue May 01 16:37:23 2018 +0000
+++ b/external/mit/xorg/tools/makestrs/Makefile Tue May 01 17:42:00 2018 +0000
@@ -1,8 +1,6 @@
-#      $NetBSD: Makefile,v 1.4 2015/06/24 22:20:26 matt Exp $
+#      $NetBSD: Makefile,v 1.5 2018/05/01 17:42:01 christos Exp $
 
-NOMAN= 1
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 .PATH: ${X11SRCDIR.Xt}/util
 
diff -r efc95b05eb7d -r cbf78640bf17 external/mit/xorg/tools/mkfontscale/Makefile
--- a/external/mit/xorg/tools/mkfontscale/Makefile      Tue May 01 16:37:23 2018 +0000
+++ b/external/mit/xorg/tools/mkfontscale/Makefile      Tue May 01 17:42:00 2018 +0000
@@ -1,8 +1,6 @@
-#      $NetBSD: Makefile,v 1.8 2016/02/28 22:12:26 riastradh Exp $
+#      $NetBSD: Makefile,v 1.9 2018/05/01 17:42:01 christos Exp $
 
-NOMAN=         1
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 HOSTPROG=      mkfontscale
 
diff -r efc95b05eb7d -r cbf78640bf17 external/mit/xorg/tools/ucs2any/Makefile
--- a/external/mit/xorg/tools/ucs2any/Makefile  Tue May 01 16:37:23 2018 +0000
+++ b/external/mit/xorg/tools/ucs2any/Makefile  Tue May 01 17:42:00 2018 +0000
@@ -1,8 +1,6 @@
-#      $NetBSD: Makefile,v 1.2 2008/09/13 21:37:07 hubertf Exp $
+#      $NetBSD: Makefile,v 1.3 2018/05/01 17:42:01 christos Exp $
 
-NOMAN=         1
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 HOSTPROG=      ucs2any
 .PATH:         ${X11SRCDIR.font-util}