svn commit: r502263 - head/textproc/groff

[Kubilay Kocak]

Author: koobs
Date: Wed May 22 09:34:50 2019
New Revision: 502263
URL: https://svnweb.freebsd.org/changeset/ports/502263

Log:
  textproc/groff: Fix build/packaging with URWFONTS disabled
  
  With URWFONTS disabled, the groff build fails:
  
  pdfroff: installation problem: cannot find GhostScript interpreter
  
  *** FATAL INSTALLATION ERROR ***
  
  'pdfroff' requires a GhostScript interpreter to convert PostScript to PDF.
  Since you do not appear to have one installed, 'pdfroff' connot continue.
  
  This change provides configure with a more explicit argument to disable
  ghostscript, vs the CONFIGURE_ENV method [1] introduced in ports 499077
  after ports r499075 introduced the option.
  
  Update pkg-plist to mark files not conditional on this option.
  
  PR:		237615
  Submitted by:	<fullermd over-yonder net> [1]
  Approved by:	portmgr (blanket: build fix, just fix it)
  MFH:		no (not affected)

Modified:
  head/textproc/groff/Makefile
  head/textproc/groff/pkg-plist

Modified: head/textproc/groff/Makefile
==============================================================================
--- head/textproc/groff/Makefile	Wed May 22 09:01:39 2019	(r502262)
+++ head/textproc/groff/Makefile	Wed May 22 09:34:50 2019	(r502263)
@@ -3,7 +3,7 @@
 
 PORTNAME=	groff
 PORTVERSION=	1.22.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 
@@ -56,10 +56,9 @@ DATADIR=	${PREFIX}/share/${PORTNAME}/${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 EXAMPLESDIR=	${DOCSDIR}/examples
 
-URWFONTS_CONFIGURE_OFF=	--without-urw-fonts-dir
+URWFONTS_CONFIGURE_OFF= --without-urw-fonts-dir --without-gs
 URWFONTS_USES=	ghostscript:build
 URWFONTS_BUILD_DEPENDS=	gsfonts>=0:print/gsfonts
-URWFONTS_CONFIGURE_ENV_OFF=	ac_cv_prog_ac_ct_GHOSTSCRIPT=false
 OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>

Modified: head/textproc/groff/pkg-plist
==============================================================================
--- head/textproc/groff/pkg-plist	Wed May 22 09:01:39 2019	(r502262)
+++ head/textproc/groff/pkg-plist	Wed May 22 09:34:50 2019	(r502263)
@@ -216,16 +216,16 @@ man/man7/roff.7.gz
 %%EXAMPLESDIR%%/mom/elvis_syntax
 %%EXAMPLESDIR%%/mom/elvis_syntax.new
 %%EXAMPLESDIR%%/mom/letter.mom
-%%EXAMPLESDIR%%/mom/letter.pdf
+%%URWFONTS%%%%EXAMPLESDIR%%/mom/letter.pdf
 %%EXAMPLESDIR%%/mom/mom-pdf.mom
-%%EXAMPLESDIR%%/mom/mom-pdf.pdf
+%%URWFONTS%%%%EXAMPLESDIR%%/mom/mom-pdf.pdf
 %%EXAMPLESDIR%%/mom/mom.vim
 %%EXAMPLESDIR%%/mom/penguin.pdf
 %%EXAMPLESDIR%%/mom/penguin.ps
 %%EXAMPLESDIR%%/mom/sample_docs.mom
-%%EXAMPLESDIR%%/mom/sample_docs.pdf
+%%URWFONTS%%%%EXAMPLESDIR%%/mom/sample_docs.pdf
 %%EXAMPLESDIR%%/mom/typesetting.mom
-%%EXAMPLESDIR%%/mom/typesetting.pdf
+%%URWFONTS%%%%EXAMPLESDIR%%/mom/typesetting.pdf
 %%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-1.html
 %%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-10.html
 %%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-11.html
@@ -349,8 +349,8 @@ man/man7/roff.7.gz
 %%DOCSDIR%%/meintro_fr.ps
 %%DOCSDIR%%/meref.me
 %%DOCSDIR%%/meref.ps
-%%DOCSDIR%%/pdf/mom-pdf.pdf
-%%DOCSDIR%%/pdf/pdfmark.pdf
+%%URWFONTS%%%%DOCSDIR%%/pdf/mom-pdf.pdf
+%%URWFONTS%%%%DOCSDIR%%/pdf/pdfmark.pdf
 %%DOCSDIR%%/pic.ms
 %%DOCSDIR%%/pic.ps
 %%DATADIR%%/eign