Index: projects/doctools/cddl/usr.bin/doctools/Makefile.inc
===================================================================
--- projects/doctools/cddl/usr.bin/doctools/Makefile.inc	(revision 307004)
+++ projects/doctools/cddl/usr.bin/doctools/Makefile.inc	(revision 307005)
@@ -1,13 +1,16 @@
 DOCTOOLSDIR=	${SRCTOP}/contrib/heirloom-doctools
 CFLAGS+=	-I${DOCTOOLSDIR}/include
 NO_WERROR=	yes
 LIBDIR=	/usr/libexec/doctools
 REFDIR=	${LIBDIR}/reftools
 DTSHAREDIR=	/usr/share/doctools
 FNTDIR=	${DTSHAREDIR}/font
 HYPDIR=	${DTSHAREDIR}/hyphen
 MACDIR=	${DTSHAREDIR}/tmac
 PSTDIR=	${DTSHAREDIR}/devpost/postscript
 PUBDIR=	${DTSHAREDIR}/pub
 TABDIR=	${DTSHAREDIR}/nterm
+.if defined(WORLDTMP)
+WORLDTMPDIR=	${WORLDTMP}/legacy
+.endif
 .include "../Makefile.inc"
Index: projects/doctools/cddl/usr.bin/doctools/grap/Makefile
===================================================================
--- projects/doctools/cddl/usr.bin/doctools/grap/Makefile	(revision 307004)
+++ projects/doctools/cddl/usr.bin/doctools/grap/Makefile	(revision 307005)
@@ -1,35 +1,31 @@
 PROG=	grap
 SRCS=	coord.c \
 	for.c \
 	frame.c \
 	grap.y \
 	grapl.c \
 	input.c \
 	label.c \
 	main.c \
 	misc.c \
 	plot.c \
 	print.c \
 	ticks.c \
 	version.c \
 	y.tab.h
 
 FILES=	grap.defines
 FILESDIR=	${LIBDIR}
 
 CLEANFILES=	grapl.c
 
 LIBADD=	m
 
 CFLAGS+=	-I. -I${DOCTOOLSDIR}/grap
 
-.if defined(WORLDTMP)
-CFLAGS+=	-DLIBDIR='"${WORLDTMP}/legacy/${LIBDIR}"'
-.else
-CFLAGS+=	-DLIBDIR='"${LIBDIR}"'
-.endif
+CFLAGS+=	-DLIBDIR='"${WORLDTMPDIR}${LIBDIR}"'
 
 
 .include <bsd.prog.mk>
 
 .PATH:	${DOCTOOLSDIR}/grap
Index: projects/doctools/cddl/usr.bin/doctools/ptx/Makefile
===================================================================
--- projects/doctools/cddl/usr.bin/doctools/ptx/Makefile	(revision 307004)
+++ projects/doctools/cddl/usr.bin/doctools/ptx/Makefile	(revision 307005)
@@ -1,13 +1,9 @@
 PROG=	ptx
 
 FILES=	eign
 FILESDIR=	${LIBDIR}
 
-.if defined(WORLDTMP)
-CFLAGS+=	-DLIBDIR='"${WORLDTMP}/legacy/${LIBDIR}"'
-.else
-CFLAGS+=	-DLIBDIR='"${LIBDIR}"'
-.endif
+CFLAGS+=	-DLIBDIR='"${WORLDTMPDIR}${LIBDIR}"'
 
 .include <bsd.prog.mk>
 .PATH:	${DOCTOOLSDIR}/ptx
