Module Name: src
Committed By: joerg
Date: Tue Feb 7 19:33:20 UTC 2012
Modified Files:
src/etc: man.conf
src/share/mk: bsd.own.mk
Log Message:
Switch to using mandoc for formatting man pages as new default.
Stop building catpages by default.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/etc/man.conf
cvs rdiff -u -r1.694 -r1.695 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/man.conf
diff -u src/etc/man.conf:1.25 src/etc/man.conf:1.26
--- src/etc/man.conf:1.25 Fri Jul 9 15:08:09 2010
+++ src/etc/man.conf Tue Feb 7 19:33:19 2012
@@ -1,4 +1,4 @@
-# $NetBSD: man.conf,v 1.25 2010/07/09 15:08:09 christos Exp $
+# $NetBSD: man.conf,v 1.26 2012/02/07 19:33:19 joerg Exp $
# Sheer, raging paranoia...
_version BSD.2
@@ -18,12 +18,13 @@ _subdir cat1 man1 cat8 man8 cat6 man6 c
_suffix .0
_build .0.Z /usr/bin/zcat %s
_build .0.gz /usr/bin/gunzip -c %s
-_build .[1-9ln] /usr/bin/nroff -msafer -man %s
-_build .[1-9ln].Z /usr/bin/zcat %s | /usr/bin/nroff -msafer -man
-_build .[1-9ln].gz /usr/bin/gunzip -c %s | /usr/bin/nroff -msafer -man
-_build .tbl /usr/bin/tbl %s | /usr/bin/nroff -msafer -man
-_build .tbl.Z /usr/bin/zcat %s | /usr/bin/tbl | /usr/bin/nroff -msafer -man
-_build .tbl.gz /usr/bin/gunzip -c %s | /usr/bin/tbl | /usr/bin/nroff -msafer -man
+_build .[1-9ln] /usr/bin/mandoc %s
+_build .[1-9ln].Z /usr/bin/zcat %s | /usr/bin/mandoc
+_build .[1-9ln].gz /usr/bin/gunzip -c %s | /usr/bin/mandoc
+_build .tbl /usr/bin/tbl %s | /usr/bin/mandoc
+_build .tbl.Z /usr/bin/zcat %s | /usr/bin/mandoc
+_build .tbl.gz /usr/bin/gunzip -c %s | /usr/bin/mandoc
+
_build .me /usr/bin/nroff -msafer -me %s 2>/dev/null | cat -s
_crunch .Z /usr/bin/compress -c > %s
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.694 src/share/mk/bsd.own.mk:1.695
--- src/share/mk/bsd.own.mk:1.694 Tue Feb 7 19:13:31 2012
+++ src/share/mk/bsd.own.mk Tue Feb 7 19:33:19 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.694 2012/02/07 19:13:31 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.695 2012/02/07 19:33:19 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -805,7 +805,7 @@ MKZFS?= yes
_MKVARS.yes= \
MKATF \
MKBINUTILS \
- MKCATPAGES MKCRYPTO MKCOMPLEX MKCVS MKCXX \
+ MKCRYPTO MKCOMPLEX MKCVS MKCXX \
MKDOC \
MKGCC MKGCCCMDS MKGDB MKGROFF \
MKHESIOD MKHTML \
@@ -813,7 +813,7 @@ _MKVARS.yes= \
MKKERBEROS \
MKKMOD \
MKLDAP MKLINKLIB MKLINT MKLVM \
- MKMAN \
+ MKMAN MKMANDOC \
MKMDNS \
MKMAKEMANDB \
MKNLS \
@@ -840,9 +840,10 @@ ${var}?= yes
# default for some platforms, see above.
#
_MKVARS.no= \
- MKBSDGREP MKBSDTAR MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG \
+ MKBSDGREP MKBSDTAR \
+ MKCATPAGES MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG \
MKDEBUGLIB MKDTRACE MKEXTSRC \
- MKMANDOC MKMANZ MKOBJDIRS \
+ MKMANZ MKOBJDIRS \
MKLLVM MKPCC \
MKPIGZGZIP \
MKREPRO \
