[src/netbsd-8]: src Pull up following revision(s) (requested by christos in t...

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

details:   https://anonhg.NetBSD.org/src/rev/c169815efe64
branches:  netbsd-8
changeset: 324942:c169815efe64
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jul 27 10:54:21 2018 +0000

description:
Pull up following revision(s) (requested by christos in ticket #944):

        external/mit/xorg/tools/mkfontscale/Makefile: revision 1.13
        share/mk/bsd.own.mk: revision 1.1066

- Fix groff reproducibility:
    - specify mdoc and font paths
    - clear encoding
    - specify pagesize on the command line

XXX: pullup-8

Use the fonts from our installed directory not the system when we are a tool!
Martin found it.

XXX pullup-8

diffstat:

 external/mit/xorg/tools/mkfontscale/Makefile |   4 ++--
 share/mk/bsd.own.mk                          |  23 ++++++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diffs (80 lines):

diff -r cd0591b5f105 -r c169815efe64 external/mit/xorg/tools/mkfontscale/Makefile
--- a/external/mit/xorg/tools/mkfontscale/Makefile      Fri Jul 27 10:52:04 2018 +0000
+++ b/external/mit/xorg/tools/mkfontscale/Makefile      Fri Jul 27 10:54:21 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2016/02/28 22:12:26 riastradh Exp $
+#      $NetBSD: Makefile,v 1.8.8.1 2018/07/27 10:54:21 martin Exp $
 
 NOMAN=         1
 
@@ -83,7 +83,7 @@
 
 HOST_CPPFLAGS= -DFONTENC_NO_LIBFONT -DXFREE86_FT2 -DFONTENC_NO_LIBFONT \
                -DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON \
-               -DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\" \
+               -DFONT_ENCODINGS_DIRECTORY=\"${DESTDIR}${X11FONTDIR}/encodings/encodings.dir\" \
                -DPACKAGE_STRING=\"NetBSD\ tools\ version\"
 HOST_CPPFLAGS+=        -DFT_CONFIG_OPTION_DISABLE_BZIP2
 
diff -r cd0591b5f105 -r c169815efe64 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Fri Jul 27 10:52:04 2018 +0000
+++ b/share/mk/bsd.own.mk       Fri Jul 27 10:54:21 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1009.2.5 2018/04/12 01:38:59 msaitoh Exp $
+#      $NetBSD: bsd.own.mk,v 1.1009.2.6 2018/07/27 10:54:21 martin Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -366,7 +366,14 @@
 # grep exists in src/tools, but is not hooked up into the build.
 #TOOL_GREP=            ${TOOLDIR}/bin/${_TOOL_PREFIX}grep
 TOOL_GREP=             grep
-TOOL_GROFF=            PATH=${TOOLDIR}/lib/groff:$${PATH} ${TOOLDIR}/bin/${_TOOL_PREFIX}groff
+GROFF_SHARE_PATH=      ${TOOLDIR}/share/groff
+TOOL_GROFF_ENV= \
+    GROFF_ENCODING= \
+    GROFF_BIN_PATH=${TOOLDIR}/lib/groff \
+    GROFF_FONT_PATH=${GROFF_SHARE_PATH}/site-font:${GROFF_SHARE_PATH}/font \
+    GROFF_TMAC_PATH=${GROFF_SHARE_PATH}/site-tmac:${GROFF_SHARE_PATH}/tmac
+TOOL_GROFF=            ${TOOL_GROFF_ENV} ${TOOLDIR}/bin/${_TOOL_PREFIX}groff ${GROFF_FLAGS}
+
 TOOL_HEXDUMP=          ${TOOLDIR}/bin/${_TOOL_PREFIX}hexdump
 TOOL_HP300MKBOOT=      ${TOOLDIR}/bin/${_TOOL_PREFIX}hp300-mkboot
 TOOL_HPPAMKBOOT=       ${TOOLDIR}/bin/${_TOOL_PREFIX}hppa-mkboot
@@ -408,12 +415,12 @@
 TOOL_POWERPCMKBOOTIMAGE=${TOOLDIR}/bin/${_TOOL_PREFIX}powerpc-mkbootimage
 TOOL_PWD_MKDB=         ${TOOLDIR}/bin/${_TOOL_PREFIX}pwd_mkdb
 TOOL_REFER=            ${TOOLDIR}/bin/${_TOOL_PREFIX}refer
-TOOL_ROFF_ASCII=       PATH=${TOOLDIR}/lib/groff:$${PATH} ${TOOLDIR}/bin/${_TOOL_PREFIX}nroff
+TOOL_ROFF_ASCII=       ${TOOL_GROFF_ENV} ${TOOLDIR}/bin/${_TOOL_PREFIX}nroff
 TOOL_ROFF_DOCASCII=    ${TOOL_GROFF} -Tascii
 TOOL_ROFF_DOCHTML=     ${TOOL_GROFF} -Thtml
-TOOL_ROFF_DVI=         ${TOOL_GROFF} -Tdvi
+TOOL_ROFF_DVI=         ${TOOL_GROFF} -Tdvi ${ROFF_PAGESIZE}
 TOOL_ROFF_HTML=                ${TOOL_GROFF} -Tlatin1 -mdoc2html
-TOOL_ROFF_PS=          ${TOOL_GROFF} -Tps
+TOOL_ROFF_PS=          ${TOOL_GROFF} -Tps ${ROFF_PAGESIZE}
 TOOL_ROFF_RAW=         ${TOOL_GROFF} -Z
 TOOL_RPCGEN=           RPCGEN_CPP=${CPP:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}rpcgen
 TOOL_SED=              ${TOOLDIR}/bin/${_TOOL_PREFIX}sed
@@ -522,9 +529,9 @@
 TOOL_ROFF_ASCII=       nroff
 TOOL_ROFF_DOCASCII=    ${TOOL_GROFF} -Tascii
 TOOL_ROFF_DOCHTML=     ${TOOL_GROFF} -Thtml
-TOOL_ROFF_DVI=         ${TOOL_GROFF} -Tdvi
+TOOL_ROFF_DVI=         ${TOOL_GROFF} -Tdvi ${ROFF_PAGESIZE}
 TOOL_ROFF_HTML=                ${TOOL_GROFF} -Tlatin1 -mdoc2html
-TOOL_ROFF_PS=          ${TOOL_GROFF} -Tps
+TOOL_ROFF_PS=          ${TOOL_GROFF} -Tps ${ROFF_PAGESIZE}
 TOOL_ROFF_RAW=         ${TOOL_GROFF} -Z
 TOOL_RPCGEN=           rpcgen
 TOOL_SED=              sed
@@ -1085,6 +1092,8 @@
 
 .if defined(MKREPRO)
 MKARZERO ?= ${MKREPRO}
+GROFF_FLAGS ?= -dpaper=letter
+ROFF_PAGESIZE ?= -P-pletter
 .endif
 
 #