Replying to myself...
Ingo Schwarze wrote on Fri, Oct 15, 2010 at 01:14:43PM +0200:
> (1) tonight: commit tbl(1) support for man(7) into mandoc
> (2) tomorrow: commit tbl(1) support for mdoc(7) into mandoc
Done.
> (3) tomorrow: send patches to switch "tbl | nroff"
> over to mandoc in the base build system
> (4) tomorrow: send patches to unlink the last me(7) and ms(7)
> documents form the base build
That's what this message is about, see below.
I have already tested the relevant parts of the base build with it,
and I'm starting a full base build (i386) with it right now.
In case mobody else wants to do that, i will try a xenocara build
after that.
Matthieu@ is right that we need to take care of /etc/man.conf
as well. That needs to be coordinated with the ports switch,
because man.conf is mostly used by the ports manuals - base
manuals are installed formatted anyway.
I will send a separate patch.
> (5) beginning of next week: espie@ could enable the groff port
> (6) beginning of next week: disable groff in the base build
Remains to be done.
Any comments, tests or OKs regarding this patch?
Index: share/mk/bsd.man.mk
===================================================================
RCS file: /cvs/src/share/mk/bsd.man.mk,v
retrieving revision 1.31
diff -u -p -r1.31 bsd.man.mk
--- share/mk/bsd.man.mk 9 Sep 2010 22:50:47 -0000 1.31
+++ share/mk/bsd.man.mk 16 Oct 2010 16:19:58 -0000
@@ -4,9 +4,6 @@
MANTARGET?= cat
MANDOC?= mandoc
-NROFF?= nroff -Tascii
-TBL?= tbl
-MANLINT?= \#
.if !target(.MAIN)
. if exists(${.CURDIR}/../Makefile.inc)
@@ -21,25 +18,18 @@ MANLINT?= \#
.cat1 .cat2 .cat3 .cat3p .cat4 .cat5 .cat6 .cat7 .cat8 .cat9 \
.ps1 .ps2 .ps3 .ps3p .ps4 .ps5 .ps6 .ps7 .ps8 .ps9
-.9.cat9 .8.cat8 .7.cat7 .6.cat6 .5.cat5 .4.cat4 .3p.cat3p .3.cat3 .2.cat2
.1.cat1:
+.9.cat9 .8.cat8 .7.cat7 .6.cat6 .5.cat5 \
+.4.cat4 .3p.cat3p .3.cat3 .2.cat2 .1.cat1 \
+.9tbl.cat9 .8tbl.cat8 .7tbl.cat7 .6tbl.cat6 .5tbl.cat5 \
+.4tbl.cat4 .3tbl.cat3 .2tbl.cat2 .1tbl.cat1:
@echo "${MANDOC} ${.IMPSRC} > ${.TARGET}"
@${MANDOC} ${.IMPSRC} > ${.TARGET} || (rm -f ${.TARGET}; false)
-.9tbl.cat9 .8tbl.cat8 .7tbl.cat7 .6tbl.cat6 .5tbl.cat5 .4tbl.cat4 .3tbl.cat3 \
-.2tbl.cat2 .1tbl.cat1:
- @echo "${TBL} ${.IMPSRC} | ${NROFF} -mandoc > ${.TARGET}"
- @${MANLINT} -tbl ${.IMPSRC}
- @${TBL} ${.IMPSRC} | ${NROFF} -mandoc > ${.TARGET} || \
- (rm -f ${.TARGET}; false)
-
-.9.ps9 .8.ps8 .7.ps7 .6.ps6 .5.ps5 .4.ps4 .3p.ps3p .3.ps3 .2.ps2 .1.ps1:
- @echo "${MANDOC} -Tps ${.IMPSRC} > ${.TARGET}"
- @${MANDOC} -Tps ${.IMPSRC} > ${.TARGET} || (rm -f ${.TARGET}; false)
-
+.9.ps9 .8.ps8 .7.ps7 .6.ps6 .5.ps5 .4.ps4 .3p.ps3p .3.ps3 .2.ps2 .1.ps1 \
.9tbl.ps9 .8tbl.ps8 .7tbl.ps7 .6tbl.ps6 .5tbl.ps5 .4tbl.ps4 .3tbl.ps3 \
.2tbl.ps2 .1tbl.ps1:
- @echo "${TBL} ${.IMPSRC} | nroff -Tps -mandoc > ${.TARGET}"
- @${TBL} ${.IMPSRC} | nroff -Tps -mandoc > ${.TARGET} || (rm -f
${.TARGET}; false)
+ @echo "${MANDOC} -Tps ${.IMPSRC} > ${.TARGET}"
+ @${MANDOC} -Tps ${.IMPSRC} > ${.TARGET} || (rm -f ${.TARGET}; false)
.if defined(MAN) && !empty(MAN) && !defined(MANALL)
. for v s in MANALL .cat PS2ALL .ps
Index: usr.bin/bc/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/bc/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- usr.bin/bc/Makefile 30 Jun 2006 19:02:28 -0000 1.4
+++ usr.bin/bc/Makefile 16 Oct 2010 16:19:58 -0000
@@ -10,9 +10,4 @@ beforeinstall:
install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/bc.library \
${DESTDIR}/usr/share/misc
-# These get installed verbatim
-.if make(install)
-SUBDIR+= USD.doc
-.endif
-
.include <bsd.prog.mk>
Index: usr.bin/gprof/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/gprof/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- usr.bin/gprof/Makefile 3 Feb 2010 20:49:01 -0000 1.18
+++ usr.bin/gprof/Makefile 16 Oct 2010 16:19:58 -0000
@@ -22,8 +22,4 @@ beforeinstall:
${.CURDIR}/gprof.flat ${.CURDIR}/gprof.callg \
${DESTDIR}/usr/share/misc
-.if make(install)
-SUBDIR+= PSD.doc
-.endif
-
.include <bsd.prog.mk>
Index: usr.bin/lex/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/lex/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- usr.bin/lex/Makefile 9 Dec 2003 12:42:41 -0000 1.9
+++ usr.bin/lex/Makefile 16 Oct 2010 16:19:58 -0000
@@ -26,11 +26,6 @@ LINKS= ${BINDIR}/lex ${BINDIR}/flex \
${BINDIR}/lex ${BINDIR}/flex++
MLINKS= flex.1 lex.1 flex.1 flex++.1
-# This just gets installed verbatim
-.if make(install)
-SUBDIR+= PSD.doc
-.endif
-
parse.h parse.c: parse.y
${YACC} -d ${.ALLSRC}
mv y.tab.c parse.c
Index: usr.bin/make/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/make/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- usr.bin/make/Makefile 25 Apr 2010 13:59:53 -0000 1.51
+++ usr.bin/make/Makefile 16 Oct 2010 16:19:58 -0000
@@ -60,10 +60,6 @@ var.ln: varhashconsts.h
cond.ln: condhashconsts.h
targ.ln parse.ln: nodehashconsts.h
-.if make(install)
-SUBDIR+= PSD.doc
-.endif
-
.PHONY: regress
.include <bsd.prog.mk>
Index: usr.bin/vi/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/vi/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- usr.bin/vi/Makefile 9 Feb 2004 21:09:10 -0000 1.12
+++ usr.bin/vi/Makefile 16 Oct 2010 16:19:58 -0000
@@ -2,9 +2,4 @@
SUBDIR= build
-.if make(install)
-SUBDIR+= docs/USD.doc/edit docs/USD.doc/exref
-SUBDIR+= docs/USD.doc/vi.ref docs/USD.doc/vitut
-.endif
-
.include <bsd.subdir.mk>
Index: usr.bin/yacc/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/yacc/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- usr.bin/yacc/Makefile 18 Sep 2004 21:25:52 -0000 1.4
+++ usr.bin/yacc/Makefile 16 Oct 2010 16:19:58 -0000
@@ -5,11 +5,6 @@ SRCS= closure.c error.c lalr.c lr0.c mai
skeleton.c symtab.c verbose.c warshall.c
MAN= yacc.1 yyfix.1
-# This just gets installed verbatim
-.if make(install)
-SUBDIR+= PSD.doc
-.endif
-
beforeinstall:
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/yyfix.sh ${DESTDIR}${BINDIR}/yyfix
Index: gnu/usr.sbin/sendmail/Makefile
===================================================================
RCS file: /cvs/src/gnu/usr.sbin/sendmail/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- gnu/usr.sbin/sendmail/Makefile 29 Jun 2004 04:07:49 -0000 1.9
+++ gnu/usr.sbin/sendmail/Makefile 16 Oct 2010 16:19:58 -0000
@@ -15,7 +15,7 @@ SUBDIR+= libmilter sendmail mailstats ma
# These just get installed verbatim
.if make(install)
-SUBDIR+= doc/op cf
+SUBDIR+= cf
.endif
.include <bsd.subdir.mk>
