1 files changed, 225 insertions, 126 deletions

diff --git a/devel/mkcmd/pkg-plist b/devel/mkcmd/pkg-plist
index 74f8ed7a49c9..46990f9e936c 100644
--- a/devel/mkcmd/pkg-plist
+++ b/devel/mkcmd/pkg-plist
@@ -1,129 +1,228 @@
 bin/mkcmd
-share/mkcmd/Template.m
-share/mkcmd/bytes.m
-share/mkcmd/client.m
-share/mkcmd/client.mi
-share/mkcmd/cmd.m
-share/mkcmd/cmd.mc
-share/mkcmd/cmd.mi
-share/mkcmd/cmd_add.m
-share/mkcmd/cmd_add.mc
-share/mkcmd/cmd_cd.m
-share/mkcmd/cmd_cd.mc
-share/mkcmd/cmd_echo.m
-share/mkcmd/cmd_exec.m
-share/mkcmd/cmd_exec.mc
-share/mkcmd/cmd_exit.m
-share/mkcmd/cmd_help.m
-share/mkcmd/cmd_help.mc
-share/mkcmd/cmd_macro.m
-share/mkcmd/cmd_merge.m
-share/mkcmd/cmd_parse.m
-share/mkcmd/cmd_parse.mc
-share/mkcmd/cmd_shell.m
-share/mkcmd/cmd_shell.mc
-share/mkcmd/cmd_source.m
-share/mkcmd/cmd_source.mc
-share/mkcmd/cmd_umask.m
-share/mkcmd/cmd_umask.mc
-share/mkcmd/cmd_version.m
-share/mkcmd/date.m
-share/mkcmd/dir.m
-share/mkcmd/dir_check.m
-share/mkcmd/dir_check.mc
+share/mkcmd/type/Template.m
+share/mkcmd/type/bytes.m
+share/mkcmd/type/bytes.mi
+share/mkcmd/type/client.m
+share/mkcmd/type/bsd.m
+share/mkcmd/type/client.mi
+share/mkcmd/type/cmd.m
+share/mkcmd/type/cmd.mc
+share/mkcmd/type/cmd.mi
+share/mkcmd/type/date.m
+share/mkcmd/type/dir.m
+share/mkcmd/type/enum.m
+share/mkcmd/type/enum.mc
+share/mkcmd/type/enum.mh
+share/mkcmd/type/enum.mi
+share/mkcmd/type/filesystem.m
+share/mkcmd/type/filesystem.mc
+share/mkcmd/type/filesystem.mi
+share/mkcmd/type/getopt.m
+share/mkcmd/type/getopt.mc
+share/mkcmd/type/getopt.mi
+share/mkcmd/type/hosttype.m
+share/mkcmd/type/hosttype.mh
+share/mkcmd/type/inches.m
+share/mkcmd/type/inches.mi
+share/mkcmd/type/rc.m
+share/mkcmd/type/seconds.m
+share/mkcmd/type/seconds.mi
+share/mkcmd/type/group.m
+share/mkcmd/type/group.mc
+share/mkcmd/type/login.m
+share/mkcmd/type/login.mc
+share/mkcmd/type/host.m
+share/mkcmd/type/host.mc
+share/mkcmd/type/host.mi
+share/mkcmd/type/protocol.m
+share/mkcmd/type/protocol.mc
+share/mkcmd/type/service.m
+share/mkcmd/type/service.mc
+share/mkcmd/type/server.m
+share/mkcmd/type/server.mi
+share/mkcmd/type/socket.m
+share/mkcmd/type/socket.mh
+share/mkcmd/type/socket.mi
+share/mkcmd/type/time.m
+share/mkcmd/type/timebox.m
+@dirrm share/mkcmd/type
+share/mkcmd/cmd/add.m
+share/mkcmd/cmd/add.mc
+share/mkcmd/cmd/cd.m
+share/mkcmd/cmd/cd.mc
+share/mkcmd/cmd/dl.m
+share/mkcmd/cmd/dl.mc
+share/mkcmd/cmd/echo.m
+share/mkcmd/cmd/exec.m
+share/mkcmd/cmd/exec.mc
+share/mkcmd/cmd/exit.m
+share/mkcmd/cmd/help.m
+share/mkcmd/cmd/help.mc
+share/mkcmd/cmd/macro.m
+share/mkcmd/cmd/merge.m
+share/mkcmd/cmd/parse.m
+share/mkcmd/cmd/parse.mc
+share/mkcmd/cmd/shell.m
+share/mkcmd/cmd/shell.mc
+share/mkcmd/cmd/source.m
+share/mkcmd/cmd/source.mc
+share/mkcmd/cmd/umask.m
+share/mkcmd/cmd/umask.mc
+share/mkcmd/cmd/version.m
+@dirrm share/mkcmd/cmd
+share/mkcmd/dir/check.m
+share/mkcmd/dir/check.mc
+@dirrm share/mkcmd/dir
+share/mkcmd/example/cgi.m
+share/mkcmd/example/cmd.m
+share/mkcmd/example/date.m
+share/mkcmd/example/dir.m
+share/mkcmd/example/dl.m
+share/mkcmd/example/dumpdates.m
+share/mkcmd/example/enum.m
+share/mkcmd/example/filter.m
+share/mkcmd/example/fts.m
+share/mkcmd/example/glob.m
+share/mkcmd/example/lex.m
+share/mkcmd/example/macro.m
+share/mkcmd/example/mult.m
+share/mkcmd/example/nettime.m
+share/mkcmd/example/rc.m
+share/mkcmd/example/rls.m
+share/mkcmd/example/rls.x
+share/mkcmd/example/rlsd.m
+share/mkcmd/example/server.m
+share/mkcmd/example/time.m
+share/mkcmd/example/timebox.m
+@dirrm share/mkcmd/example
 share/mkcmd/enum.info
