Index: projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile
===================================================================
--- projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile	(revision 306883)
+++ projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile	(revision 306884)
@@ -1,65 +1,66 @@
 SUBDIR=	\
-	dpost
+	dpost \
+	tmac
 
 PROGS=	troff \
 	devaps \
 	dhtml
 
 SRCS.troff=	t10.c \
 		t6.c \
 		hytab.c \
 		n1.c \
 		n2.c \
 		n3.c \
 		n4.c \
 		n5.c \
 		n7.c \
 		n8.c \
 		n9.c \
 		ni.c \
 		nii.c \
 		suftab.c \
 		makedev.c \
 		afm.c \
 		otf.c \
 		unimap.c \
 		version.c \
 		fontmap.c \
 		bst.c
 CFLAGS.troff= -DUSG -DEUC
 
 DPADD.troff=	${.OBJDIR}/../libhnj/libhnj.a
 LDADD.troff=	${.OBJDIR}/../libhnj/libhnj.a
 
 SRCS.devaps=	daps.c \
 		build.c \
 		draw.c \
 		getopt.c
 LIBADD.devaps=	m
 MAN.devaps=
 
 SRCS.dhtml=	main.c \
 		dhtml.l \
 		tr_out.c \
 		char.c \
 		lib.c \
 		bst.c
 
 CFLAGS.dhtml+=	-I${DOCTOOLSDIR}/troff/troff.d/dhtml
 
 
 CFLAGS+=	-I${DOCTOOLSDIR}/stuff/bst -I${DOCTOOLSDIR}/troff/troff.d \
 		-I${DOCTOOLSDIR}/troff/ -DSHELL='"/bin/sh"' \
 		-DMACDIR='"${MACDIR}"' \
 		-DRELEASE='"${RELEASE}"' \
 		-DHYPDIR='"${HYPDIR}"' \
 		-DFNTDIR='"${FNTDIR}"' \
 		-DTABDIR='"${TABDIR}"' \
 		-DPSTDIR='"${PSTDIR}"' \
 
 .include <bsd.progs.mk>
 
 RELEASE!=	awk -F= '/^RELEASE/ { print $$2 }' ${DOCTOOLSDIR}/version.mk
 .PATH:	${DOCTOOLSDIR}/troff/troff.d ${DOCTOOLSDIR}/stuff/bst ${DOCTOOLSDIR}/troff/
 .PATH:	${DOCTOOLSDIR}/troff/troff.d/devaps
 .PATH:	${DOCTOOLSDIR}/troff/troff.d/dhtml
Index: projects/doctools/cddl/usr.bin/doctools/troff/troff/tmac/Makefile
===================================================================
--- projects/doctools/cddl/usr.bin/doctools/troff/troff/tmac/Makefile	(revision 306883)
+++ projects/doctools/cddl/usr.bin/doctools/troff/troff/tmac/Makefile	(revision 306884)
@@ -1,17 +1,73 @@
 SRCS=	pm.in \
 	andoc.in \
 	bib.in \
 	doc.in \
 	e.in \
 	g.in \
 	m.in \
 	s.in
 
+GENFILES=	an \
+		bib \
+		doc \
+		g \
+		pm \
+		andoc \
+		doc-ditroff \
+		e \
+		m \
+		s
+CLEANFILES+=	${GENFILES}
+
+FILES=	acm.me \
+	deltext.me \
+	eqn.me \
+	local.me \
+	ms.acc \
+	ms.tbl\
+	null.me \
+	refer.me \
+	taa \
+	v \
+	an-ext \
+	doc-common \
+	float.me \
+	mmn \
+	ms.cov \
+	ms.ths \
+	padj \
+	safe \
+	tbl.me \
+	vgrind \
+	chars.me \
+	doc-nroff \
+	footnote.me \
+	mmt \
+	ms.eqn \
+	ms.toc \
+	pictures \
+	sh.me \
+	thesis.me \
+	color \
+	doc-syms \
+	index.me \
+	ms.ref \
+	naa \
+	ptx \
+	srefs \
+	tmac.gchar \
+	${GENFILES}
+
+FILESDIR=	${MACDIR}
+
+MAN=	mcolor.7 mpictures.7 man.7
+
 IMACS=	an \
 	doc-ditroff
 
 .SUFFIXES: .in
 .in:
 	sed 's:@MACDIR@:${MACDIR}:; s:@LIBDIR@:${LIBDIR}:' ${.IMPSRC} >${.TARGET}
 
 .include <bsd.prog.mk>
+.PATH: ${DOCTOOLSDIR}/troff/troff.d/tmac.d