From cdc37953165c5ed157a662705d56ba21197d6d1e Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Thu, 25 May 2017 14:54:22 +0000 Subject: [PATCH] In preparation for the removal of the roff toolchain, disconnect the roff documentation from the build. Those documents will be added to the doc tree and distributed as PDF from the documentation website. As they are valuable has history, but do not match current FreeBSD Further more, the ascii format we were using to distribute them is not really accurate for such documents. more details: https://lists.freebsd.org/pipermail/freebsd-arch/2017-May/018211.html --- ObsoleteFiles.inc | 70 ++++++++++++++++++++++++ share/doc/Makefile | 5 -- tools/build/mk/OptionalObsoleteFiles.inc | 69 ----------------------- 3 files changed, 70 insertions(+), 74 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 4459ab60360..db2b1aa23e3 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,76 @@ # xargs -n1 | sort | uniq -d; # done +# 20170525: disconnect the roff docs from the build +OLD_FILES+=usr/share/doc/papers/beyond43.ascii.gz +OLD_FILES+=usr/share/doc/papers/bio.ascii.gz +OLD_FILES+=usr/share/doc/papers/contents.ascii.gz +OLD_FILES+=usr/share/doc/papers/devfs.ascii.gz +OLD_FILES+=usr/share/doc/papers/diskperf.ascii.gz +OLD_FILES+=usr/share/doc/papers/fsinterface.ascii.gz +OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz +OLD_FILES+=usr/share/doc/papers/jail.ascii.gz +OLD_FILES+=usr/share/doc/papers/kernmalloc.ascii.gz +OLD_FILES+=usr/share/doc/papers/kerntune.ascii.gz +OLD_FILES+=usr/share/doc/papers/malloc.ascii.gz +OLD_FILES+=usr/share/doc/papers/newvm.ascii.gz +OLD_FILES+=usr/share/doc/papers/releng.ascii.gz +OLD_FILES+=usr/share/doc/papers/sysperf.ascii.gz +OLD_FILES+=usr/share/doc/papers/timecounter.ascii.gz +OLD_FILES+=usr/share/doc/psd/01.cacm/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/02.implement/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/03.iosys/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/04.uprog/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/05.sysman/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/06.Clang/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/12.make/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz +OLD_FILES+=usr/share/doc/psd/15.yacc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/16.lex/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/17.m4/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/18.gprof/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/20.ipctut/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/21.ipc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/22.rpcgen/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/23.rpc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/24.xdr/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/25.xdrrfc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/26.rpcrfc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/27.nfsrfc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/Title.ascii.gz +OLD_FILES+=usr/share/doc/psd/contents.ascii.gz +OLD_FILES+=usr/share/doc/smm/01.setup/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/02.config/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/03.fsck/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/04.quotas/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/05.fastfs/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/06.nfs/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/11.timedop/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/12.timed/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/18.net/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/Title.ascii.gz +OLD_FILES+=usr/share/doc/smm/contents.ascii.gz +OLD_FILES+=usr/share/doc/usd/04.csh/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/05.dc/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/06.bc/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/07.mail/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz +OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz +OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/18.msdiffs/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/19.memacros/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/20.meref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/21.troff/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/22.trofftut/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/Title.ascii.gz +OLD_FILES+=usr/share/doc/usd/contents.ascii.gz # 20170427: NATM configuration support removed OLD_FILES+=etc/rc.d/atm1 OLD_FILES+=etc/rc.d/atm2 diff --git a/share/doc/Makefile b/share/doc/Makefile index 7a02b295259..7718c6344dc 100644 --- a/share/doc/Makefile +++ b/share/doc/Makefile @@ -23,11 +23,6 @@ _llvm= llvm _IPv6= IPv6 .endif -# FIXME this is not a real solution ... -.if ${MK_GROFF} != "no" -_roffdocs= papers psd smm usd -.endif - SUBDIR_PARALLEL= # Default output format for troff documents is ascii. diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 8b999a434f8..4c69287de56 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2526,75 +2526,6 @@ OLD_FILES+=usr/bin/troff OLD_FILES+=usr/bin/vgrind OLD_FILES+=usr/libexec/vfontedpr OLD_FILES+=usr/share/dict/eign -OLD_FILES+=usr/share/doc/papers/beyond43.ascii.gz -OLD_FILES+=usr/share/doc/papers/bio.ascii.gz -OLD_FILES+=usr/share/doc/papers/contents.ascii.gz -OLD_FILES+=usr/share/doc/papers/devfs.ascii.gz -OLD_FILES+=usr/share/doc/papers/diskperf.ascii.gz -OLD_FILES+=usr/share/doc/papers/fsinterface.ascii.gz -OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz -OLD_FILES+=usr/share/doc/papers/jail.ascii.gz -OLD_FILES+=usr/share/doc/papers/kernmalloc.ascii.gz -OLD_FILES+=usr/share/doc/papers/kerntune.ascii.gz -OLD_FILES+=usr/share/doc/papers/malloc.ascii.gz -OLD_FILES+=usr/share/doc/papers/newvm.ascii.gz -OLD_FILES+=usr/share/doc/papers/releng.ascii.gz -OLD_FILES+=usr/share/doc/papers/sysperf.ascii.gz -OLD_FILES+=usr/share/doc/papers/timecounter.ascii.gz -OLD_FILES+=usr/share/doc/psd/01.cacm/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/02.implement/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/03.iosys/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/04.uprog/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/05.sysman/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/06.Clang/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/12.make/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz -OLD_FILES+=usr/share/doc/psd/15.yacc/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/16.lex/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/17.m4/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/18.gprof/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/20.ipctut/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/21.ipc/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/22.rpcgen/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/23.rpc/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/24.xdr/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/25.xdrrfc/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/26.rpcrfc/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/27.nfsrfc/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/Title.ascii.gz -OLD_FILES+=usr/share/doc/psd/contents.ascii.gz -OLD_FILES+=usr/share/doc/smm/01.setup/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/02.config/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/03.fsck/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/04.quotas/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/05.fastfs/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/06.nfs/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/11.timedop/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/12.timed/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/18.net/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/Title.ascii.gz -OLD_FILES+=usr/share/doc/smm/contents.ascii.gz -OLD_FILES+=usr/share/doc/usd/04.csh/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/05.dc/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/06.bc/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/07.mail/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz -OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz -OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz -OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/18.msdiffs/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/19.memacros/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/20.meref/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/21.troff/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/22.trofftut/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/Title.ascii.gz -OLD_FILES+=usr/share/doc/usd/contents.ascii.gz 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