Switch man(1) to the mandoc implementation.

OK krw@ naddy@ sthen@  "commit it now" deraadt@

I won't remove the files in src/usr.bin/man, such that we can quickly
switch back in case a problem is found.

diff --git a/usr.bin/man/Makefile b/usr.bin/man/Makefile
index d7dc2e3..01b3221 100644 (file)
--- a/usr.bin/man/Makefile
+++ b/usr.bin/man/Makefile
@@ -1,9 +1,5 @@
-#      $OpenBSD: Makefile,v 1.5 1999/10/18 01:46:36 aaron Exp $
+#      $OpenBSD: Makefile,v 1.6 2014/12/14 17:55:36 schwarze Exp $
 
-PROG=  man
-SRCS=  config.c man.c
-MAN=   man.1 man.conf.5 help.1
-
-LINKS= ${BINDIR}/man ${BINDIR}/help
+MAN=   man.conf.5 help.1
 
 .include <bsd.prog.mk>

diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
index 75724a3..ab2d12a 100644 (file)
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.88 2014/12/13 15:30:52 schwarze Exp $
+#      $OpenBSD: Makefile,v 1.89 2014/12/14 17:55:37 schwarze Exp $
 
 .include <bsd.own.mk>
 
@@ -21,11 +21,13 @@ SRCS+=      manpath.c mandocdb.c mansearch_const.c mansearch.c
 PROG=  mandoc
 
 LINKS =        ${BINDIR}/mandoc ${BINDIR}/apropos \
+       ${BINDIR}/mandoc ${BINDIR}/help \
+       ${BINDIR}/mandoc ${BINDIR}/man \
        ${BINDIR}/mandoc ${BINDIR}/whatis \
        ${BINDIR}/mandoc /usr/sbin/makewhatis \
        ${BINDIR}/mandoc /usr/libexec/makewhatis
 
-MAN =  apropos.1 mandoc.1 whatis.1 makewhatis.8
+MAN =  apropos.1 man.1 mandoc.1 whatis.1 makewhatis.8
 
 CLEANFILES += man.cgi cgi.o man.cgi.8.manlint