From owner-svn-ports-all@freebsd.org Wed Apr 22 18:14:27 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1F0CE2BCB54; Wed, 22 Apr 2020 18:14:27 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 496pVW01Jqz4bPL; Wed, 22 Apr 2020 18:14:27 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D23FE1EE44; Wed, 22 Apr 2020 18:14:26 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03MIEQPE050476; Wed, 22 Apr 2020 18:14:26 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03MIEQiB050475; Wed, 22 Apr 2020 18:14:26 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202004221814.03MIEQiB050475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Wed, 22 Apr 2020 18:14:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532494 - in head/misc/freebsd-doc-en: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head/misc/freebsd-doc-en: . files X-SVN-Commit-Revision: 532494 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2020 18:14:27 -0000 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@FreeBSD.org [1] Reported by: ohartmann@walstatt.org Reviewed by: driesm.michiels@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} + + #