Index: projects/doctools/cddl/usr.bin/doctools/refer/Makefile
===================================================================
--- projects/doctools/cddl/usr.bin/doctools/refer/Makefile	(revision 307004)
+++ projects/doctools/cddl/usr.bin/doctools/refer/Makefile	(revision 307005)
@@ -1,78 +1,74 @@
 SUBDIR=	papers
 PROGS=	refer addbib lookbib sortbib mkey inv hunt
 SRCS.refer= glue1.c \
 	refer1.c \
 	refer2.c \
 	refer4.c \
 	refer5.c \
 	refer6.c \
 	mkey3.c \
 	refer7.c \
 	refer8.c \
 	hunt2.c \
 	hunt3.c \
 	deliv2.c \
 	hunt5.c \
 	hunt6.c \
 	hunt8.c \
 	glue3.c \
 	hunt7.c \
 	hunt9.c \
 	glue2.c \
 	glue4.c \
 	glue5.c \
 	refer0.c \
 	shell.c
 
 SRCS.mkey=	mkey1.c \
 		mkey2.c \
 		mkey3.c \
 		deliv2.c
 
 SRCS.inv=	inv1.c \
 		inv2.c \
 		inv3.c \
 		inv5.c \
 		inv6.c \
 		deliv2.c
 
 SRCS.hunt=	hunt1.c \
 		hunt2.c \
 		hunt3.c \
 		hunt5.c \
 		hunt6.c \
 		hunt7.c \
 		glue5.c \
 		refer3.c \
 		hunt9.c \
 		shell.c \
 		deliv2.c \
 		hunt8.c \
 		glue4.c \
 		tick.c
 
 MAN.mkey=
 MAN.inv=
 MAN.hunt=
 
 SCRIPTS=	roffbib indxbib
 CLEANFILES=	roffbib indxbib
 
 BINDIR.hunt=	${LIBDIR}/reftools
 BINDIR.inv=	${LIBDIR}/reftools
 BINDIR.mkey=	${LIBDIR}/reftools
 
-.if defined(WORLDTMP)
-CFLAGS+=	-DMACDIR='"${WORLDTMP}/legacy/${MACDIR}"' -DREFDIR='"${WORLDTMP}/legacy/${REFDIR}"'
-.else
-CFLAGS+=	-DMACDIR='"${MACDIR}"' -DREFDIR='"${REFDIR}"'
-.endif
+CFLAGS+=	-DMACDIR='"${WORLDTMPDIR}${MACDIR}"' -DREFDIR='"${WORLDTMPDIR}${REFDIR}"'
 
 .SUFFIXES:	.sh
 .sh:
 	echo "#!/bin/sh" > ${.TARGET}
 	sed 's:@BINDIR@:$(BINDIR):g; s:@REFDIR@:${REFDIR}:g' ${.IMPSRC} >> ${.TARGET}
 
 .include <bsd.progs.mk>
 
 .PATH: ${DOCTOOLSDIR}/refer
Index: projects/doctools/cddl/usr.bin/doctools/tbl/Makefile
===================================================================
--- projects/doctools/cddl/usr.bin/doctools/tbl/Makefile	(revision 307004)
+++ projects/doctools/cddl/usr.bin/doctools/tbl/Makefile	(revision 307005)
@@ -1,32 +1,28 @@
 PROG=	tbl
 SRCS=	t0.c \
 	t1.c \
 	t2.c \
 	t3.c \
 	t4.c \
 	t5.c \
 	t6.c \
 	t7.c \
 	t8.c \
 	t9.c \
 	tb.c \
 	tc.c \
 	te.c \
 	tf.c \
 	tg.c \
 	ti.c \
 	tm.c \
 	ts.c \
 	tt.c \
 	tu.c \
 	tv.c
 
-.if defined(WORLDTMP)
-CFLAGS+=	-DMACDIR='"${WORLDTMP}/legacy/${MACDIR}"'
-.else
-CFLAGS+=	-DMACDIR='"${MACDIR}"'
-.endif
+CFLAGS+=	-DMACDIR='"${WORLDTMPDIR}${MACDIR}"'
 
 .include <bsd.prog.mk>
 
 .PATH: ${DOCTOOLSDIR}/tbl
Index: projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile
===================================================================
--- projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile	(revision 307004)
+++ projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile	(revision 307005)
@@ -1,69 +1,62 @@
 PROG=	nroff
 SRCS=	n10.c \
 		n6.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 \
 		draw.c \
 		bst.c \
 		version.c
 		
 
 FILESDIR=	${TABDIR}
 
 TERMSFILES=	tab.2631 tab.2631-c tab.2631-e tab.lp \
 		tab.300 tab.300-12 tab.300s tab.300s-12 tab.382 \
 		tab.4000a tab.450 tab.450-12 tab.832 \
 		tab.37 tab.8510 tab.X tab.tn300
 FILES=		${TERMSFILES} tab.utf8
 CLEANFILES=	${TERMSFILES}
 
 DPADD=	${.OBJDIR}/../libhnj/libhnj.a
 LDADD=	${.OBJDIR}/../libhnj/libhnj.a
 
 CFLAGS+=	-I${DOCTOOLSDIR}/stuff/bst -I${DOCTOOLSDIR}/troff/nroff.d \
 		-I${DOCTOOLSDIR}/troff/ -DSHELL='"/bin/sh"' \
 		-DRELEASE='"${RELEASE}"' \
