Finish integration.  Use mandoc_preconv, etc.

@@ -22,15 +22,16 @@
 # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
 # Copyright (c) 2012 Joyent, Inc.  All rights reserved.
 # Copyright (c) 2012 by Delphix. All rights reserved.
 # Copyright (c) 2013 DEY Storage Systems, Inc. All rights reserved.
+# Copyright 2014 Garrett D'Amore <garrett@damore.org>
 
 include ../Makefile.master
 
 #
-#       Note that the commands 'agents', 'lp', 'perl', and 'man' are first in
+#       Note that the commands 'lp', and 'perl' are first in
 #       the list, violating alphabetical order.  This is because they are very
 #       long-running and should be given the most wall-clock time for a
 #       parallel build.
 #
 #       Commands in the FIRST_SUBDIRS list are built before starting the build

@@ -50,11 +51,10 @@
 COMMON_SUBDIRS=         \
         allocate        \
         availdevs       \
         lp              \
         perl            \
-        man             \
         Adm             \
         abi             \
         adbgen          \
         acct            \
         acctadm         \

@@ -250,10 +250,12 @@
         mach            \
         machid          \
         mail            \
         mailx           \
         makekey         \
+        man             \
+        mandoc          \
         mdb             \
         mesg            \
         mkdir           \
         mkfifo          \
         mkfile          \

@@ -496,16 +498,15 @@
         sf880drd        \
         virtinfo        \
         vntsd
 
 #
-# Commands that are messaged.  Note that 'lp' and 'man' come first
-# (see previous comment about 'lp' and 'man').
+# Commands that are messaged.  Note that 'lp' comes first
+# (see previous comment about 'lp'.)
 #
 MSGSUBDIRS=             \
         lp              \
-        man             \
         abi             \
         acctadm         \
         allocate        \
         asa             \
         audio           \

@@ -615,10 +616,11 @@
         logins          \
         ls              \
         luxadm          \
         lvm             \
         mailx           \
+        man             \
         mesg            \
         mkdir           \
         mkpwdict        \
         mktemp          \
         more            \