Module Name: src
Committed By: kamil
Date: Sun Jun 10 17:17:46 UTC 2018
Modified Files:
src/distrib/sets/lists/games: mi
src/distrib/sets/lists/misc: mi
src/distrib/sets/lists/text: mi
src/share: Makefile
src/share/mk: bsd.subdir.mk
Log Message:
Fix the MKGROFF=no MKCXX=yes build
Allow to disable building groff. This is a build tool written in C++.
This option is useful with an external toolchain configured for building the
distribution rather than building tools (e.g. C++ lookup paths may differ).
Looks ok by <christos>
Sponsored by <The NetBSD Foundation>
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/games/mi
cvs rdiff -u -r1.206 -r1.207 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/text/mi
cvs rdiff -u -r1.33 -r1.34 src/share/Makefile
cvs rdiff -u -r1.52 -r1.53 src/share/mk/bsd.subdir.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/games/mi
diff -u src/distrib/sets/lists/games/mi:1.54 src/distrib/sets/lists/games/mi:1.55
--- src/distrib/sets/lists/games/mi:1.54 Sun Aug 23 18:28:40 2015
+++ src/distrib/sets/lists/games/mi Sun Jun 10 17:17:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.54 2015/08/23 18:28:40 mrg Exp $
+# $NetBSD: mi,v 1.55 2018/06/10 17:17:46 kamil Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -96,11 +96,11 @@
./usr/libexec/ching/castching games-games-bin
./usr/libexec/ching/printching games-games-bin
./usr/share/doc/reference/ref6/rogue/rogue.html games-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref6/rogue/rogue.ps.gz games-usd-doc doc
-./usr/share/doc/reference/ref6/rogue/rogue.txt games-usd-doc doc
+./usr/share/doc/reference/ref6/rogue/rogue.ps.gz games-usd-doc doc,groff
+./usr/share/doc/reference/ref6/rogue/rogue.txt games-usd-doc doc,groff
./usr/share/doc/reference/ref6/trek/trek.html games-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref6/trek/trek.ps.gz games-usd-doc doc
-./usr/share/doc/reference/ref6/trek/trek.txt games-usd-doc doc
+./usr/share/doc/reference/ref6/trek/trek.ps.gz games-usd-doc doc,groff
+./usr/share/doc/reference/ref6/trek/trek.txt games-usd-doc doc,groff
./usr/share/doc/usd/30.rogue/Makefile games-obsolete obsolete
./usr/share/doc/usd/30.rogue/rogue.me games-obsolete obsolete
./usr/share/doc/usd/31.trek/Makefile games-obsolete obsolete
Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.206 src/distrib/sets/lists/misc/mi:1.207
--- src/distrib/sets/lists/misc/mi:1.206 Thu Feb 8 03:27:51 2018
+++ src/distrib/sets/lists/misc/mi Sun Jun 10 17:17:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.206 2018/02/08 03:27:51 christos Exp $
+# $NetBSD: mi,v 1.207 2018/06/10 17:17:46 kamil Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -439,8 +439,8 @@
./usr/share/doc/kyua-testers/README misc-obsolete obsolete
./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs-9.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs.html misc-smm-doc doc,html,groffhtmldoc
-./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs.ps.gz misc-smm-doc doc
-./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs.txt misc-smm-doc doc
+./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs.ps.gz misc-smm-doc doc,groff
+./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs.txt misc-smm-doc doc,groff
./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs1.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs10.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs11.png misc-smm-doc doc,html,groffhtmldoc
@@ -458,15 +458,15 @@
./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs8.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs9.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/papers/mckusick85-fsck/mckusick85-fsck.html misc-smm-doc doc,html,groffhtmldoc
-./usr/share/doc/papers/mckusick85-fsck/mckusick85-fsck.ps.gz misc-smm-doc doc
-./usr/share/doc/papers/mckusick85-fsck/mckusick85-fsck.txt misc-smm-doc doc
+./usr/share/doc/papers/mckusick85-fsck/mckusick85-fsck.ps.gz misc-smm-doc doc,groff
+./usr/share/doc/papers/mckusick85-fsck/mckusick85-fsck.txt misc-smm-doc doc,groff
./usr/share/doc/papers/mckusick85-fsck/mckusick85-fsck1.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/papers/mckusick85-fsck/mckusick85-fsck2.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/papers/mckusick85-fsck/mckusick85-fsck3.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/papers/mckusick85-fsck/mckusick85-fsck4.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/papers/morris78-password/morris78-password.html misc-smm-doc doc,html,groffhtmldoc
-./usr/share/doc/papers/morris78-password/morris78-password.ps.gz misc-smm-doc doc
-./usr/share/doc/papers/morris78-password/morris78-password.txt misc-smm-doc doc
+./usr/share/doc/papers/morris78-password/morris78-password.ps.gz misc-smm-doc doc,groff
+./usr/share/doc/papers/morris78-password/morris78-password.txt misc-smm-doc doc,groff
./usr/share/doc/papers/morris78-password/morris78-password1.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/psd/00.contents misc-obsolete obsolete
./usr/share/doc/psd/05.sysman/0.t misc-obsolete obsolete
@@ -553,11 +553,11 @@
./usr/share/doc/psd/Makefile misc-obsolete obsolete
./usr/share/doc/psd/Title misc-obsolete obsolete
./usr/share/doc/psd/contents.html misc-psd-doc doc,html,groffhtmldoc
-./usr/share/doc/psd/contents.ps.gz misc-psd-doc doc
-./usr/share/doc/psd/contents.txt misc-psd-doc doc
+./usr/share/doc/psd/contents.ps.gz misc-psd-doc doc,groff
+./usr/share/doc/psd/contents.txt misc-psd-doc doc,groff
./usr/share/doc/psd/title.html misc-psd-doc doc,html,groffhtmldoc
-./usr/share/doc/psd/title.ps.gz misc-psd-doc doc
-./usr/share/doc/psd/title.txt misc-psd-doc doc
+./usr/share/doc/psd/title.ps.gz misc-psd-doc doc,groff
+./usr/share/doc/psd/title.txt misc-psd-doc doc,groff
./usr/share/doc/reference/ref1/atf misc-atf-doc
./usr/share/doc/reference/ref1/atf/AUTHORS misc-atf-doc doc,atf
./usr/share/doc/reference/ref1/atf/COPYING misc-atf-doc doc,atf
@@ -565,16 +565,16 @@
./usr/share/doc/reference/ref1/atf/README misc-atf-doc doc,atf
./usr/share/doc/reference/ref1/bzip2/manual.html misc-util-htmldoc share
./usr/share/doc/reference/ref1/config/config.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref1/config/config.ps.gz misc-usd-doc doc
-./usr/share/doc/reference/ref1/config/config.txt misc-usd-doc doc
+./usr/share/doc/reference/ref1/config/config.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/reference/ref1/config/config.txt misc-usd-doc doc,groff
./usr/share/doc/reference/ref1/config/config1.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/config/config2.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/config/config3.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/config/config4.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/config/config5.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/csh/csh.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref1/csh/csh.ps.gz misc-usd-doc doc
-./usr/share/doc/reference/ref1/csh/csh.txt misc-usd-doc doc
+./usr/share/doc/reference/ref1/csh/csh.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/reference/ref1/csh/csh.txt misc-usd-doc doc,groff
./usr/share/doc/reference/ref1/csh/csh1.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/csh/csh2.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/csh/csh3.png misc-usd-doc doc,html,groffhtmldoc
@@ -585,11 +585,11 @@
./usr/share/doc/reference/ref1/csh/csh8.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/csh/csh9.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/dc misc-usd-doc
-./usr/share/doc/reference/ref1/dc/dc.ps.gz misc-usd-doc doc
-./usr/share/doc/reference/ref1/dc/dc.txt misc-usd-doc doc
+./usr/share/doc/reference/ref1/dc/dc.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/reference/ref1/dc/dc.txt misc-usd-doc doc,groff
./usr/share/doc/reference/ref1/ex/reference.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref1/ex/reference.ps.gz misc-usd-doc doc
-./usr/share/doc/reference/ref1/ex/reference.txt misc-usd-doc doc
+./usr/share/doc/reference/ref1/ex/reference.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/reference/ref1/ex/reference.txt misc-usd-doc doc,groff
./usr/share/doc/reference/ref1/ex/reference1.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/ex/reference10.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/ex/reference11.png misc-usd-doc doc,html,groffhtmldoc
@@ -618,8 +618,8 @@
./usr/share/doc/reference/ref1/ex/reference8.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/ex/reference9.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/ex/summary.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref1/ex/summary.ps.gz misc-usd-doc doc
-./usr/share/doc/reference/ref1/ex/summary.txt misc-usd-doc doc
+./usr/share/doc/reference/ref1/ex/summary.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/reference/ref1/ex/summary.txt misc-usd-doc doc,groff
./usr/share/doc/reference/ref1/ex/summary1.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/ex/summary2.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/ex/summary3.png misc-usd-doc doc,html,groffhtmldoc
@@ -644,8 +644,8 @@
./usr/share/doc/reference/ref1/gprof/gprof-8.png misc-psd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/gprof/gprof-9.png misc-psd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/gprof/gprof.html misc-psd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref1/gprof/gprof.ps.gz misc-psd-doc doc
-./usr/share/doc/reference/ref1/gprof/gprof.txt misc-psd-doc doc
+./usr/share/doc/reference/ref1/gprof/gprof.ps.gz misc-psd-doc doc,groff
+./usr/share/doc/reference/ref1/gprof/gprof.txt misc-psd-doc doc,groff
./usr/share/doc/reference/ref1/kyua misc-kyua-doc
./usr/share/doc/reference/ref1/kyua/kyua-atf-compat misc-kyua-doc
./usr/share/doc/reference/ref1/kyua/kyua-atf-compat/AUTHORS misc-kyua-doc doc,kyua
@@ -663,27 +663,27 @@
./usr/share/doc/reference/ref1/kyua/kyua-testers/NEWS misc-kyua-doc doc,kyua
./usr/share/doc/reference/ref1/kyua/kyua-testers/README misc-kyua-doc doc,kyua
./usr/share/doc/reference/ref1/mail/mail.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref1/mail/mail.ps.gz misc-usd-doc doc
-./usr/share/doc/reference/ref1/mail/mail.txt misc-usd-doc doc
+./usr/share/doc/reference/ref1/mail/mail.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/reference/ref1/mail/mail.txt misc-usd-doc doc,groff
./usr/share/doc/reference/ref1/make/make.html misc-psd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref1/make/make.ps.gz misc-psd-doc doc
-./usr/share/doc/reference/ref1/make/make.txt misc-psd-doc doc
+./usr/share/doc/reference/ref1/make/make.ps.gz misc-psd-doc doc,groff
+./usr/share/doc/reference/ref1/make/make.txt misc-psd-doc doc,groff
./usr/share/doc/reference/ref1/make/make1.png misc-psd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/make/make2.png misc-psd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/roff/memacros/memacros.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref1/roff/memacros/memacros.ps.gz misc-usd-doc doc
-./usr/share/doc/reference/ref1/roff/memacros/memacros.txt misc-usd-doc doc
+./usr/share/doc/reference/ref1/roff/memacros/memacros.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/reference/ref1/roff/memacros/memacros.txt misc-usd-doc doc,groff
./usr/share/doc/reference/ref1/roff/meref/meref.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref1/roff/meref/meref.ps.gz misc-usd-doc doc
-./usr/share/doc/reference/ref1/roff/meref/meref.txt misc-usd-doc doc
+./usr/share/doc/reference/ref1/roff/meref/meref.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/reference/ref1/roff/meref/meref.txt misc-usd-doc doc,groff
./usr/share/doc/reference/ref1/roff/msdiffs/msdiffs.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref1/roff/msdiffs/msdiffs.ps.gz misc-usd-doc doc
-./usr/share/doc/reference/ref1/roff/msdiffs/msdiffs.txt misc-usd-doc doc
+./usr/share/doc/reference/ref1/roff/msdiffs/msdiffs.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/reference/ref1/roff/msdiffs/msdiffs.txt misc-usd-doc doc,groff
./usr/share/doc/reference/ref1/roff/msdiffs/msdiffs1.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/roff/msdiffs/msdiffs2.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/roff/msmacros/msmacros.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref1/roff/msmacros/msmacros.ps.gz misc-usd-doc doc
-./usr/share/doc/reference/ref1/roff/msmacros/msmacros.txt misc-usd-doc doc
+./usr/share/doc/reference/ref1/roff/msmacros/msmacros.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/reference/ref1/roff/msmacros/msmacros.txt misc-usd-doc doc,groff
./usr/share/doc/reference/ref1/roff/msmacros/msmacros1.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/roff/msmacros/msmacros2.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/roff/msmacros/msmacros3.png misc-usd-doc doc,html,groffhtmldoc
@@ -694,28 +694,28 @@
./usr/share/doc/reference/ref1/roff/msmacros/msmacros8.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/roff/msmacros/msmacros9.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/sh/sh.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref1/sh/sh.ps.gz misc-usd-doc doc
-./usr/share/doc/reference/ref1/sh/sh.txt misc-usd-doc doc
+./usr/share/doc/reference/ref1/sh/sh.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/reference/ref1/sh/sh.txt misc-usd-doc doc,groff
./usr/share/doc/reference/ref1/sh/sh1.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/sh/sh2.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/sh/sh3.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/sh/sh4.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/sh/sh5.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref1/vi/vi.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref1/vi/vi.ps.gz misc-usd-doc doc
-./usr/share/doc/reference/ref1/vi/vi.txt misc-usd-doc doc
+./usr/share/doc/reference/ref1/vi/vi.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/reference/ref1/vi/vi.txt misc-usd-doc doc,groff
./usr/share/doc/reference/ref3/curses/curses.html misc-psd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref3/curses/curses.ps.gz misc-psd-doc doc
-./usr/share/doc/reference/ref3/curses/curses.txt misc-psd-doc doc
+./usr/share/doc/reference/ref3/curses/curses.ps.gz misc-psd-doc doc,groff
+./usr/share/doc/reference/ref3/curses/curses.txt misc-psd-doc doc,groff
./usr/share/doc/reference/ref3/sockets-advanced/sockets-advanced.html misc-psd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref3/sockets-advanced/sockets-advanced.ps.gz misc-psd-doc doc
-./usr/share/doc/reference/ref3/sockets-advanced/sockets-advanced.txt misc-psd-doc doc
+./usr/share/doc/reference/ref3/sockets-advanced/sockets-advanced.ps.gz misc-psd-doc doc,groff
+./usr/share/doc/reference/ref3/sockets-advanced/sockets-advanced.txt misc-psd-doc doc,groff
./usr/share/doc/reference/ref3/sockets/sockets.html misc-psd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref3/sockets/sockets.ps.gz misc-psd-doc doc
-./usr/share/doc/reference/ref3/sockets/sockets.txt misc-psd-doc doc
+./usr/share/doc/reference/ref3/sockets/sockets.ps.gz misc-psd-doc doc,groff
+./usr/share/doc/reference/ref3/sockets/sockets.txt misc-psd-doc doc,groff
./usr/share/doc/reference/ref3/sysman/sysman.html misc-psd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref3/sysman/sysman.ps.gz misc-psd-doc doc
-./usr/share/doc/reference/ref3/sysman/sysman.txt misc-psd-doc doc
+./usr/share/doc/reference/ref3/sysman/sysman.ps.gz misc-psd-doc doc,groff
+./usr/share/doc/reference/ref3/sysman/sysman.txt misc-psd-doc doc,groff
./usr/share/doc/reference/ref3/sysman/sysman1.png misc-psd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref3/sysman/sysman10.png misc-psd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref3/sysman/sysman11.png misc-psd-doc doc,html,groffhtmldoc
@@ -750,8 +750,8 @@
./usr/share/doc/reference/ref3/sysman/sysman8.png misc-psd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref3/sysman/sysman9.png misc-psd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref5/timed/timed.html misc-smm-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref5/timed/timed.ps.gz misc-smm-doc doc
-./usr/share/doc/reference/ref5/timed/timed.txt misc-smm-doc doc
+./usr/share/doc/reference/ref5/timed/timed.ps.gz misc-smm-doc doc,groff
+./usr/share/doc/reference/ref5/timed/timed.txt misc-smm-doc doc,groff
./usr/share/doc/reference/ref5/timed/timed1.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref5/timed/timed10.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref5/timed/timed11.png misc-smm-doc doc,html,groffhtmldoc
@@ -777,8 +777,8 @@
./usr/share/doc/reference/ref5/timed/timed8.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref5/timed/timed9.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref7/quotas/quotas.html misc-smm-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref7/quotas/quotas.ps.gz misc-smm-doc doc
-./usr/share/doc/reference/ref7/quotas/quotas.txt misc-smm-doc doc
+./usr/share/doc/reference/ref7/quotas/quotas.ps.gz misc-smm-doc doc,groff
+./usr/share/doc/reference/ref7/quotas/quotas.txt misc-smm-doc doc,groff
./usr/share/doc/reference/ref8/bind9/arm/Bv9ARM.ch01.html misc-bind-htmldoc doc
./usr/share/doc/reference/ref8/bind9/arm/Bv9ARM.ch02.html misc-bind-htmldoc doc
./usr/share/doc/reference/ref8/bind9/arm/Bv9ARM.ch03.html misc-bind-htmldoc doc
@@ -790,8 +790,8 @@
./usr/share/doc/reference/ref8/bind9/arm/Bv9ARM.ch09.html misc-bind-htmldoc doc
./usr/share/doc/reference/ref8/bind9/arm/Bv9ARM.html misc-bind-htmldoc doc
./usr/share/doc/reference/ref8/lpd/lpd.html misc-smm-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref8/lpd/lpd.ps.gz misc-smm-doc doc
-./usr/share/doc/reference/ref8/lpd/lpd.txt misc-smm-doc doc
+./usr/share/doc/reference/ref8/lpd/lpd.ps.gz misc-smm-doc doc,groff
+./usr/share/doc/reference/ref8/lpd/lpd.txt misc-smm-doc doc,groff
./usr/share/doc/reference/ref8/lpd/lpd1.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref8/lpd/lpd2.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref8/lpd/lpd3.png misc-smm-doc doc,html,groffhtmldoc
@@ -1018,20 +1018,20 @@
./usr/share/doc/reference/ref8/postfix/virtual.5.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/reference/ref8/postfix/virtual.8.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/reference/ref8/timed/timed.html misc-smm-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref8/timed/timed.ps.gz misc-smm-doc doc
-./usr/share/doc/reference/ref8/timed/timed.txt misc-smm-doc doc
+./usr/share/doc/reference/ref8/timed/timed.ps.gz misc-smm-doc doc,groff
+./usr/share/doc/reference/ref8/timed/timed.txt misc-smm-doc doc,groff
./usr/share/doc/reference/ref8/timed/timed1.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref8/timed/timed2.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref9/net/net.html misc-smm-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref9/net/net.ps.gz misc-smm-doc doc
-./usr/share/doc/reference/ref9/net/net.txt misc-smm-doc doc
+./usr/share/doc/reference/ref9/net/net.ps.gz misc-smm-doc doc,groff
+./usr/share/doc/reference/ref9/net/net.txt misc-smm-doc doc,groff
./usr/share/doc/reference/ref9/net/net1.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref9/net/net2.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref9/net/net3.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref9/net/net4.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref9/nfs/nfs.html misc-smm-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref9/nfs/nfs.ps.gz misc-smm-doc doc
-./usr/share/doc/reference/ref9/nfs/nfs.txt misc-smm-doc doc
+./usr/share/doc/reference/ref9/nfs/nfs.ps.gz misc-smm-doc doc,groff
+./usr/share/doc/reference/ref9/nfs/nfs.txt misc-smm-doc doc,groff
./usr/share/doc/smm/00.contents misc-obsolete obsolete
./usr/share/doc/smm/01.setup/0.t misc-obsolete obsolete
./usr/share/doc/smm/01.setup/1.t misc-obsolete obsolete
@@ -1127,11 +1127,11 @@
./usr/share/doc/smm/Makefile misc-obsolete obsolete
./usr/share/doc/smm/Title misc-obsolete obsolete
./usr/share/doc/smm/contents.html misc-smm-doc doc,html,groffhtmldoc
-./usr/share/doc/smm/contents.ps.gz misc-smm-doc doc
-./usr/share/doc/smm/contents.txt misc-smm-doc doc
+./usr/share/doc/smm/contents.ps.gz misc-smm-doc doc,groff
+./usr/share/doc/smm/contents.txt misc-smm-doc doc,groff
./usr/share/doc/smm/setup/setup.html misc-smm-doc doc,html,groffhtmldoc
-./usr/share/doc/smm/setup/setup.ps.gz misc-smm-doc doc
-./usr/share/doc/smm/setup/setup.txt misc-smm-doc doc
+./usr/share/doc/smm/setup/setup.ps.gz misc-smm-doc doc,groff
+./usr/share/doc/smm/setup/setup.txt misc-smm-doc doc,groff
./usr/share/doc/smm/setup/setup1.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/smm/setup/setup10.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/smm/setup/setup11.png misc-smm-doc doc,html,groffhtmldoc
@@ -1178,8 +1178,8 @@
./usr/share/doc/smm/setup/setup8.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/smm/setup/setup9.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/smm/title.html misc-smm-doc doc,html,groffhtmldoc
-./usr/share/doc/smm/title.ps.gz misc-smm-doc doc
-./usr/share/doc/smm/title.txt misc-smm-doc doc
+./usr/share/doc/smm/title.ps.gz misc-smm-doc doc,groff
+./usr/share/doc/smm/title.txt misc-smm-doc doc,groff
./usr/share/doc/usd/00.contents misc-obsolete obsolete
./usr/share/doc/usd/01.begin/Makefile misc-obsolete obsolete
./usr/share/doc/usd/01.begin/u.mac misc-obsolete obsolete
@@ -1248,8 +1248,8 @@
./usr/share/doc/usd/Makefile misc-obsolete obsolete
./usr/share/doc/usd/Title misc-obsolete obsolete
./usr/share/doc/usd/begin/begin.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/usd/begin/begin.ps.gz misc-usd-doc doc
-./usr/share/doc/usd/begin/begin.txt misc-usd-doc doc
+./usr/share/doc/usd/begin/begin.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/usd/begin/begin.txt misc-usd-doc doc,groff
./usr/share/doc/usd/begin/begin1.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/usd/begin/begin10.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/usd/begin/begin11.png misc-usd-doc doc,html,groffhtmldoc
@@ -1265,21 +1265,21 @@
./usr/share/doc/usd/begin/begin8.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/usd/begin/begin9.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/usd/contents.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/usd/contents.ps.gz misc-usd-doc doc
-./usr/share/doc/usd/contents.txt misc-usd-doc doc
+./usr/share/doc/usd/contents.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/usd/contents.txt misc-usd-doc doc,groff
./usr/share/doc/usd/edit/edit.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/usd/edit/edit.ps.gz misc-usd-doc doc
-./usr/share/doc/usd/edit/edit.txt misc-usd-doc doc
+./usr/share/doc/usd/edit/edit.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/usd/edit/edit.txt misc-usd-doc doc,groff
./usr/share/doc/usd/edit/edit1.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/usd/edit/edit2.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/usd/edit/edit3.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/usd/title.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/usd/title.ps.gz misc-usd-doc doc
-./usr/share/doc/usd/title.txt misc-usd-doc doc
+./usr/share/doc/usd/title.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/usd/title.txt misc-usd-doc doc,groff
./usr/share/doc/usd/vi misc-usd-doc doc
./usr/share/doc/usd/vi/summary.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/usd/vi/summary.ps.gz misc-usd-doc doc
-./usr/share/doc/usd/vi/summary.txt misc-usd-doc doc
+./usr/share/doc/usd/vi/summary.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/usd/vi/summary.txt misc-usd-doc doc,groff
./usr/share/doc/usd/vi/summary1.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/usd/vi/summary10.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/usd/vi/summary11.png misc-usd-doc doc,html,groffhtmldoc
@@ -1310,8 +1310,8 @@
./usr/share/doc/usd/vi/summary8.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/usd/vi/summary9.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/usd/vi/vitut.html misc-usd-doc doc,html,groffhtmldoc
-./usr/share/doc/usd/vi/vitut.ps.gz misc-usd-doc doc
-./usr/share/doc/usd/vi/vitut.txt misc-usd-doc doc
+./usr/share/doc/usd/vi/vitut.ps.gz misc-usd-doc doc,groff
+./usr/share/doc/usd/vi/vitut.txt misc-usd-doc doc,groff
./usr/share/doc/usd/vi/vitut1.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/usd/vi/vitut10.png misc-usd-doc doc,html,groffhtmldoc
./usr/share/doc/usd/vi/vitut11.png misc-usd-doc doc,html,groffhtmldoc
Index: src/distrib/sets/lists/text/mi
diff -u src/distrib/sets/lists/text/mi:1.46 src/distrib/sets/lists/text/mi:1.47
--- src/distrib/sets/lists/text/mi:1.46 Fri Dec 18 19:00:45 2015
+++ src/distrib/sets/lists/text/mi Sun Jun 10 17:17:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.46 2015/12/18 19:00:45 christos Exp $
+# $NetBSD: mi,v 1.47 2018/06/10 17:17:46 kamil Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -497,7 +497,7 @@
./usr/share/man/cat7/mandoc_tbl.0 text-mdocml-catman .cat
./usr/share/man/cat7/manuals.0 text-obsolete obsolete
./usr/share/man/cat7/mdoc.samples.0 text-groff-catman .cat,groff
-./usr/share/man/cat7/me.0 text-groff-catman .cat
+./usr/share/man/cat7/me.0 text-groff-catman .cat,groff
./usr/share/man/cat7/mm.0 text-groff-catman .cat,groff
./usr/share/man/cat7/mmse.0 text-groff-catman .cat,groff
./usr/share/man/cat7/ms.0 text-groff-catman .cat,groff
@@ -556,7 +556,7 @@
./usr/share/man/html7/mandoc_tbl.html text-mdocml-htmlman html
./usr/share/man/html7/manuals.html text-obsolete obsolete
./usr/share/man/html7/mdoc.samples.html text-groff-htmlman html,groff
-./usr/share/man/html7/me.html text-groff-htmlman html
+./usr/share/man/html7/me.html text-groff-htmlman html,groff
./usr/share/man/html7/mm.html text-groff-htmlman html,groff
./usr/share/man/html7/mmse.html text-groff-htmlman html,groff
./usr/share/man/html7/ms.html text-groff-htmlman html,groff
@@ -618,7 +618,7 @@
./usr/share/man/man7/mandoc_tbl.7 text-mdocml-man .man
./usr/share/man/man7/manuals.7 text-obsolete obsolete
./usr/share/man/man7/mdoc.samples.7 text-groff-man .man,groff
-./usr/share/man/man7/me.7 text-groff-man .man
+./usr/share/man/man7/me.7 text-groff-man .man,groff
./usr/share/man/man7/mm.7 text-groff-man .man,groff
./usr/share/man/man7/mmse.7 text-groff-man .man,groff
./usr/share/man/man7/ms.7 text-groff-man .man,groff
Index: src/share/Makefile
diff -u src/share/Makefile:1.33 src/share/Makefile:1.34
--- src/share/Makefile:1.33 Fri Aug 8 09:34:10 2014
+++ src/share/Makefile Sun Jun 10 17:17:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2014/08/08 09:34:10 apb Exp $
+# $NetBSD: Makefile,v 1.34 2018/06/10 17:17:46 kamil Exp $
# from @(#)Makefile 8.1 (Berkeley) 6/5/93
# Missing: ms
@@ -7,8 +7,13 @@
.if ${MKSHARE} != "no" || \
make(clean) || make(cleandir) || make(distclean) || make(obj)
-SUBDIR= dict doc examples legal man me misc mk \
+SUBDIR= dict examples legal man me misc mk \
tabset terminfo tmac wscons xml
+
+.if ${MKGROFF} != "no"
+SUBDIR+=doc
+.endif
+
.if ${MKNLS} != "no"
SUBDIR+=i18n locale nls
.endif
Index: src/share/mk/bsd.subdir.mk
diff -u src/share/mk/bsd.subdir.mk:1.52 src/share/mk/bsd.subdir.mk:1.53
--- src/share/mk/bsd.subdir.mk:1.52 Wed May 26 00:48:15 2010
+++ src/share/mk/bsd.subdir.mk Sun Jun 10 17:17:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.subdir.mk,v 1.52 2010/05/26 00:48:15 uwe Exp $
+# $NetBSD: bsd.subdir.mk,v 1.53 2018/06/10 17:17:46 kamil Exp $
# @(#)bsd.subdir.mk 8.1 (Berkeley) 6/8/93
.include <bsd.init.mk>
@@ -6,6 +6,8 @@
.if !defined(NOSUBDIR) # {
.for dir in ${SUBDIR}
+.if ("${dir}" != "USD.doc" && "${dir}" != "PSD.doc" && "${dir}" != "SMM.doc") \
+ || ${MKGROFF} == "yes"
.if "${dir}" == ".WAIT"
# Don't play with .WAIT
__REALSUBDIR+=${dir}
@@ -26,6 +28,7 @@ __REALSUBDIR+=${dir}
.endif
.endif
.endif
+.endif
.endfor
__recurse: .USE
