svn commit: r532494 - in head/misc/freebsd-doc-en: . files

[Matthias Andree]

Author: mandree
Date: Wed Apr 22 18:14:26 2020
New Revision: 532494
URL: https://svnweb.freebsd.org/changeset/ports/532494

Log:
  Fix docs build that is broken on some systems.
  
  Apparently, changes in the docproj toolchain sensitivized ps2epsi.ps
  (ghostscript) against paper size mismatches in some circumstances.
  Set the paper size consistently to A4 for PIC2PS (groff), PS2EPS (gs),
  PS2BBOX (also gs). [1]
  
  While here, blank DISPLAY so that the textproc/fop tool can make progress
  if the DISPLAY isn't working (stalled ssh forward, xauth broken, whatever).
  
  Remove MAKE_JOBS_UNSAFE, this was brought in in an attempt to fix the
  build issues which turned out to be blank gs (Ghostscript) output rather
  than broken dependencies in the Makefiles.
  
  PR:		234126
  PR:		234127 (duplicate of 234126)
  Submitted by:	fluffy at FreeBSD.org [1]
  Reported by:	ohartmann at walstatt.org
  Reviewed by:	driesm.michiels at gmail.com
  Approved by:	maintainer timeout (doceng@, 15 days)

Added:
  head/misc/freebsd-doc-en/files/
  head/misc/freebsd-doc-en/files/patch-share_mk_doc.commands.mk   (contents, props changed)
Modified:
  head/misc/freebsd-doc-en/Makefile

Modified: head/misc/freebsd-doc-en/Makefile
==============================================================================
--- head/misc/freebsd-doc-en/Makefile	Wed Apr 22 18:01:16 2020	(r532493)
+++ head/misc/freebsd-doc-en/Makefile	Wed Apr 22 18:14:26 2020	(r532494)
@@ -28,8 +28,8 @@ MAKE_ARGS=	FORMATS="${DOCFORMAT}" \
 		INSTALL_COMPRESSED= \
 		DOCDIR=${STAGEDIR}${PREFIX}/${DOCBASE} \
 		DOCOWN=${SHAREOWN} \
-		DOCGRP=${SHAREGRP}
-MAKE_JOBS_UNSAFE=	yes
+		DOCGRP=${SHAREGRP} \
+		DISPLAY=""
 NO_ARCH=	yes
 
 # To populate correctly the stage directory

Added: head/misc/freebsd-doc-en/files/patch-share_mk_doc.commands.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/freebsd-doc-en/files/patch-share_mk_doc.commands.mk	Wed Apr 22 18:14:26 2020	(r532494)
@@ -0,0 +1,21 @@
+--- share/mk/doc.commands.mk.orig	2020-03-21 12:09:18 UTC
++++ share/mk/doc.commands.mk
+@@ -139,15 +139,15 @@ PNMTOPSOPTS?=	-noturn ${PNMTOPSFLAGS}
+ EPSTOPDF?=	${PREFIX}/bin/epstopdf
+ EPSTOPDFOPTS?=	${EPSTOPDFFLAGS}
+ #
+-PIC2PS?=	${GROFF} -p -S -Wall -mtty-char -man
++PIC2PS?=	${GROFF} -p -P-pa4 -S -Wall -mtty-char -man
+ #
+ PS2EPS?=	${PREFIX}/bin/gs
+ PS2EPSOPTS?=	-q -dNOPAUSE -dSAFER -dDELAYSAFER \
+-		-sPAPERSIZE=letter -r72 -sDEVICE=bit \
++		-sPAPERSIZE=a4 -r72 -sDEVICE=bit \
+ 		-sOutputFile=/dev/null ${PS2EPSFLAGS} ps2epsi.ps
+ PS2BBOX?=	${PREFIX}/bin/gs
+ PS2BBOXOPTS?=	-q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \
+-		-sPAPERSIZE=letter -r72 -sDEVICE=bbox \
++		-sPAPERSIZE=a4 -r72 -sDEVICE=bbox \
+ 		-sOutputFile=/dev/null ${PS2BBOXFLAGS}
+ 
+ #