Fix configure still detecting ghostscript if installed and URWFONTS disabled

Fix plist when URWFONTS is disabled

Reported by:	Zeus Panchenko <zeus@ibs.dn.ua>

2 files changed, 81 insertions, 81 deletions

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index ec7127c48eb3..8385307ec4cb 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -59,12 +59,13 @@ EXAMPLESDIR=	${DOCSDIR}/examples
 URWFONTS_CONFIGURE_OFF=	--without-urw-fonts-dir
 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>
 
 .if ! ${PORT_OPTIONS:MX11}
 CONFIGURE_ARGS+=--without-x
-PLIST_SUB+=	X11="@comment "
 .if exists(${LOCALBASE}/bin/pnmcut) && exists(${LOCALBASE}/bin/pnmcrop) && \
     exists(${LOCALBASE}/bin/pnmtops) && exists(${LOCALBASE}/bin/pnmtopng)
 PLIST_SUB+=	HTMLDOCS=""
@@ -76,7 +77,6 @@ USE_XORG=	x11 xaw xmu
 BUILD_DEPENDS+=	${LOCALBASE}/bin/pnmtops:graphics/netpbm
 RUN_DEPENDS+=	${LOCALBASE}/bin/pnmtops:graphics/netpbm
 CONFIGURE_ARGS+=--with-x --with-appresdir=${PREFIX}/lib/X11/app-defaults
-PLIST_SUB+=	X11=""
 PLIST_SUB+=	HTMLDOCS=""
 .endif
 
diff --git a/textproc/groff/pkg-plist b/textproc/groff/pkg-plist
index 6ab70ed2f4a4..982a13a43346 100644
--- a/textproc/groff/pkg-plist
+++ b/textproc/groff/pkg-plist
@@ -574,85 +574,85 @@ man/man7/roff.7.gz
 %%DATADIR%%/font/devlj4/generate/symbol.map
 %%DATADIR%%/font/devlj4/generate/text.map
 %%DATADIR%%/font/devlj4/generate/wingdings.map
