Index: projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile
===================================================================
--- projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile	(revision 306903)
+++ projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile	(revision 306904)
@@ -1,69 +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 \
-		getopt.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"' \
 		-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/dpost/Makefile
===================================================================
--- projects/doctools/cddl/usr.bin/doctools/troff/troff/dpost/Makefile	(revision 306903)
+++ projects/doctools/cddl/usr.bin/doctools/troff/troff/dpost/Makefile	(revision 306904)
@@ -1,146 +1,145 @@
 SUBDIR=	charlib
 
 PROG=	dpost
 SRCS=	dpost.c \
 	draw.c \
 	color.c \
 	pictures.c \
 	ps_include.c \
 	afm.c \
 	makedev.c \
 	glob.c \
 	misc.c \
 	request.c \
-	getopt.c \
 	asciitype.c \
 	otf.c \
 	../fontmap.c \
 	version.c \
 	bst.c
 LIBADD=	m
 FILESGROUPS=	FILESPS FILESFONT
 FILESPSDIR=	${PSTDIR}
 FILESFONTDIR=	${FNTDIR}/devpost
 FILESPS=	aps.ps \
 		baseline.ps \
 		color.ps \
 		cutmarks.ps \
 		dpost.ps \
 		draw.ps \
 		fatcourier.ps \
 		forms.ps \
 		ps_include.ps
 FILESFONT=	B \
 		AB.name \
 		AI \
 		AI.name \
 		AR \
 		AR.name \
 		AX \
 		AX.name \
 		B \
 		B.name \
 		BI \
 		BI.name \
 		CB \
 		CB.name \
 		CI \
 		CI.name \
 		CO \
 		CO.name \
 		CW \
 		CW.name \
 		CX \
 		CX.name \
 		DESC \
 		DESC.big \
 		DESC.small \
 		FONTMAP \
 		GR \
 		GR.name \
 		H \
 		H.name \
 		HB \
 		HB.name \
 		HI \
 		HI.name \
 		HNB \
 		HNB.name \
 		HNBI \
 		HNBI.name \
 		HNI \
 		HNI.name \
 		HNR \
 		HNR.name \
 		HX \
 		HX.name \
 		I \
 		I.name \
 		KB \
 		KB.name \
 		KI \
 		KI.name \
 		KR \
 		KR.name \
 		KX \
 		KX.name \
 		NB \
 		NB.name \
 		NI \
 		NI.name \
 		NR \
 		NR.name \
 		NX \
 		NX.name \
 		PA \
 		PA.name \
 		PB \
 		PB.name \
 		PI \
 		PI.name \
 		PX \
 		PX.name \
 		R \
 		R.name \
 		S \
 		S.big \
 		S.name \
 		S.small \
 		S1 \
 		S1.name \
 		VB \
 		VB.name \
 		VI \
 		VI.name \
 		VR \
 		VR.name \
 		VX \
 		VX.name \
 		ZD \
 		ZD.name \
 		ZI \
 		ZI.name \
 
 SYMLINKS+=	H ${FNTDIR}/devpost/G \
 		H ${FNTDIR}/devpost/HM \
 		H ${FNTDIR}/devpost/HK \
 		H ${FNTDIR}/devpost/HL \
 		HI ${FNTDIR}/devpost/GI \
 
 CFLAGS+=	-I${DOCTOOLSDIR}/stuff/bst -I${DOCTOOLSDIR}/troff/troff.d/dpost.d-I${DOCTOOLSDIR}/troff/troff.d/dpost.d \
 		-I${DOCTOOLSDIR}/troff/troff.d/ \
 		-DMACDIR='"${MACDIR}"' \
 		-DRELEASE='"${RELEASE}"' \
 		-DHYPDIR='"${HYPDIR}"' \
 		-DFNTDIR='"${FNTDIR}"' \
 		-DTABDIR='"${TABDIR}"' \
 		-DPSTDIR='"${PSTDIR}"' \
 
 .include <bsd.prog.mk>
 
 RELEASE!=	awk -F= '/^RELEASE/ { print $$2 }' ${DOCTOOLSDIR}/version.mk
 .PATH:	${DOCTOOLSDIR}/stuff/bst
 .PATH:	${DOCTOOLSDIR}/troff/troff.d/dpost.d
 .PATH:	${DOCTOOLSDIR}/troff
 .PATH:	${DOCTOOLSDIR}/troff/troff.d/postscript
 .PATH:	${DOCTOOLSDIR}/troff/troff.d/font/devpost