[src/trunk]: src Install mdocml's default CSS as /usr/share/man/style.css. S...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/05594af356fd
branches:  trunk
changeset: 755334:05594af356fd
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Jun 01 23:29:09 2010 +0000

description:
Install mdocml's default CSS as /usr/share/man/style.css.  Switch HTML
man pages to use mandoc unconditional as it gives reasonable output for
all man pages, not only a subset of mdoc(7).  Use the newly installed
style.css for formatting and produce hyperlinks for .Xr.

diffstat:

 distrib/sets/lists/man/mi        |   3 ++-
 external/bsd/mdocml/man/Makefile |   7 ++++++-
 share/mk/bsd.man.mk              |  14 ++------------
 share/mk/bsd.own.mk              |   4 ++--
 4 files changed, 12 insertions(+), 16 deletions(-)

diffs (80 lines):

diff -r 43a58fac747e -r 05594af356fd distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Tue Jun 01 22:13:30 2010 +0000
+++ b/distrib/sets/lists/man/mi Tue Jun 01 23:29:09 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1213 2010/06/01 10:24:14 skrll Exp $
+# $NetBSD: mi,v 1.1214 2010/06/01 23:29:09 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -7894,3 +7894,4 @@
 ./usr/share/man/man8/zic.8                     man-sysutil-man         .man
 ./usr/share/man/man8/zzz.8                     man-sysutil-man         .man
 ./usr/share/man/man9/boot.9                    man-obsolete            obsolete
+./usr/share/man/style.css                      man-mdocml-htmlman      html
diff -r 43a58fac747e -r 05594af356fd external/bsd/mdocml/man/Makefile
--- a/external/bsd/mdocml/man/Makefile  Tue Jun 01 22:13:30 2010 +0000
+++ b/external/bsd/mdocml/man/Makefile  Tue Jun 01 23:29:09 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/06/01 21:32:40 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/01 23:29:10 joerg Exp $
 
 MAN=           mandoc_man.7 mandoc_char.7 mandoc_mdoc.7 mandoc_roff.7 \
                manuals.7
@@ -22,4 +22,9 @@
 
 CLEANFILES+=   mandoc_man.7 mandoc_mdoc.7
 
+.if (${MKHTML} != "no") && (${MKMAN} != "no")
+FILES=         ${DISTDIR}/style.css
+FILESDIR=      /usr/share/man
+.endif
+
 .include <bsd.man.mk>
diff -r 43a58fac747e -r 05594af356fd share/mk/bsd.man.mk
--- a/share/mk/bsd.man.mk       Tue Jun 01 22:13:30 2010 +0000
+++ b/share/mk/bsd.man.mk       Tue Jun 01 23:29:09 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.man.mk,v 1.103 2010/03/01 22:00:07 joerg Exp $
+#      $NetBSD: bsd.man.mk,v 1.104 2010/06/01 23:29:10 joerg Exp $
 #      @(#)bsd.man.mk  8.1 (Berkeley) 6/8/93
 
 .include <bsd.init.mk>
@@ -197,18 +197,8 @@
 
 ${_MNUMBERS:@N@.$N.html$N@}: ${HTMLDEPS}                       # build rule
        ${_MKTARGET_FORMAT}
-.if ${MKMANDOC} == "yes" && !defined(NOMANDOC)
-       if test ""${NOMANDOC.${.IMPSRC:T}:tl:Q} != "yes"; then \
-               ${TOOL_MANDOC_HTML} ${.IMPSRC} > ${.TARGET}.tmp && \
-                   mv ${.TARGET}.tmp ${.TARGET}; \
-       else \
-               ${TOOL_ROFF_HTML} ${.IMPSRC} > ${.TARGET}.tmp && \
-                   mv ${.TARGET}.tmp ${.TARGET}; \
-       fi
-.else
-       ${TOOL_ROFF_HTML} ${.IMPSRC} > ${.TARGET}.tmp && \
+       ${TOOL_MANDOC_HTML} ${.IMPSRC} > ${.TARGET}.tmp && \
            mv ${.TARGET}.tmp ${.TARGET}
-.endif
 
 .for F in ${HTMLPAGES:O:u}
 # construct installed path
diff -r 43a58fac747e -r 05594af356fd share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Tue Jun 01 22:13:30 2010 +0000
+++ b/share/mk/bsd.own.mk       Tue Jun 01 23:29:09 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.626 2010/05/28 06:24:59 mrg Exp $
+#      $NetBSD: bsd.own.mk,v 1.627 2010/06/01 23:29:10 joerg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -261,7 +261,7 @@
 TOOL_MAKEINFO=         ${TOOLDIR}/bin/${_TOOL_PREFIX}makeinfo
 TOOL_MAKEWHATIS=       ${TOOLDIR}/bin/${_TOOL_PREFIX}makewhatis
 TOOL_MANDOC_ASCII=     ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tascii
-TOOL_MANDOC_HTML=      ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Thtml
+TOOL_MANDOC_HTML=      ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Thtml -Oman=../html%S/%N.html -Ostyle=../style.css
 TOOL_MANDOC_LINT=      ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tlint
 TOOL_MDSETIMAGE=       ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-mdsetimage
 TOOL_MENUC=            MENUDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}menuc