-		-DNROFF -DUSG -DEUC
-.if defined(WORLDTMP)
-CFLAGS+=	-DMACDIR='"${WORLDTMP}/legacy/${MACDIR}"' \
-		-DHYPDIR='"${WORLDTMP}/legacy/${HYPDIR}"' \
-		-DFNTDIR='"${WORLDTMP}/legacy/${FNTDIR}"' \
-		-DTABDIR='"${WORLDTMP}/legacy/${TABDIR}"'
-.else
-CFLAGS+=	-DMACDIR='"${MACDIR}"' \
-		-DHYPDIR='"${HYPDIR}"' \
-		-DFNTDIR='"${FNTDIR}"' \
-		-DTABDIR='"${TABDIR}"'
-.endif
+		-DNROFF -DUSG -DEUC \
+		-DMACDIR='"${WORLDTMPDIR}${MACDIR}"' \
+		-DHYPDIR='"${WORLDTMPDIR}${HYPDIR}"' \
+		-DFNTDIR='"${WORLDTMPDIR}${FNTDIR}"' \
+		-DTABDIR='"${WORLDTMPDIR}${TABDIR}"'
 
 NLTERM=		${DOCTOOLSDIR}/troff/nroff.d/terms.d
 
 .for f in tab.2631 tab.2631-c tab.2631-e tab.lp
 $f: a.${f:E} b.lp
 	cat ${.ALLSRC} >${.TARGET}
 .endfor
 
 .for f in tab.300 tab.300-12 tab.300s tab.300s-12 tab.382 tab.4000a tab.450 tab.450-12 tab.832 
 $f: a.${f:E} b.300
 	cat ${.ALLSRC} >${.TARGET}
 .endfor
 
 .for f in tab.37 tab.8510 tab.X tab.tn300
 $f: ab.${f:E}
 	cat ${.ALLSRC} >${.TARGET}
 .endfor
 
 .include <bsd.prog.mk>
 
 RELEASE!=	awk -F= '/^RELEASE/ { print $$2 }' ${DOCTOOLSDIR}/version.mk
 .PATH:	${DOCTOOLSDIR}/troff/nroff.d ${DOCTOOLSDIR}/stuff/bst ${DOCTOOLSDIR}/troff/ ${NLTERM}
Index: projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile
===================================================================
--- projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile	(revision 307004)
+++ projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile	(revision 307005)
@@ -1,77 +1,68 @@
 SUBDIR=	\
 	dpost \
 	tmac \
 	devps \
 	devpslow \
 	devpsmed
 
 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
 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"' \
-		-DRELEASE='"${RELEASE}"'
-
-.if defined(WORLDTMP)
-CFLAGS+=	-DMACDIR='"${WORLDTMP}/legacy/${MACDIR}"' \
-		-DHYPDIR='"${WORLDTMP}/legacy/${HYPDIR}"' \
-		-DFNTDIR='"${WORLDTMP}/legacy/${FNTDIR}"' \
-		-DTABDIR='"${WORLDTMP}/legacy/${TABDIR}"' \
-		-DPSTDIR='"${WORLDTMP}/legacy/${PSTDIR}"'
-.else
-CFLAGS+=	-DMACDIR='"${MACDIR}"' \
-		-DHYPDIR='"${HYPDIR}"' \
-		-DFNTDIR='"${FNTDIR}"' \
-		-DTABDIR='"${TABDIR}"' \
-		-DPSTDIR='"${PSTDIR}"'
-.endif
+		-DRELEASE='"${RELEASE}"' \
+		-DMACDIR='"${WORLDTMPDIR}/${MACDIR}"' \
+		-DHYPDIR='"${WORLDTMPDIR}/${HYPDIR}"' \
+		-DFNTDIR='"${WORLDTMPDIR}/${FNTDIR}"' \
+		-DTABDIR='"${WORLDTMPDIR}/${TABDIR}"' \
+		-DPSTDIR='"${WORLDTMPDIR}/${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 307004)
+++ projects/doctools/cddl/usr.bin/doctools/troff/troff/tmac/Makefile	(revision 307005)
@@ -1,73 +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}
+	sed 's:@MACDIR@:${WORLDTMPDIR}${MACDIR}:; s:@LIBDIR@:${WORLDTMPDIR}${LIBDIR}:' ${.IMPSRC} >${.TARGET}
 
 .include <bsd.prog.mk>
 .PATH: ${DOCTOOLSDIR}/troff/troff.d/tmac.d