-%%DATADIR%%/font/devpdf/AB
-%%DATADIR%%/font/devpdf/ABI
-%%DATADIR%%/font/devpdf/AI
-%%DATADIR%%/font/devpdf/AR
-%%DATADIR%%/font/devpdf/BMB
-%%DATADIR%%/font/devpdf/BMBI
-%%DATADIR%%/font/devpdf/BMI
-%%DATADIR%%/font/devpdf/BMR
-%%DATADIR%%/font/devpdf/CB
-%%DATADIR%%/font/devpdf/CBI
-%%DATADIR%%/font/devpdf/CI
-%%DATADIR%%/font/devpdf/CR
-%%DATADIR%%/font/devpdf/DESC
-%%DATADIR%%/font/devpdf/EURO
-%%DATADIR%%/font/devpdf/Foundry
-%%DATADIR%%/font/devpdf/HB
-%%DATADIR%%/font/devpdf/HBI
-%%DATADIR%%/font/devpdf/HI
-%%DATADIR%%/font/devpdf/HNB
-%%DATADIR%%/font/devpdf/HNBI
-%%DATADIR%%/font/devpdf/HNI
-%%DATADIR%%/font/devpdf/HNR
-%%DATADIR%%/font/devpdf/HR
-%%DATADIR%%/font/devpdf/NB
-%%DATADIR%%/font/devpdf/NBI
-%%DATADIR%%/font/devpdf/NI
-%%DATADIR%%/font/devpdf/NR
-%%DATADIR%%/font/devpdf/PB
-%%DATADIR%%/font/devpdf/PBI
-%%DATADIR%%/font/devpdf/PI
-%%DATADIR%%/font/devpdf/PR
-%%DATADIR%%/font/devpdf/S
-%%DATADIR%%/font/devpdf/TB
-%%DATADIR%%/font/devpdf/TBI
-%%DATADIR%%/font/devpdf/TI
-%%DATADIR%%/font/devpdf/TR
-%%DATADIR%%/font/devpdf/U-AB
-%%DATADIR%%/font/devpdf/U-ABI
-%%DATADIR%%/font/devpdf/U-AI
-%%DATADIR%%/font/devpdf/U-AR
-%%DATADIR%%/font/devpdf/U-BMB
-%%DATADIR%%/font/devpdf/U-BMBI
-%%DATADIR%%/font/devpdf/U-BMI
-%%DATADIR%%/font/devpdf/U-BMR
-%%DATADIR%%/font/devpdf/U-CB
-%%DATADIR%%/font/devpdf/U-CBI
-%%DATADIR%%/font/devpdf/U-CI
-%%DATADIR%%/font/devpdf/U-CR
-%%DATADIR%%/font/devpdf/U-HB
-%%DATADIR%%/font/devpdf/U-HBI
-%%DATADIR%%/font/devpdf/U-HI
-%%DATADIR%%/font/devpdf/U-HNB
-%%DATADIR%%/font/devpdf/U-HNBI
-%%DATADIR%%/font/devpdf/U-HNI
-%%DATADIR%%/font/devpdf/U-HNR
-%%DATADIR%%/font/devpdf/U-HR
-%%DATADIR%%/font/devpdf/U-NB
-%%DATADIR%%/font/devpdf/U-NBI
-%%DATADIR%%/font/devpdf/U-NI
-%%DATADIR%%/font/devpdf/U-NR
-%%DATADIR%%/font/devpdf/U-PB
-%%DATADIR%%/font/devpdf/U-PBI
-%%DATADIR%%/font/devpdf/U-PI
-%%DATADIR%%/font/devpdf/U-PR
-%%DATADIR%%/font/devpdf/U-S
-%%DATADIR%%/font/devpdf/U-TB
-%%DATADIR%%/font/devpdf/U-TBI
-%%DATADIR%%/font/devpdf/U-TI
-%%DATADIR%%/font/devpdf/U-TR
-%%DATADIR%%/font/devpdf/U-ZCMI
-%%DATADIR%%/font/devpdf/U-ZD
-%%DATADIR%%/font/devpdf/ZCMI
-%%DATADIR%%/font/devpdf/ZD
-%%DATADIR%%/font/devpdf/download
-%%DATADIR%%/font/devpdf/enc/text.enc
-%%DATADIR%%/font/devpdf/map/dingbats.map
-%%DATADIR%%/font/devpdf/map/symbolchars
-%%DATADIR%%/font/devpdf/map/symbolmap
-%%DATADIR%%/font/devpdf/map/textmap
+%%URWFONTS%%%%DATADIR%%/font/devpdf/AB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/ABI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/AI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/AR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/BMB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/BMBI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/BMI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/BMR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/CB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/CBI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/CI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/CR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/DESC
+%%URWFONTS%%%%DATADIR%%/font/devpdf/EURO
+%%URWFONTS%%%%DATADIR%%/font/devpdf/Foundry
+%%URWFONTS%%%%DATADIR%%/font/devpdf/HB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/HBI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/HI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/HNB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/HNBI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/HNI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/HNR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/HR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/NB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/NBI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/NI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/NR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/PB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/PBI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/PI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/PR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/S
+%%URWFONTS%%%%DATADIR%%/font/devpdf/TB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/TBI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/TI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/TR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-AB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-ABI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-AI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-AR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-BMB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-BMBI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-BMI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-BMR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-CB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-CBI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-CI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-CR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HBI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HNB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HNBI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HNI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HNR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-NB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-NBI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-NI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-NR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-PB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-PBI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-PI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-PR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-S
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-TB
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-TBI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-TI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-TR
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-ZCMI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/U-ZD
+%%URWFONTS%%%%DATADIR%%/font/devpdf/ZCMI
+%%URWFONTS%%%%DATADIR%%/font/devpdf/ZD
+%%URWFONTS%%%%DATADIR%%/font/devpdf/download
+%%URWFONTS%%%%DATADIR%%/font/devpdf/enc/text.enc
+%%URWFONTS%%%%DATADIR%%/font/devpdf/map/dingbats.map
+%%URWFONTS%%%%DATADIR%%/font/devpdf/map/symbolchars
+%%URWFONTS%%%%DATADIR%%/font/devpdf/map/symbolmap
+%%URWFONTS%%%%DATADIR%%/font/devpdf/map/textmap
 %%DATADIR%%/font/devps/AB
 %%DATADIR%%/font/devps/ABI
 %%DATADIR%%/font/devps/AI