From 423102c6faf6de84c95d2bba2a049b6f8a339e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20Sp=C3=B6rlein?= Date: Tue, 22 Feb 2011 08:13:49 +0000 Subject: [PATCH] Flesh out WITHOUT_GROFF support to DTRT. A full featured groff is required during buildworld, so build it always and don't rely on it being present on the host system. vgrind(1) is tightly coupled to a roff processor and will not be built/installed when groff is disabled. Also much of the roff'ed documentation under share/doc will not be built/installed when WITHOUT_GROFF is defined. Reviewed by: ru (partial) --- Makefile.inc1 | 21 +- etc/Makefile | 3 + etc/mtree/BSD.groff.dist | 48 +++ etc/mtree/BSD.usr.dist | 38 -- etc/mtree/Makefile | 3 + share/doc/Makefile | 7 +- tools/build/mk/OptionalObsoleteFiles.inc | 489 ++++++++++++++++++++++- tools/build/options/WITHOUT_GROFF | 6 +- usr.bin/Makefile | 6 +- 9 files changed, 567 insertions(+), 54 deletions(-) create mode 100644 etc/mtree/BSD.groff.dist diff --git a/Makefile.inc1 b/Makefile.inc1 index de00716d6523..102f418633ee 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -213,13 +213,15 @@ BOOTSTRAPPING?= 0 CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \ MACHINE_ARCH=${TARGET_ARCH} \ MACHINE=${TARGET} \ - CPUTYPE=${TARGET_CPUTYPE} \ - GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ - GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ - GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac + CPUTYPE=${TARGET_CPUTYPE} .if ${OSRELDATE} < 700044 CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib .endif +.if ${MK_GROFF} != "no" +CROSSENV+= GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ + GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ + GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac +.endif # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -364,6 +366,10 @@ _worldtmp: .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${WORLDTMP}/legacy/usr >/dev/null +.if ${MK_GROFF} != "no" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.groff.dist \ + -p ${WORLDTMP}/legacy/usr >/dev/null +.endif mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${WORLDTMP}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ @@ -937,11 +943,10 @@ _strfile= games/fortune/strfile .if ${MK_CXX} != "no" _gperf= gnu/usr.bin/gperf -.if ${BOOTSTRAPPING} < 700004 -_groff= gnu/usr.bin/groff -.else -_groff= gnu/usr.bin/groff/tmac .endif + +.if ${MK_GROFF} != "no" +_groff= gnu/usr.bin/groff .endif .if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022 diff --git a/etc/Makefile b/etc/Makefile index 83bc50ae48e6..e7fa2d553806 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -271,6 +271,9 @@ distrib-dirs: mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \ -p ${DESTDIR}/var/named .endif +.if ${MK_GROFF} != "no" + mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.groff.dist -p ${DESTDIR}/usr +.endif .if ${MK_SENDMAIL} != "no" mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/ .endif diff --git a/etc/mtree/BSD.groff.dist b/etc/mtree/BSD.groff.dist new file mode 100644 index 000000000000..3f2137535b7e --- /dev/null +++ b/etc/mtree/BSD.groff.dist @@ -0,0 +1,48 @@ +# $FreeBSD$ +# +# Please see the file src/etc/mtree/README before making changes to this file. +# + +/set type=dir uname=root gname=wheel mode=0755 +. + share + groff_font + devX100 + .. + devX100-12 + .. + devX75 + .. + devX75-12 + .. + devascii + .. + devcp1047 + .. + devdvi + .. + devhtml + .. + devkoi8-r + .. + devlatin1 + .. + devlbp + .. + devlj4 + .. + devps + .. + devutf8 + .. + .. + me + .. + tmac + mdoc + .. + mm + .. + .. + .. +.. diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 07d69f26b480..1f8edf03028c 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -310,36 +310,6 @@ fortune .. .. - groff_font - devX100 - .. - devX100-12 - .. - devX75 - .. - devX75-12 - .. - devascii - .. - devcp1047 - .. - devdvi - .. - devhtml - .. - devkoi8-r - .. - devlatin1 - .. - devlbp - .. - devlj4 - .. - devps - .. - devutf8 - .. - .. info .. locale @@ -890,8 +860,6 @@ man9 .. .. - me - .. misc fonts .. @@ -1266,12 +1234,6 @@ .. tabset .. - tmac - mdoc - .. - mm - .. - .. vi catalog .. diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile index 3090ffb2adf3..15da1bf41058 100644 --- a/etc/mtree/Makefile +++ b/etc/mtree/Makefile @@ -16,6 +16,9 @@ _BIND.chroot.dist= BIND.chroot.dist _BIND.include.dist= BIND.include.dist .endif .endif +.if ${MK_GROFF} != "no" +_BSD.groff.dist= BSD.groff.dist +.endif .if ${MK_SENDMAIL} != "no" _BSD.sendmail.dist= BSD.sendmail.dist .endif diff --git a/share/doc/Makefile b/share/doc/Makefile index 61b26d70dc97..b901b93aad53 100644 --- a/share/doc/Makefile +++ b/share/doc/Makefile @@ -3,12 +3,17 @@ .include -SUBDIR= ${_bind9} IPv6 legal papers psd smm usd +SUBDIR= ${_bind9} IPv6 legal ${_roffdocs} .if ${MK_BIND} != "no" _bind9= bind9 .endif +# FIXME this is not a real solution ... +.if ${MK_GROFF} != "no" +_roffdocs= papers psd smm usd +.endif + # Default output format for troff documents is ascii. # To generate postscript versions of troff documents, use: # make PRINTERDEVICE=ps diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index db8251cfc87b..3a79d833c023 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -813,6 +813,491 @@ OLD_FILES+=usr/sbin/gpioctl OLD_FILES+=usr/share/man/man8/gpioctl.8.gz .endif +# Also includes vgrind(1) +.if ${MK_GROFF} == no +OLD_FILES+=usr/bin/addftinfo +OLD_FILES+=usr/bin/afmtodit +OLD_FILES+=usr/bin/eqn +OLD_FILES+=usr/bin/grn +OLD_FILES+=usr/bin/grodvi +OLD_FILES+=usr/bin/groff +OLD_FILES+=usr/bin/grog +OLD_FILES+=usr/bin/grolbp +OLD_FILES+=usr/bin/grolj4 +OLD_FILES+=usr/bin/grops +OLD_FILES+=usr/bin/grotty +OLD_FILES+=usr/bin/hpftodit +OLD_FILES+=usr/bin/indxbib +OLD_FILES+=usr/bin/lkbib +OLD_FILES+=usr/bin/lookbib +OLD_FILES+=usr/bin/mmroff +OLD_FILES+=usr/bin/neqn +OLD_FILES+=usr/bin/nroff +OLD_FILES+=usr/bin/pfbtops +OLD_FILES+=usr/bin/pic +OLD_FILES+=usr/bin/post-grohtml +OLD_FILES+=usr/bin/pre-grohtml +OLD_FILES+=usr/bin/psroff +OLD_FILES+=usr/bin/refer +OLD_FILES+=usr/bin/soelim +OLD_FILES+=usr/bin/tbl +OLD_FILES+=usr/bin/tfmtodit +OLD_FILES+=usr/bin/troff +OLD_FILES+=usr/bin/vgrind +OLD_FILES+=usr/libexec/vfontedpr +OLD_FILES+=usr/share/groff_font/devX100-12/CB +OLD_FILES+=usr/share/groff_font/devX100-12/CBI +OLD_FILES+=usr/share/groff_font/devX100-12/CI +OLD_FILES+=usr/share/groff_font/devX100-12/CR +OLD_FILES+=usr/share/groff_font/devX100-12/DESC +OLD_FILES+=usr/share/groff_font/devX100-12/HB +OLD_FILES+=usr/share/groff_font/devX100-12/HBI +OLD_FILES+=usr/share/groff_font/devX100-12/HI +OLD_FILES+=usr/share/groff_font/devX100-12/HR +OLD_FILES+=usr/share/groff_font/devX100-12/NB +OLD_FILES+=usr/share/groff_font/devX100-12/NBI +OLD_FILES+=usr/share/groff_font/devX100-12/NI +OLD_FILES+=usr/share/groff_font/devX100-12/NR +OLD_FILES+=usr/share/groff_font/devX100-12/S +OLD_FILES+=usr/share/groff_font/devX100-12/TB +OLD_FILES+=usr/share/groff_font/devX100-12/TBI +OLD_FILES+=usr/share/groff_font/devX100-12/TI +OLD_FILES+=usr/share/groff_font/devX100-12/TR +OLD_DIRS+=usr/share/groff_font/devX100-12 +OLD_FILES+=usr/share/groff_font/devX100/CB +OLD_FILES+=usr/share/groff_font/devX100/CBI +OLD_FILES+=usr/share/groff_font/devX100/CI +OLD_FILES+=usr/share/groff_font/devX100/CR +OLD_FILES+=usr/share/groff_font/devX100/DESC +OLD_FILES+=usr/share/groff_font/devX100/HB +OLD_FILES+=usr/share/groff_font/devX100/HBI +OLD_FILES+=usr/share/groff_font/devX100/HI +OLD_FILES+=usr/share/groff_font/devX100/HR +OLD_FILES+=usr/share/groff_font/devX100/NB +OLD_FILES+=usr/share/groff_font/devX100/NBI +OLD_FILES+=usr/share/groff_font/devX100/NI +OLD_FILES+=usr/share/groff_font/devX100/NR +OLD_FILES+=usr/share/groff_font/devX100/S +OLD_FILES+=usr/share/groff_font/devX100/TB +OLD_FILES+=usr/share/groff_font/devX100/TBI +OLD_FILES+=usr/share/groff_font/devX100/TI +OLD_FILES+=usr/share/groff_font/devX100/TR +OLD_DIRS+=usr/share/groff_font/devX100 +OLD_FILES+=usr/share/groff_font/devX75-12/CB +OLD_FILES+=usr/share/groff_font/devX75-12/CBI +OLD_FILES+=usr/share/groff_font/devX75-12/CI +OLD_FILES+=usr/share/groff_font/devX75-12/CR +OLD_FILES+=usr/share/groff_font/devX75-12/DESC +OLD_FILES+=usr/share/groff_font/devX75-12/HB +OLD_FILES+=usr/share/groff_font/devX75-12/HBI +OLD_FILES+=usr/share/groff_font/devX75-12/HI +OLD_FILES+=usr/share/groff_font/devX75-12/HR +OLD_FILES+=usr/share/groff_font/devX75-12/NB +OLD_FILES+=usr/share/groff_font/devX75-12/NBI +OLD_FILES+=usr/share/groff_font/devX75-12/NI +OLD_FILES+=usr/share/groff_font/devX75-12/NR +OLD_FILES+=usr/share/groff_font/devX75-12/S +OLD_FILES+=usr/share/groff_font/devX75-12/TB +OLD_FILES+=usr/share/groff_font/devX75-12/TBI +OLD_FILES+=usr/share/groff_font/devX75-12/TI +OLD_FILES+=usr/share/groff_font/devX75-12/TR +OLD_DIRS+=usr/share/groff_font/devX75-12 +OLD_FILES+=usr/share/groff_font/devX75/CB +OLD_FILES+=usr/share/groff_font/devX75/CBI +OLD_FILES+=usr/share/groff_font/devX75/CI +OLD_FILES+=usr/share/groff_font/devX75/CR +OLD_FILES+=usr/share/groff_font/devX75/DESC +OLD_FILES+=usr/share/groff_font/devX75/HB +OLD_FILES+=usr/share/groff_font/devX75/HBI +OLD_FILES+=usr/share/groff_font/devX75/HI +OLD_FILES+=usr/share/groff_font/devX75/HR +OLD_FILES+=usr/share/groff_font/devX75/NB +OLD_FILES+=usr/share/groff_font/devX75/NBI +OLD_FILES+=usr/share/groff_font/devX75/NI +OLD_FILES+=usr/share/groff_font/devX75/NR +OLD_FILES+=usr/share/groff_font/devX75/S +OLD_FILES+=usr/share/groff_font/devX75/TB +OLD_FILES+=usr/share/groff_font/devX75/TBI +OLD_FILES+=usr/share/groff_font/devX75/TI +OLD_FILES+=usr/share/groff_font/devX75/TR +OLD_DIRS+=usr/share/groff_font/devX75 +OLD_FILES+=usr/share/groff_font/devascii/B +OLD_FILES+=usr/share/groff_font/devascii/BI +OLD_FILES+=usr/share/groff_font/devascii/CW +OLD_FILES+=usr/share/groff_font/devascii/DESC +OLD_FILES+=usr/share/groff_font/devascii/I +OLD_FILES+=usr/share/groff_font/devascii/L +OLD_FILES+=usr/share/groff_font/devascii/R +OLD_FILES+=usr/share/groff_font/devascii/S +OLD_DIRS+=usr/share/groff_font/devascii +OLD_FILES+=usr/share/groff_font/devcp1047/B +OLD_FILES+=usr/share/groff_font/devcp1047/BI +OLD_FILES+=usr/share/groff_font/devcp1047/CW +OLD_FILES+=usr/share/groff_font/devcp1047/DESC +OLD_FILES+=usr/share/groff_font/devcp1047/I +OLD_FILES+=usr/share/groff_font/devcp1047/L +OLD_FILES+=usr/share/groff_font/devcp1047/R +OLD_FILES+=usr/share/groff_font/devcp1047/S +OLD_DIRS+=usr/share/groff_font/devcp1047 +OLD_FILES+=usr/share/groff_font/devdvi/CW +OLD_FILES+=usr/share/groff_font/devdvi/CWEC +OLD_FILES+=usr/share/groff_font/devdvi/CWI +OLD_FILES+=usr/share/groff_font/devdvi/CWIEC +OLD_FILES+=usr/share/groff_font/devdvi/CWITC +OLD_FILES+=usr/share/groff_font/devdvi/CWTC +OLD_FILES+=usr/share/groff_font/devdvi/CompileFonts +OLD_FILES+=usr/share/groff_font/devdvi/DESC +OLD_FILES+=usr/share/groff_font/devdvi/EX +OLD_FILES+=usr/share/groff_font/devdvi/HB +OLD_FILES+=usr/share/groff_font/devdvi/HBEC +OLD_FILES+=usr/share/groff_font/devdvi/HBI +OLD_FILES+=usr/share/groff_font/devdvi/HBIEC +OLD_FILES+=usr/share/groff_font/devdvi/HBITC +OLD_FILES+=usr/share/groff_font/devdvi/HBTC +OLD_FILES+=usr/share/groff_font/devdvi/HI +OLD_FILES+=usr/share/groff_font/devdvi/HIEC +OLD_FILES+=usr/share/groff_font/devdvi/HITC +OLD_FILES+=usr/share/groff_font/devdvi/HR +OLD_FILES+=usr/share/groff_font/devdvi/HREC +OLD_FILES+=usr/share/groff_font/devdvi/HRTC +OLD_FILES+=usr/share/groff_font/devdvi/MI +OLD_FILES+=usr/share/groff_font/devdvi/Makefile +OLD_FILES+=usr/share/groff_font/devdvi/S +OLD_FILES+=usr/share/groff_font/devdvi/SA +OLD_FILES+=usr/share/groff_font/devdvi/SB +OLD_FILES+=usr/share/groff_font/devdvi/SC +OLD_FILES+=usr/share/groff_font/devdvi/TB +OLD_FILES+=usr/share/groff_font/devdvi/TBEC +OLD_FILES+=usr/share/groff_font/devdvi/TBI +OLD_FILES+=usr/share/groff_font/devdvi/TBIEC +OLD_FILES+=usr/share/groff_font/devdvi/TBITC +OLD_FILES+=usr/share/groff_font/devdvi/TBTC +OLD_FILES+=usr/share/groff_font/devdvi/TI +OLD_FILES+=usr/share/groff_font/devdvi/TIEC +OLD_FILES+=usr/share/groff_font/devdvi/TITC +OLD_FILES+=usr/share/groff_font/devdvi/TR +OLD_FILES+=usr/share/groff_font/devdvi/TREC +OLD_FILES+=usr/share/groff_font/devdvi/TRTC +OLD_FILES+=usr/share/groff_font/devdvi/ec.map +OLD_FILES+=usr/share/groff_font/devdvi/msam.map +OLD_FILES+=usr/share/groff_font/devdvi/msbm.map +OLD_FILES+=usr/share/groff_font/devdvi/tc.map +OLD_FILES+=usr/share/groff_font/devdvi/texb.map +OLD_FILES+=usr/share/groff_font/devdvi/texex.map +OLD_FILES+=usr/share/groff_font/devdvi/texi.map +OLD_FILES+=usr/share/groff_font/devdvi/texmi.map +OLD_FILES+=usr/share/groff_font/devdvi/texr.map +OLD_FILES+=usr/share/groff_font/devdvi/texsy.map +OLD_FILES+=usr/share/groff_font/devdvi/textex.map +OLD_FILES+=usr/share/groff_font/devdvi/textt.map +OLD_DIRS+=usr/share/groff_font/devdvi +OLD_FILES+=usr/share/groff_font/devhtml/B +OLD_FILES+=usr/share/groff_font/devhtml/BI +OLD_FILES+=usr/share/groff_font/devhtml/CB +OLD_FILES+=usr/share/groff_font/devhtml/CBI +OLD_FILES+=usr/share/groff_font/devhtml/CI +OLD_FILES+=usr/share/groff_font/devhtml/CR +OLD_FILES+=usr/share/groff_font/devhtml/DESC +OLD_FILES+=usr/share/groff_font/devhtml/I +OLD_FILES+=usr/share/groff_font/devhtml/R +OLD_FILES+=usr/share/groff_font/devhtml/S +OLD_DIRS+=usr/share/groff_font/devhtml +OLD_FILES+=usr/share/groff_font/devkoi8-r/B +OLD_FILES+=usr/share/groff_font/devkoi8-r/BI +OLD_FILES+=usr/share/groff_font/devkoi8-r/CW +OLD_FILES+=usr/share/groff_font/devkoi8-r/DESC +OLD_FILES+=usr/share/groff_font/devkoi8-r/I +OLD_FILES+=usr/share/groff_font/devkoi8-r/L +OLD_FILES+=usr/share/groff_font/devkoi8-r/R +OLD_FILES+=usr/share/groff_font/devkoi8-r/S +OLD_DIRS+=usr/share/groff_font/devkoi8-r +OLD_FILES+=usr/share/groff_font/devlatin1/B +OLD_FILES+=usr/share/groff_font/devlatin1/BI +OLD_FILES+=usr/share/groff_font/devlatin1/CW +OLD_FILES+=usr/share/groff_font/devlatin1/DESC +OLD_FILES+=usr/share/groff_font/devlatin1/I +OLD_FILES+=usr/share/groff_font/devlatin1/L +OLD_FILES+=usr/share/groff_font/devlatin1/R +OLD_FILES+=usr/share/groff_font/devlatin1/S +OLD_DIRS+=usr/share/groff_font/devlatin1 +OLD_FILES+=usr/share/groff_font/devlbp/CB +OLD_FILES+=usr/share/groff_font/devlbp/CI +OLD_FILES+=usr/share/groff_font/devlbp/CR +OLD_FILES+=usr/share/groff_font/devlbp/DESC +OLD_FILES+=usr/share/groff_font/devlbp/EB +OLD_FILES+=usr/share/groff_font/devlbp/EI +OLD_FILES+=usr/share/groff_font/devlbp/ER +OLD_FILES+=usr/share/groff_font/devlbp/HB +OLD_FILES+=usr/share/groff_font/devlbp/HBI +OLD_FILES+=usr/share/groff_font/devlbp/HI +OLD_FILES+=usr/share/groff_font/devlbp/HNB +OLD_FILES+=usr/share/groff_font/devlbp/HNBI +OLD_FILES+=usr/share/groff_font/devlbp/HNI +OLD_FILES+=usr/share/groff_font/devlbp/HNR +OLD_FILES+=usr/share/groff_font/devlbp/HR +OLD_FILES+=usr/share/groff_font/devlbp/TB +OLD_FILES+=usr/share/groff_font/devlbp/TBI +OLD_FILES+=usr/share/groff_font/devlbp/TI +OLD_FILES+=usr/share/groff_font/devlbp/TR +OLD_DIRS+=usr/share/groff_font/devlbp +OLD_FILES+=usr/share/groff_font/devlj4/AB +OLD_FILES+=usr/share/groff_font/devlj4/ABI +OLD_FILES+=usr/share/groff_font/devlj4/AI +OLD_FILES+=usr/share/groff_font/devlj4/ALBB +OLD_FILES+=usr/share/groff_font/devlj4/ALBR +OLD_FILES+=usr/share/groff_font/devlj4/AOB +OLD_FILES+=usr/share/groff_font/devlj4/AOI +OLD_FILES+=usr/share/groff_font/devlj4/AOR +OLD_FILES+=usr/share/groff_font/devlj4/AR +OLD_FILES+=usr/share/groff_font/devlj4/CB +OLD_FILES+=usr/share/groff_font/devlj4/CBI +OLD_FILES+=usr/share/groff_font/devlj4/CI +OLD_FILES+=usr/share/groff_font/devlj4/CLARENDON +OLD_FILES+=usr/share/groff_font/devlj4/CORONET +OLD_FILES+=usr/share/groff_font/devlj4/CR +OLD_FILES+=usr/share/groff_font/devlj4/DESC +OLD_FILES+=usr/share/groff_font/devlj4/GB +OLD_FILES+=usr/share/groff_font/devlj4/GBI +OLD_FILES+=usr/share/groff_font/devlj4/GI +OLD_FILES+=usr/share/groff_font/devlj4/GR +OLD_FILES+=usr/share/groff_font/devlj4/LGB +OLD_FILES+=usr/share/groff_font/devlj4/LGI +OLD_FILES+=usr/share/groff_font/devlj4/LGR +OLD_FILES+=usr/share/groff_font/devlj4/MARIGOLD +OLD_FILES+=usr/share/groff_font/devlj4/OB +OLD_FILES+=usr/share/groff_font/devlj4/OBI +OLD_FILES+=usr/share/groff_font/devlj4/OI +OLD_FILES+=usr/share/groff_font/devlj4/OR +OLD_FILES+=usr/share/groff_font/devlj4/S +OLD_FILES+=usr/share/groff_font/devlj4/SYMBOL +OLD_FILES+=usr/share/groff_font/devlj4/TB +OLD_FILES+=usr/share/groff_font/devlj4/TBI +OLD_FILES+=usr/share/groff_font/devlj4/TI +OLD_FILES+=usr/share/groff_font/devlj4/TNRB +OLD_FILES+=usr/share/groff_font/devlj4/TNRBI +OLD_FILES+=usr/share/groff_font/devlj4/TNRI +OLD_FILES+=usr/share/groff_font/devlj4/TNRR +OLD_FILES+=usr/share/groff_font/devlj4/TR +OLD_FILES+=usr/share/groff_font/devlj4/UB +OLD_FILES+=usr/share/groff_font/devlj4/UBI +OLD_FILES+=usr/share/groff_font/devlj4/UCB +OLD_FILES+=usr/share/groff_font/devlj4/UCBI +OLD_FILES+=usr/share/groff_font/devlj4/UCI +OLD_FILES+=usr/share/groff_font/devlj4/UCR +OLD_FILES+=usr/share/groff_font/devlj4/UI +OLD_FILES+=usr/share/groff_font/devlj4/UR +OLD_FILES+=usr/share/groff_font/devlj4/WINGDINGS +OLD_DIRS+=usr/share/groff_font/devlj4 +OLD_FILES+=usr/share/groff_font/devps/AB +OLD_FILES+=usr/share/groff_font/devps/ABI +OLD_FILES+=usr/share/groff_font/devps/AI +OLD_FILES+=usr/share/groff_font/devps/AR +OLD_FILES+=usr/share/groff_font/devps/BMB +OLD_FILES+=usr/share/groff_font/devps/BMBI +OLD_FILES+=usr/share/groff_font/devps/BMI +OLD_FILES+=usr/share/groff_font/devps/BMR +OLD_FILES+=usr/share/groff_font/devps/CB +OLD_FILES+=usr/share/groff_font/devps/CBI +OLD_FILES+=usr/share/groff_font/devps/CI +OLD_FILES+=usr/share/groff_font/devps/CR +OLD_FILES+=usr/share/groff_font/devps/DESC +OLD_FILES+=usr/share/groff_font/devps/EURO +OLD_FILES+=usr/share/groff_font/devps/HB +OLD_FILES+=usr/share/groff_font/devps/HBI +OLD_FILES+=usr/share/groff_font/devps/HI +OLD_FILES+=usr/share/groff_font/devps/HNB +OLD_FILES+=usr/share/groff_font/devps/HNBI +OLD_FILES+=usr/share/groff_font/devps/HNI +OLD_FILES+=usr/share/groff_font/devps/HNR +OLD_FILES+=usr/share/groff_font/devps/HR +OLD_FILES+=usr/share/groff_font/devps/Makefile +OLD_FILES+=usr/share/groff_font/devps/NB +OLD_FILES+=usr/share/groff_font/devps/NBI +OLD_FILES+=usr/share/groff_font/devps/NI +OLD_FILES+=usr/share/groff_font/devps/NR +OLD_FILES+=usr/share/groff_font/devps/PB +OLD_FILES+=usr/share/groff_font/devps/PBI +OLD_FILES+=usr/share/groff_font/devps/PI +OLD_FILES+=usr/share/groff_font/devps/PR +OLD_FILES+=usr/share/groff_font/devps/S +OLD_FILES+=usr/share/groff_font/devps/SS +OLD_FILES+=usr/share/groff_font/devps/TB +OLD_FILES+=usr/share/groff_font/devps/TBI +OLD_FILES+=usr/share/groff_font/devps/TI +OLD_FILES+=usr/share/groff_font/devps/TR +OLD_FILES+=usr/share/groff_font/devps/ZCMI +OLD_FILES+=usr/share/groff_font/devps/ZD +OLD_FILES+=usr/share/groff_font/devps/ZDR +OLD_FILES+=usr/share/groff_font/devps/afmname +OLD_FILES+=usr/share/groff_font/devps/dingbats.map +OLD_FILES+=usr/share/groff_font/devps/dingbats.rmap +OLD_FILES+=usr/share/groff_font/devps/download +OLD_FILES+=usr/share/groff_font/devps/freeeuro.pfa +OLD_FILES+=usr/share/groff_font/devps/lgreekmap +OLD_FILES+=usr/share/groff_font/devps/prologue +OLD_FILES+=usr/share/groff_font/devps/symbol.sed +OLD_FILES+=usr/share/groff_font/devps/symbolchars +OLD_FILES+=usr/share/groff_font/devps/symbolsl.afm +OLD_FILES+=usr/share/groff_font/devps/symbolsl.pfa +OLD_FILES+=usr/share/groff_font/devps/text.enc +OLD_FILES+=usr/share/groff_font/devps/textmap +OLD_FILES+=usr/share/groff_font/devps/zapfdr.pfa +OLD_DIRS+=usr/share/groff_font/devps +OLD_FILES+=usr/share/groff_font/devutf8/B +OLD_FILES+=usr/share/groff_font/devutf8/BI +OLD_FILES+=usr/share/groff_font/devutf8/CW +OLD_FILES+=usr/share/groff_font/devutf8/DESC +OLD_FILES+=usr/share/groff_font/devutf8/I +OLD_FILES+=usr/share/groff_font/devutf8/L +OLD_FILES+=usr/share/groff_font/devutf8/R +OLD_FILES+=usr/share/groff_font/devutf8/S +OLD_DIRS+=usr/share/groff_font/devutf8 +OLD_DIRS+=usr/share/groff_font +OLD_FILES+=usr/share/info/groff.info.gz +OLD_FILES+=usr/share/man/man1/addftinfo.1.gz +OLD_FILES+=usr/share/man/man1/afmtodit.1.gz +OLD_FILES+=usr/share/man/man1/eqn.1.gz +OLD_FILES+=usr/share/man/man1/grn.1.gz +OLD_FILES+=usr/share/man/man1/grodvi.1.gz +OLD_FILES+=usr/share/man/man1/groff.1.gz +OLD_FILES+=usr/share/man/man1/grog.1.gz +OLD_FILES+=usr/share/man/man1/grolbp.1.gz +OLD_FILES+=usr/share/man/man1/grolj4.1.gz +OLD_FILES+=usr/share/man/man1/grops.1.gz +OLD_FILES+=usr/share/man/man1/grotty.1.gz +OLD_FILES+=usr/share/man/man1/hpftodit.1.gz +OLD_FILES+=usr/share/man/man1/indxbib.1.gz +OLD_FILES+=usr/share/man/man1/lkbib.1.gz +OLD_FILES+=usr/share/man/man1/lookbib.1.gz +OLD_FILES+=usr/share/man/man1/mmroff.1.gz +OLD_FILES+=usr/share/man/man1/neqn.1.gz +OLD_FILES+=usr/share/man/man1/nroff.1.gz +OLD_FILES+=usr/share/man/man1/pfbtops.1.gz +OLD_FILES+=usr/share/man/man1/pic.1.gz +OLD_FILES+=usr/share/man/man1/psroff.1.gz +OLD_FILES+=usr/share/man/man1/refer.1.gz +OLD_FILES+=usr/share/man/man1/soelim.1.gz +OLD_FILES+=usr/share/man/man1/tbl.1.gz +OLD_FILES+=usr/share/man/man1/tfmtodit.1.gz +OLD_FILES+=usr/share/man/man1/troff.1.gz +OLD_FILES+=usr/share/man/man1/vgrind.1.gz +OLD_FILES+=usr/share/man/man5/groff_font.5.gz +OLD_FILES+=usr/share/man/man5/groff_out.5.gz +OLD_FILES+=usr/share/man/man5/groff_tmac.5.gz +OLD_FILES+=usr/share/man/man5/lj4_font.5.gz +OLD_FILES+=usr/share/man/man5/tmac.5.gz +OLD_FILES+=usr/share/man/man5/vgrindefs.5.gz +OLD_FILES+=usr/share/man/man7/ditroff.7.gz +OLD_FILES+=usr/share/man/man7/groff.7.gz +OLD_FILES+=usr/share/man/man7/groff_char.7.gz +OLD_FILES+=usr/share/man/man7/groff_diff.7.gz +OLD_FILES+=usr/share/man/man7/groff_man.7.gz +OLD_FILES+=usr/share/man/man7/groff_mdoc.7.gz +OLD_FILES+=usr/share/man/man7/groff_me.7.gz +OLD_FILES+=usr/share/man/man7/groff_mm.7.gz +OLD_FILES+=usr/share/man/man7/groff_mmse.7.gz +OLD_FILES+=usr/share/man/man7/groff_ms.7.gz +OLD_FILES+=usr/share/man/man7/groff_trace.7.gz +OLD_FILES+=usr/share/man/man7/groff_www.7.gz +OLD_FILES+=usr/share/man/man7/man.7.gz +OLD_FILES+=usr/share/man/man7/mdoc.7.gz +OLD_FILES+=usr/share/man/man7/mdoc.samples.7.gz +OLD_FILES+=usr/share/man/man7/me.7.gz +OLD_FILES+=usr/share/man/man7/mm.7.gz +OLD_FILES+=usr/share/man/man7/mmse.7.gz +OLD_FILES+=usr/share/man/man7/ms.7.gz +OLD_FILES+=usr/share/man/man7/orig_me.7.gz +OLD_FILES+=usr/share/man/man7/roff.7.gz +OLD_FILES+=usr/share/me/acm.me +OLD_FILES+=usr/share/me/chars.me +OLD_FILES+=usr/share/me/deltext.me +OLD_FILES+=usr/share/me/eqn.me +OLD_FILES+=usr/share/me/float.me +OLD_FILES+=usr/share/me/footnote.me +OLD_FILES+=usr/share/me/index.me +OLD_FILES+=usr/share/me/letterhead.me +OLD_FILES+=usr/share/me/local.me +OLD_FILES+=usr/share/me/null.me +OLD_FILES+=usr/share/me/refer.me +OLD_FILES+=usr/share/me/revisions +OLD_FILES+=usr/share/me/sh.me +OLD_FILES+=usr/share/me/tbl.me +OLD_FILES+=usr/share/me/thesis.me +OLD_DIRS+=usr/share/me +OLD_FILES+=usr/share/misc/vgrindefs +OLD_FILES+=usr/share/misc/vgrindefs.db +OLD_FILES+=usr/share/tmac/X.tmac +OLD_FILES+=usr/share/tmac/Xps.tmac +OLD_FILES+=usr/share/tmac/a4.tmac +OLD_FILES+=usr/share/tmac/an-old.tmac +OLD_FILES+=usr/share/tmac/an.tmac +OLD_FILES+=usr/share/tmac/andoc.tmac +OLD_FILES+=usr/share/tmac/composite.tmac +OLD_FILES+=usr/share/tmac/cp1047.tmac +OLD_FILES+=usr/share/tmac/devtag.tmac +OLD_FILES+=usr/share/tmac/doc.tmac +OLD_FILES+=usr/share/tmac/dvi.tmac +OLD_FILES+=usr/share/tmac/e.tmac +OLD_FILES+=usr/share/tmac/ec.tmac +OLD_FILES+=usr/share/tmac/eqnrc +OLD_FILES+=usr/share/tmac/europs.tmac +OLD_FILES+=usr/share/tmac/html-end.tmac +OLD_FILES+=usr/share/tmac/html.tmac +OLD_FILES+=usr/share/tmac/hyphen.ru +OLD_FILES+=usr/share/tmac/hyphen.us +OLD_FILES+=usr/share/tmac/hyphenex.us +OLD_FILES+=usr/share/tmac/koi8-r.tmac +OLD_FILES+=usr/share/tmac/latin1.tmac +OLD_FILES+=usr/share/tmac/latin2.tmac +OLD_FILES+=usr/share/tmac/latin9.tmac +OLD_FILES+=usr/share/tmac/lbp.tmac +OLD_FILES+=usr/share/tmac/lj4.tmac +OLD_FILES+=usr/share/tmac/m.tmac +OLD_FILES+=usr/share/tmac/man.local +OLD_FILES+=usr/share/tmac/man.tmac +OLD_FILES+=usr/share/tmac/mandoc.tmac +OLD_FILES+=usr/share/tmac/mdoc.local +OLD_FILES+=usr/share/tmac/mdoc.tmac +OLD_FILES+=usr/share/tmac/mdoc/doc-common +OLD_FILES+=usr/share/tmac/mdoc/doc-ditroff +OLD_FILES+=usr/share/tmac/mdoc/doc-nroff +OLD_FILES+=usr/share/tmac/mdoc/doc-syms +OLD_FILES+=usr/share/tmac/mdoc/fr.ISO8859-1 +OLD_FILES+=usr/share/tmac/mdoc/ru.KOI8-R +OLD_DIRS+=usr/share/tmac/mdoc +OLD_FILES+=usr/share/tmac/me.tmac +OLD_FILES+=usr/share/tmac/mm/0.MT +OLD_FILES+=usr/share/tmac/mm/4.MT +OLD_FILES+=usr/share/tmac/mm/5.MT +OLD_FILES+=usr/share/tmac/mm/locale +OLD_FILES+=usr/share/tmac/mm/mm.tmac +OLD_FILES+=usr/share/tmac/mm/mmse.tmac +OLD_FILES+=usr/share/tmac/mm/ms.cov +OLD_FILES+=usr/share/tmac/mm/se_locale +OLD_FILES+=usr/share/tmac/mm/se_ms.cov +OLD_DIRS+=usr/share/tmac/mm +OLD_FILES+=usr/share/tmac/ms.tmac +OLD_FILES+=usr/share/tmac/mse.tmac +OLD_FILES+=usr/share/tmac/papersize.tmac +OLD_FILES+=usr/share/tmac/pic.tmac +OLD_FILES+=usr/share/tmac/ps.tmac +OLD_FILES+=usr/share/tmac/psatk.tmac +OLD_FILES+=usr/share/tmac/psold.tmac +OLD_FILES+=usr/share/tmac/pspic.tmac +OLD_FILES+=usr/share/tmac/s.tmac +OLD_FILES+=usr/share/tmac/safer.tmac +OLD_FILES+=usr/share/tmac/tmac.orig_me +OLD_FILES+=usr/share/tmac/tmac.vgrind +OLD_FILES+=usr/share/tmac/trace.tmac +OLD_FILES+=usr/share/tmac/troffrc +OLD_FILES+=usr/share/tmac/troffrc-end +OLD_FILES+=usr/share/tmac/tty-char.tmac +OLD_FILES+=usr/share/tmac/tty.tmac +OLD_FILES+=usr/share/tmac/unicode.tmac +OLD_FILES+=usr/share/tmac/www.tmac +OLD_DIRS+=usr/share/tmac +.endif + .if ${MK_GSSAPI} == no OLD_FILES+=usr/lib/libgssapi.a OLD_FILES+=usr/lib/libgssapi.so @@ -892,10 +1377,6 @@ OLD_FILES+=usr/share/man/man5/qop.5.gz OLD_FILES+=usr/share/man/man8/gssd.8.gz .endif -#.if ${MK_GROFF} == no -# to be filled in -#.endif - .if ${MK_HESIOD} == no OLD_FILES+=usr/bin/hesinfo OLD_FILES+=usr/include/hesiod.h diff --git a/tools/build/options/WITHOUT_GROFF b/tools/build/options/WITHOUT_GROFF index 56fbad24205f..ccd4167bc844 100644 --- a/tools/build/options/WITHOUT_GROFF +++ b/tools/build/options/WITHOUT_GROFF @@ -1,3 +1,7 @@ .\" $FreeBSD$ Set to not build -.Xr groff 1 . +.Xr groff 1 +and +.Xr vgrind 1 . +You should consider installing the textproc/groff port to not break +.Xr man 1 . diff --git a/usr.bin/Makefile b/usr.bin/Makefile index f7965f14e88a..6667ec84f6d2 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -239,6 +239,10 @@ _clang= clang SUBDIR+= hesinfo .endif +.if ${MK_GROFF} != "no" +SUBDIR+= vgrind +.endif + .if ${MK_OPENSSL} != "no" SUBDIR+= bc SUBDIR+= chkey @@ -320,8 +324,6 @@ SUBDIR+= rpcgen SUBDIR+= unifdef SUBDIR+= xlint SUBDIR+= xstr -# XXX maybe under textproc? -SUBDIR+= vgrind SUBDIR+= yacc .endif