Module Name: src
Committed By: martin
Date: Fri Jul 27 10:54:21 UTC 2018
Modified Files:
src/external/mit/xorg/tools/mkfontscale [netbsd-8]: Makefile
src/share/mk [netbsd-8]: bsd.own.mk
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.8.1 src/external/mit/xorg/tools/mkfontscale/Makefile
cvs rdiff -u -r1.1009.2.5 -r1.1009.2.6 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.8 src/external/mit/xorg/tools/mkfontscale/Makefile:1.8.8.1
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.8 Sun Feb 28 22:12:26 2016
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Fri Jul 27 10:54:21 2018
@@ -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 @@ LDADD= -lz
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
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1009.2.5 src/share/mk/bsd.own.mk:1.1009.2.6
--- src/share/mk/bsd.own.mk:1.1009.2.5 Thu Apr 12 01:38:59 2018
+++ src/share/mk/bsd.own.mk Fri Jul 27 10:54:21 2018
@@ -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 @@ TOOL_GPT= ${TOOLDIR}/bin/${_TOOL_PREFIX
# 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_PKG_CREATE= ${TOOLDIR}/bin/${_TOOL_
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_REFER= refer
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 @@ MKDYNAMICROOT= no
.if defined(MKREPRO)
MKARZERO ?= ${MKREPRO}
+GROFF_FLAGS ?= -dpaper=letter
+ROFF_PAGESIZE ?= -P-pletter
.endif
#