-share/mkcmd/enum.m
-share/mkcmd/enum.mc
-share/mkcmd/enum.mh
-share/mkcmd/enum.mi
-share/mkcmd/example_cgi.m
-share/mkcmd/example_cmd.m
-share/mkcmd/example_date.m
-share/mkcmd/example_dir.m
-share/mkcmd/example_dumpdates.m
-share/mkcmd/example_enum.m
-share/mkcmd/example_filter.m
-share/mkcmd/example_fts.m
-share/mkcmd/example_glob.m
-share/mkcmd/example_lex.m
-share/mkcmd/example_macro.m
-share/mkcmd/example_mult.m
-share/mkcmd/example_nettime.m
-share/mkcmd/example_rc.m
-share/mkcmd/example_server.m
-share/mkcmd/example_time.m
-share/mkcmd/example_timebox.m
-share/mkcmd/getopt.m
-share/mkcmd/getopt.mc
-share/mkcmd/getopt.mi
-share/mkcmd/glob_ieee.m
-share/mkcmd/glob_ieee.mc
-share/mkcmd/hosttype.m
-share/mkcmd/hosttype.mh
-share/mkcmd/inches.m
-share/mkcmd/rc.m
-share/mkcmd/seconds.m
-share/mkcmd/server.m
-share/mkcmd/server.mi
-share/mkcmd/socket.m
-share/mkcmd/socket.mh
-share/mkcmd/socket.mi
-share/mkcmd/std_control.m
-share/mkcmd/std_datehdr.m
-share/mkcmd/std_filter.m
-share/mkcmd/std_fts.m
-share/mkcmd/std_help.m
-share/mkcmd/std_lex.m
-share/mkcmd/std_lex.mc
-share/mkcmd/std_macro.m
-share/mkcmd/std_macro.mc
-share/mkcmd/std_macro.mh
-share/mkcmd/std_macro.mi
-share/mkcmd/std_noargs.m
-share/mkcmd/std_targets.m
-share/mkcmd/std_version.m
-share/mkcmd/std_xdev.m
-share/mkcmd/time.m
-share/mkcmd/time_tz.m
-share/mkcmd/timebox.m
-share/mkcmd/util_by.m
-share/mkcmd/util_cgi.m
-share/mkcmd/util_cgi.mc
-share/mkcmd/util_client.m
-share/mkcmd/util_client.mc
-share/mkcmd/util_daemon.m
-share/mkcmd/util_daemon.mc
-share/mkcmd/util_daemon.mh
-share/mkcmd/util_date.m
-share/mkcmd/util_date.mc
-share/mkcmd/util_date.mi
-share/mkcmd/util_fgetln.m
-share/mkcmd/util_fgetln.mc
-share/mkcmd/util_fts.m
-share/mkcmd/util_fts.mc
-share/mkcmd/util_glob.m
-share/mkcmd/util_home.m
-share/mkcmd/util_home.mc
-share/mkcmd/util_mult.m
-share/mkcmd/util_mult.mc
-share/mkcmd/util_mult.mi
-share/mkcmd/util_rc.m
-share/mkcmd/util_rc.mc
-share/mkcmd/util_rc.mi
-share/mkcmd/util_server.m
-share/mkcmd/util_server.mc
-share/mkcmd/util_socket.m
-share/mkcmd/util_socket.mc
-share/mkcmd/util_socket.mi
-share/mkcmd/util_time.m
-share/mkcmd/util_time.mc
-share/mkcmd/util_time.mh
-share/mkcmd/util_time.mi
-share/mkcmd/util_timebox.m
-share/mkcmd/util_timebox.mc
-share/mkcmd/util_timebox.mi
-share/mkcmd/util_tmp.m
-share/mkcmd/util_username.m
-share/mkcmd/util_username.mc
-share/mkcmd/util_whittle.m
+share/mkcmd/glob/ieee.m
+share/mkcmd/glob/ieee.mc
+@dirrm share/mkcmd/glob
+share/mkcmd/rpc/client.m
+share/mkcmd/rpc/server.m
+share/mkcmd/rpc/server.mc
+@dirrm share/mkcmd/rpc
+share/mkcmd/std/control.m
+share/mkcmd/std/datehdr.m
+share/mkcmd/std/filter.m
+share/mkcmd/std/fts.m
+share/mkcmd/std/help.m
+share/mkcmd/std/lex.m
+share/mkcmd/std/lex.mc
+share/mkcmd/std/macro.m
+share/mkcmd/std/macro.mc
+share/mkcmd/std/macro.mh
+share/mkcmd/std/macro.mi
+share/mkcmd/std/noargs.m
+share/mkcmd/std/targets.m
+share/mkcmd/std/version.m
+share/mkcmd/std/xdev.m
+@dirrm share/mkcmd/std
+share/mkcmd/time/tz.m
+@dirrm share/mkcmd/time
+share/mkcmd/tftp/client.m
+share/mkcmd/tftp/client.mc
+share/mkcmd/tftp/client.mh
+share/mkcmd/tftp/client.mi
+share/mkcmd/tftp/server.m
+share/mkcmd/tftp/server.mc
+share/mkcmd/tftp/server.mh
+share/mkcmd/tftp/server.mi
+@dirrm share/mkcmd/tftp
+share/mkcmd/util/by.m
+share/mkcmd/util/cgi.m
+share/mkcmd/util/cgi.mc
+share/mkcmd/util/client.m
+share/mkcmd/util/client.mc
+share/mkcmd/util/daemon.m
+share/mkcmd/util/daemon.mc
+share/mkcmd/util/daemon.mh
+share/mkcmd/util/date.m
+share/mkcmd/util/date.mc
+share/mkcmd/util/date.mi
+share/mkcmd/util/fgetln.m
+share/mkcmd/util/fgetln.mc
+share/mkcmd/util/dl.m
+share/mkcmd/util/dl.mc
+share/mkcmd/util/errno.m
+share/mkcmd/util/fts.m
+share/mkcmd/util/fts.mc
+share/mkcmd/util/glob.m
+share/mkcmd/util/editor.m
+share/mkcmd/util/editor.mc
+share/mkcmd/util/editor.mh
+share/mkcmd/util/editor.mi
+share/mkcmd/util/fsearch.m
+share/mkcmd/util/fsearch.mc
+share/mkcmd/util/fsearch.mh
+share/mkcmd/util/home.m
+share/mkcmd/util/fsearch.mi
+share/mkcmd/util/getlogingr.m
+share/mkcmd/util/getlogingr.mi
+share/mkcmd/util/getlogingr.mc
+share/mkcmd/util/herror.m
+share/mkcmd/util/home.mc
+share/mkcmd/util/home.mh
+share/mkcmd/util/home.mi
+share/mkcmd/util/mult.m
+share/mkcmd/util/mult.mc
+share/mkcmd/util/mult.mi
+share/mkcmd/util/rc.m
+share/mkcmd/util/rc.mc
+share/mkcmd/util/rc.mi
+share/mkcmd/util/server.m
+share/mkcmd/util/server.mc
+share/mkcmd/util/socket.m
+share/mkcmd/util/socket.mc
+share/mkcmd/util/socket.mi
+share/mkcmd/util/time.m
+share/mkcmd/util/savehostent.m
+share/mkcmd/util/savehostent.mc
+share/mkcmd/util/savehostent.mi
+share/mkcmd/util/savegrent.m
+share/mkcmd/util/savegrent.mc
+share/mkcmd/util/savegrent.mh
+share/mkcmd/util/savegrent.mi
+share/mkcmd/util/savepwent.m
+share/mkcmd/util/savepwent.mc
+share/mkcmd/util/savepwent.mh
+share/mkcmd/util/savepwent.mi
+share/mkcmd/util/saveservent.m
+share/mkcmd/util/saveservent.mc
+share/mkcmd/util/saveservent.mi
+share/mkcmd/util/sigret.m
+share/mkcmd/util/sigret.mi
+share/mkcmd/util/tftp.m
+share/mkcmd/util/tftp.mh
+share/mkcmd/util/tftp.mi
+share/mkcmd/util/tftp.mc
+share/mkcmd/util/time.mc
+share/mkcmd/util/time.mh
+share/mkcmd/util/time.mi
+share/mkcmd/util/timebox.m
+share/mkcmd/util/timebox.mc
+share/mkcmd/util/timebox.mi
+share/mkcmd/util/tmp.m
+share/mkcmd/util/username.m
+share/mkcmd/util/username.mh
+share/mkcmd/util/username.mi
+share/mkcmd/util/username.mc
+share/mkcmd/util/unity.m
+share/mkcmd/util/unity.mh
+share/mkcmd/util/unity.mi
+share/mkcmd/util/unity.mc
+share/mkcmd/util/whittle.m
+share/mkcmd/util/zombie.m
+share/mkcmd/util/zombie.mc
+@dirrm share/mkcmd/util
+share/mkcmd/xdr/Cargv.m
+share/mkcmd/xdr/Cargv.mc
+share/mkcmd/xdr/Cargv.mh
+share/mkcmd/xdr/Cargv.mi
+share/mkcmd/xdr/Cstring.m
+share/mkcmd/xdr/Cstring.mc
+share/mkcmd/xdr/Cstring.mh
+share/mkcmd/xdr/Cstring.mi
+@dirrm share/mkcmd/xdr
 @dirrm share/mkcmd