Upgrade to Groff 1.17.

98 files changed, 956 insertions, 632 deletions

diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile
index 70e457f..7c61f71 100644
--- a/gnu/usr.bin/groff/Makefile
+++ b/gnu/usr.bin/groff/Makefile
@@ -1,15 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=		libgroff libdriver libbib \
-		addftinfo afmtodit doc eqn grn \
-		grodvi groff grog grohtml grolbp grolj4 grops grotty \
-		hpftodit indxbib lkbib lookbib man mm nroff \
-		pfbtops pic refer tbl tfmtodit tmac troff \
-		devX100 devX100-12 devX75 devX75-12 devascii devcp1047 \
-		devdvi devhtml devkoi8-r devlatin1 devlbp devlj4 devps \
-		devutf8
-
-# BSD already provides soelim and we don't want xditview compiled by default
-MISC=		soelim xditview
+SUBDIR=		contrib doc font man src tmac
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/Makefile.cfg b/gnu/usr.bin/groff/Makefile.cfg
deleted file mode 100644
index af7dc67..0000000
--- a/gnu/usr.bin/groff/Makefile.cfg
+++ /dev/null
@@ -1,145 +0,0 @@
-# $FreeBSD$
-
-BINDIR?=	/usr/bin
-SHELL=		/bin/sh
-
-# Define `page' to be letter if your PostScript printer uses 8.5x11
-# paper (USA) and define it to be A4, if it uses A4 paper (rest of the
-# world).
-PAGE=letter
-
-# Normally the Postscript driver, grops, produces output that conforms
-# to version 3.0 of the Adobe Document Structuring Conventions.
-# Unfortunately some spoolers and previewers can't handle such output.
-# The BROKEN_SPOOLER_FLAGS variable tells grops what it should do to
-# make its output acceptable to such programs.  This variable controls
-# only the default behaviour of grops; the behaviour can be changed at
-# runtime by the grops -b option (and so by groff -P-b).
-# Use a value of 0 if your spoolers and previewers are able to handle
-# conforming PostScript correctly.
-# Add 1 if no %%{Begin,End}DocumentSetup comments should be generated;
-# this is needed for early versions of TranScript that get confused by
-# anything between the %%EndProlog line and the first %%Page: comment.
-# Add 2 if lines in included files beginning with %! should be
-# stripped out; this is needed for the OpenWindows 2.0 pageview previewer.
-# Add 4 if %%Page, %%Trailer and %%EndProlog comments should be
-# stripped out of included files; this is needed for spoolers that
-# don't understand the %%{Begin,End}Document comments. I suspect this
-# includes early versions of TranScript.
-# Add 8 if the first line of the PostScript output should be %!PS-Adobe-2.0
-# rather than %!PS-Adobe-3.0; this is needed when using Sun's Newsprint
-# with a printer that requires page reversal.
-BROKEN_SPOOLER_FLAGS=7
-
-# PSPRINT is the command to use for printing a PostScript file,
-# for example `lpr'.
-PSPRINT=lpr
-
-# DVIPRINT is the command to use for printing a TeX dvi file,
-# for example `lpr -d'.
-DVIPRINT=lpr -d
-########################################################################
-# Don't touch...
-
-g=
-tmac_s_prefix=
-tmac_m_prefix=
-tmac_an_prefix=
-device=ps
-fontdir=/usr/share/groff_font
-fontpath=$(fontdir)
-tmacdir=/usr/share/tmac
-tmacpath=$(tmacdir)
-indexext=.i
-common_words_file=/usr/share/dict/eign
-indexdir=/usr/share/dict/papers
-indexname=Ind
-
-########################################################################
-# Libraries
-
-# Bad assumption, if one exists they all exist
-.if exists(${.OBJDIR}/../libgroff)
-LIBGROFF=	$(.OBJDIR)/../libgroff/libgroff.a
-LIBDRIVER=	$(.OBJDIR)/../libdriver/libdriver.a
-LIBBIB=		$(.OBJDIR)/../libbib/libbib.a
-.else
-LIBGROFF=	$(.CURDIR)/../libgroff/libgroff.a
-LIBDRIVER=	$(.CURDIR)/../libdriver/libdriver.a
-LIBBIB=		$(.CURDIR)/../libbib/libbib.a
-.endif
-
-DEFINES=	-DHAVE_UNISTD_H=1\
-		-DHAVE_DIRENT_H=1\
-		-DHAVE_LIMITS_H=1\
-		-DHAVE_STDLIB_H=1\
-		-DHAVE_STRING_H=1\
-		-DHAVE_STRINGS_H=1\
-		-DHAVE_MATH_H=1\
-		-DRET_TYPE_SRAND_IS_VOID=1\
-		-DHAVE_SYS_NERR=1\
-		-DHAVE_SYS_ERRLIST=1\
-		-DHAVE_CC_LIMITS_H=1\
-		-DRETSIGTYPE=void\
-		-DHAVE_STRUCT_EXCEPTION=1\
-		-DHAVE_GETPAGESIZE=1\
-		-DHAVE_MMAP=1\
-		-DHAVE_FMOD=1\
-		-DHAVE_STRTOL=1\
-		-DHAVE_GETCWD=1\
-		-DHAVE_STRERROR=1\
-		-DHAVE_PUTENV=1\
-		-DHAVE_RENAME=1\
-		-DHAVE_MKSTEMP=1\
-		-DHAVE_STRCASECMP=1\
-		-DHAVE_STRNCASECMP=1\
-		-DHAVE_STRSEP=1\
-		-DHAVE_STRDUP=1\
-		-DSYS_SIGLIST_DECLARED=1
-
-INCLUDES=	-I$(GROFF_DIST)/include
-
-CFLAGS+=$(DEFINES) $(INCLUDES)
-CXXFLAGS+= -fno-rtti -fno-exceptions
-
-.y.o:
-	$(YACC) $(YFLAGS) $(.IMPSRC)
-	mv -f y.tab.c $(.PREFIX).cc
-	mv -f y.tab.h $(.PREFIX)_tab.h
-	${CXX} ${CXXFLAGS} -c $(.PREFIX).cc -o ${.TARGET}
-
-.y.cc:
-	$(YACC) $(YFLAGS) $(.IMPSRC)
-	mv -f y.tab.c $(.PREFIX).cc
-	mv -f y.tab.h $(.PREFIX)_tab.h
-
-.SUFFIXES: .man .1 .2 .3 .4 .5 .6 .7 .8
-
-version=`cat $(GROFF_DIST)/VERSION`
-revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION`
-
-.man.8 .man.7 .man.6 .man.5 .man.4 .man.3 .man.2 .man.1:
-	@${ECHO} Making $@ from $<
-	@-rm -f $@
-	@sed -e "s;@FONTDIR@;$(fontdir);g" \
-	-e "s;@FONTPATH@;$(fontpath);g" \
-	-e "s;@MACRODIR@;$(tmacdir);g" \
-	-e "s;@MACROPATH@;$(tmacpath);g" \
-	-e "s;@DEVICE@;$(device);g" \
-	-e "s;@DEFAULT_INDEX@;$(indexdir)/$(indexname);g" \
-	-e "s;@DEFAULT_INDEX_NAME@;$(indexname);g" \
-	-e "s;@INDEX_SUFFIX@;$(indexext);g" \
-	-e "s;@COMMON_WORDS_FILE@;$(common_words_file);g" \
-	-e "s;@MAN1EXT@;1;g" \
-	-e "s;@MAN5EXT@;5;g" \
-	-e "s;@MAN7EXT@;7;g" \
-	-e "s;@TMAC_S_PREFIX@;$(tmac_s_prefix);g" \
-	-e "s;@TMAC_M_PREFIX@;$(tmac_m_prefix);g" \
-	-e "s;@TMAC_AN_PREFIX@;$(tmac_an_prefix);g" \
-	-e "s;@TMAC_MDIR@;$(tmacdir)/mm;g" \
-	-e "s;@BROKEN_SPOOLER_FLAGS@;$(BROKEN_SPOOLER_FLAGS);g" \
-	-e "s;@VERSION@;$(version)$(revision);g" \
-	-e "s;@MDATE@;`$(SHELL) ${GROFF_DIST}/mdate.sh $<`;g" \
-	-e "s;@g@;$(g);g" \
-	-e "s;@G@;`echo $(g) | tr [a-z] [A-Z]`;g" \
-	$< >$@
diff --git a/gnu/usr.bin/groff/Makefile.dev b/gnu/usr.bin/groff/Makefile.dev
deleted file mode 100644
index dcff4f8..0000000
--- a/gnu/usr.bin/groff/Makefile.dev
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include "../Makefile.cfg"
-
-FONTDIR?=	/usr/share/groff_font
-DEVICEDIR?=	$(FONTDIR)/dev$(DEV)
-FONTOWN?=	${BINOWN}
-FONTGRP?=	${BINGRP}
-FONTMODE?=	${NOBINMODE}
-
-all:	$(DEVFILES)
-
-beforeinstall: ${DEVFILES}
-	${INSTALL} -c -o ${FONTOWN} -g ${FONTGRP} -m ${FONTMODE} \
-		${.ALLSRC} ${DESTDIR}${DEVICEDIR}
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc
index 81e8c5f..d5cd9fb 100644
--- a/gnu/usr.bin/groff/Makefile.inc
+++ b/gnu/usr.bin/groff/Makefile.inc
@@ -1,6 +1,165 @@
 # $FreeBSD$
 
-GROFF_DIST?=	${.CURDIR}/../../../../contrib/groff
-DIST_DIR=	${GROFF_DIST}/${.CURDIR:T}
+BINDIR?=	/usr/bin
+SHELL=		/bin/sh
 
+# Define `page' to be letter if your PostScript printer uses 8.5x11
+# paper (USA) and define it to be A4, if it uses A4 paper (rest of the
+# world).
+PAGE=letter
+
+# Normally the Postscript driver, grops, produces output that conforms
+# to version 3.0 of the Adobe Document Structuring Conventions.
+# Unfortunately some spoolers and previewers can't handle such output.
+# The BROKEN_SPOOLER_FLAGS variable tells grops what it should do to
+# make its output acceptable to such programs.  This variable controls
+# only the default behaviour of grops; the behaviour can be changed at
+# runtime by the grops -b option (and so by groff -P-b).
+# Use a value of 0 if your spoolers and previewers are able to handle
+# conforming PostScript correctly.
+# Add 1 if no %%{Begin,End}DocumentSetup comments should be generated;
+# this is needed for early versions of TranScript that get confused by
+# anything between the %%EndProlog line and the first %%Page: comment.
+# Add 2 if lines in included files beginning with %! should be
+# stripped out; this is needed for the OpenWindows 2.0 pageview previewer.
+# Add 4 if %%Page, %%Trailer and %%EndProlog comments should be
+# stripped out of included files; this is needed for spoolers that
+# don't understand the %%{Begin,End}Document comments. I suspect this
+# includes early versions of TranScript.
+# Add 8 if the first line of the PostScript output should be %!PS-Adobe-2.0
+# rather than %!PS-Adobe-3.0; this is needed when using Sun's Newsprint
+# with a printer that requires page reversal.
+BROKEN_SPOOLER_FLAGS=7
+
+# DEVICE is the default device.
+DEVICE=ps
+
+# PSPRINT is the command to use for printing a PostScript file,
+# for example `lpr'.
+PSPRINT=lpr
+
+# DVIPRINT is the command to use for printing a TeX dvi file,
+# for example `lpr -d'.
+DVIPRINT=lpr -d
+########################################################################
+# Don't touch...
+
+g=
+tmac_s_prefix=
+tmac_m_prefix=
+tmac_an_prefix=
+fontdir=/usr/share/groff_font
+fontpath=$(fontdir)
+tmacdir=/usr/share/tmac
+systemtmacdir=/usr/share/tmac
+localtmacdir=/usr/share/tmac
+tmacpath=$(tmacdir)
+indexext=.i
+common_words_file=/usr/share/dict/eign
+indexdir=/usr/share/dict/papers
+indexname=Ind
+
+########################################################################
+# Libraries
+
+# Bad assumption, if one exists they all exist
+.if exists(${.OBJDIR}/${TOPREL}/src/libs/libgroff)
+LIBGROFF=	${.OBJDIR}/${TOPREL}/src/libs/libgroff/libgroff.a
+LIBDRIVER=	${.OBJDIR}/${TOPREL}/src/libs/libdriver/libdriver.a
+LIBBIB=		${.OBJDIR}/${TOPREL}/src/libs/libbib/libbib.a
+.else
+LIBGROFF=	${.CURDIR}/${TOPREL}/src/libs/libgroff/libgroff.a
+LIBDRIVER=	${.CURDIR}/${TOPREL}/src/libs/libdriver/libdriver.a
+LIBBIB=		${.CURDIR}/${TOPREL}/src/libs/libbib/libbib.a
+.endif
+
+CFLAGS+=	-DHAVE_STDLIB_H=1\
+		-DHAVE_UNISTD_H=1\
+		-DHAVE_DIRENT_H=1\
+		-DHAVE_LIMITS_H=1\
+		-DHAVE_STRING_H=1\
+		-DHAVE_STRINGS_H=1\
+		-DHAVE_MATH_H=1\
+		-DRET_TYPE_SRAND_IS_VOID=1\
+		-DHAVE_SYS_NERR=1\
+		-DHAVE_SYS_ERRLIST=1\
+		-DHAVE_CC_LIMITS_H=1\
+		-DRETSIGTYPE=void\
+		-DHAVE_STRUCT_EXCEPTION=1\
+		-DHAVE_GETPAGESIZE=1\
+		-DHAVE_MMAP=1\
+		-DHAVE_FMOD=1\
+		-DHAVE_STRTOL=1\
+		-DHAVE_GETCWD=1\
+		-DHAVE_STRERROR=1\
+		-DHAVE_PUTENV=1\
+		-DHAVE_RENAME=1\
+		-DHAVE_MKSTEMP=1\
+		-DHAVE_STRCASECMP=1\
+		-DHAVE_STRNCASECMP=1\
+		-DHAVE_STRSEP=1\
+		-DHAVE_STRDUP=1\
+		-DSYS_SIGLIST_DECLARED=1
+
+CFLAGS+=	-I${GROFF_DIST}/src/include -I${.CURDIR}/${TOPREL}/src/include
+CXXFLAGS+=	-fno-rtti -fno-exceptions
+
+.y.o:
+	$(YACC) $(YFLAGS) $(.IMPSRC)
+	mv -f y.tab.c $(.PREFIX).cc
+	mv -f y.tab.h $(.PREFIX)_tab.h
+	${CXX} ${CXXFLAGS} -c $(.PREFIX).cc -o ${.TARGET}
+
+.y.cc:
+	$(YACC) $(YFLAGS) $(.IMPSRC)
+	mv -f y.tab.c $(.PREFIX).cc
+	mv -f y.tab.h $(.PREFIX)_tab.h
+
+.SUFFIXES: .man .1 .2 .3 .4 .5 .6 .7 .8
+
+version=`cat $(GROFF_DIST)/VERSION`
+revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION`
+
+.man.8 .man.7 .man.6 .man.5 .man.4 .man.3 .man.2 .man.1:
+	@${ECHO} Making $@ from $<
+	@-rm -f $@
+	@sed -e "s;@BINDIR@;${BINDIR};g" \
+	-e "s;@FONTDIR@;$(fontdir);g" \
+	-e "s;@FONTPATH@;$(fontpath);g" \
+	-e "s;@MACRODIR@;$(tmacdir);g" \
+	-e "s;@SYSTEMMACRODIR@;$(systemtmacdir);g" \
+	-e "s;@LOCALMACRODIR@;$(localtmacdir);g" \
+	-e "s;@MACROPATH@;$(tmacpath);g" \
+	-e "s;@DEVICE@;$(DEVICE);g" \
+	-e "s;@DEFAULT_INDEX@;$(indexdir)/$(indexname);g" \
+	-e "s;@DEFAULT_INDEX_NAME@;$(indexname);g" \
+	-e "s;@INDEX_SUFFIX@;$(indexext);g" \
+	-e "s;@COMMON_WORDS_FILE@;$(common_words_file);g" \
+	-e "s;@MAN1EXT@;1;g" \
+	-e "s;@MAN5EXT@;5;g" \
+	-e "s;@MAN7EXT@;7;g" \
+	-e "s;@TMAC_S_PREFIX@;$(tmac_s_prefix);g" \
+	-e "s;@TMAC_M_PREFIX@;$(tmac_m_prefix);g" \
+	-e "s;@TMAC_AN_PREFIX@;$(tmac_an_prefix);g" \
+	-e "s;@TMAC_MDIR@;$(tmacdir)/mm;g" \
+	-e "s;@BROKEN_SPOOLER_FLAGS@;$(BROKEN_SPOOLER_FLAGS);g" \
+	-e "s;@VERSION@;$(version)$(revision);g" \
+	-e "s;@MDATE@;`$(SHELL) ${GROFF_DIST}/mdate.sh $<`;g" \
+	-e "s;@g@;$(g);g" \
+	-e "s;@G@;`echo $(g) | tr [a-z] [A-Z]`;g" \
+	$< >$@
+
+.SUFFIXES: .sh .pl
+
+.sh .pl:
+	@${ECHO} Making ${.TARGET} from ${.IMPSRC}
+	@sed -e "s|@BINDIR@|${BINDIR}|g" \
+	     -e "s|@VERSION@|$(version)$(revision)|" \
+	     -e "s|@g@|$(g)|g" \
+	     ${.IMPSRC} >${.TARGET}
+
+TOPREL?=	..
+GROFF_DIST=	${.CURDIR}/${TOPREL}/../../../contrib/groff
+DIST_SUBDIR?=	${.CURDIR:T}
+DIST_DIR=	${GROFF_DIST}/${DIST_SUBDIR}
 .PATH: ${DIST_DIR}
diff --git a/gnu/usr.bin/groff/Makefile.tty b/gnu/usr.bin/groff/Makefile.tty
deleted file mode 100644
index 49caf98..0000000
--- a/gnu/usr.bin/groff/Makefile.tty
+++ /dev/null
@@ -1,32 +0,0 @@
-# $FreeBSD$
-
-.MAIN: all
-
-RES=240
-CPI=10
-LPI=6
-FONTS=R I B BI S L CW
-
-DEVFILES=$(FONTS) DESC
-CLEANFILES=$(DEVFILES)
-
-$(FONTS): R.proto
-	@${ECHO} Making $@
-	@(charwidth=`expr $(RES) / $(CPI)` ; \
- 	 sed -e "s/^name [A-Z]*$$/name $@/" \
-	     -e "s/^\\([^	]*\\)	[0-9]+	/\\1	$$charwidth	/" \
-	     -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
-	     -e "s/^internalname .*$$/internalname $@/" \
-	     -e "/^internalname/s/BI/3/" \
-	     -e "/^internalname/s/B/2/" \
-	     -e "/^internalname/s/I/1/" \
-	     -e "/^internalname .*[^ 0-9]/d" \
-	     ${DIST_DIR}/R.proto >$@)
-
-DESC: DESC.proto
-	@${ECHO} Making $@
-	@sed -e "s/^res .*$$/res $(RES)/" \
-	    -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
-	    -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
-	    -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
-	    ${DIST_DIR}/DESC.proto >$@
diff --git a/gnu/usr.bin/groff/addftinfo/Makefile b/gnu/usr.bin/groff/addftinfo/Makefile
deleted file mode 100644
index a3a8662..0000000
--- a/gnu/usr.bin/groff/addftinfo/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PROG=		addftinfo
-SRCS=		addftinfo.cc guess.cc
-LDADD+=		${LIBGROFF}
-DPADD+=		${LIBGROFF}
-
-CLEANFILES+=	addftinfo.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/afmtodit/Makefile b/gnu/usr.bin/groff/afmtodit/Makefile
deleted file mode 100644
index 37bd365..0000000
--- a/gnu/usr.bin/groff/afmtodit/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-SCRIPTS=	afmtodit.pl
-MAN=		afmtodit.1
-CLEANFILES+=	${MAN}
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/contrib/Makefile b/gnu/usr.bin/groff/contrib/Makefile
new file mode 100644
index 0000000..6718107
--- /dev/null
+++ b/gnu/usr.bin/groff/contrib/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=		mm
+
+.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/contrib/Makefile.inc b/gnu/usr.bin/groff/contrib/Makefile.inc
new file mode 100644
index 0000000..d5552c5
--- /dev/null
+++ b/gnu/usr.bin/groff/contrib/Makefile.inc
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+DIST_SUBDIR=	contrib/${.CURDIR:T}
+TOPREL=		../..
+
+.include "../Makefile.inc"
diff --git a/gnu/usr.bin/groff/mm/Makefile b/gnu/usr.bin/groff/contrib/mm/Makefile
index 092994b..3df1245 100644
--- a/gnu/usr.bin/groff/mm/Makefile
+++ b/gnu/usr.bin/groff/contrib/mm/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+SCRIPTS=	mmroff.pl
+MAN=		mmroff.7
+
 TMACOWN?=	${BINOWN}
 TMACGRP?=	${BINGRP}
 TMACMODE?=	${NOBINMODE}
@@ -8,16 +11,14 @@ TMACDIR?=	${SHAREDIR}/tmac
 FILES=		0.MT 5.MT 4.MT ms.cov se_ms.cov
 LOCALE=		locale se_locale
 
-MAN=		groff_mm.7 groff_mmse.7 mmroff.7
+MAN+=		groff_mm.7 groff_mmse.7
 MLINKS=		groff_mm.7 mm.7 groff_mmse.7 mmse.7
 
 CLEANFILES+=	${MAN}
 
 beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${DIST_DIR}/mmroff.pl ${DESTDIR}${BINDIR}/mmroff
 	${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-		${DIST_DIR}/tmac.m ${DIST_DIR}/tmac.mse ${DESTDIR}${TMACDIR}
+		${DIST_DIR}/m.tmac ${DIST_DIR}/mse.tmac ${DESTDIR}${TMACDIR}
 .for file in ${FILES}
 	${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 		${DIST_DIR}/mm/${file} ${DESTDIR}${TMACDIR}/mm
@@ -29,5 +30,4 @@ beforeinstall:
 .endif
 .endfor
 
-.include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/devX100-12/Makefile b/gnu/usr.bin/groff/devX100-12/Makefile
deleted file mode 100644
index 1a50e26..0000000
--- a/gnu/usr.bin/groff/devX100-12/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-#
-# Generic groff font makefile
-
-NOOBJ=
-
-.include "${.CURDIR}/../Makefile.inc"
-.include "${DIST_DIR}/Makefile.sub"
-.include "${.CURDIR}/../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devX100/Makefile b/gnu/usr.bin/groff/devX100/Makefile
deleted file mode 100644
index 1a50e26..0000000
--- a/gnu/usr.bin/groff/devX100/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-#
-# Generic groff font makefile
-
-NOOBJ=
-
-.include "${.CURDIR}/../Makefile.inc"
-.include "${DIST_DIR}/Makefile.sub"
-.include "${.CURDIR}/../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devX75-12/Makefile b/gnu/usr.bin/groff/devX75-12/Makefile
deleted file mode 100644
index 1a50e26..0000000
--- a/gnu/usr.bin/groff/devX75-12/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-#
-# Generic groff font makefile
-
-NOOBJ=
-
-.include "${.CURDIR}/../Makefile.inc"
-.include "${DIST_DIR}/Makefile.sub"
-.include "${.CURDIR}/../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devX75/Makefile b/gnu/usr.bin/groff/devX75/Makefile
deleted file mode 100644
index 1a50e26..0000000
--- a/gnu/usr.bin/groff/devX75/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-#
-# Generic groff font makefile
-
-NOOBJ=
-
-.include "${.CURDIR}/../Makefile.inc"
-.include "${DIST_DIR}/Makefile.sub"
-.include "${.CURDIR}/../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devhtml/Makefile b/gnu/usr.bin/groff/devhtml/Makefile
deleted file mode 100644
index 190cb92..0000000
--- a/gnu/usr.bin/groff/devhtml/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-DEV=		html
-DEVFILES=	DESC TR TI TB TBI CR CI CB CBI HR HI HB HBI NR NI NB NBI S
-
-.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devlbp/Makefile b/gnu/usr.bin/groff/devlbp/Makefile
deleted file mode 100644
index e6cb556..0000000
--- a/gnu/usr.bin/groff/devlbp/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-DEV=		lbp
-LBPPRINT=	${PSPRINT}
-DEVFILES=	DESC HB HBI HI HR TB TBI TI TR
-
-CLEANFILES+=	DESC
-
-DESC:	DESC.in
-	-rm -f DESC
-	cat ${DIST_DIR}/DESC.in >DESC
-	if test "$(PAGE)" = A4; then \
-	  echo "papersize a4" >>DESC; \
-        else \
-	  echo "papersize letter" >>DESC; \
-        fi
-	test -z '$(LBPPRINT)' || echo print '$(LBPPRINT)' >>DESC
-
-.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devlj4/Makefile b/gnu/usr.bin/groff/devlj4/Makefile
deleted file mode 100644
index f4318ad..0000000
--- a/gnu/usr.bin/groff/devlj4/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-DEV=		lj4
-LJ4RES=		600
-LJ4PRINT=	$(PSPRINT)
-DEVFILES=	DESC \
-		ALBB ALBR AOB AOI AOR CB CBI CI CR GB GBI GI GR \
-		LGB LGI LGR OB OBI OI OR TB TBI TI TR UB UBI UI UR \
-		UCB UCBI UCI UCR CLARENDON CORONET MARIGOLD S \
-		generate/Makefile generate/text.map generate/special.map
-
-CLEANFILES+=	DESC
-
-DESC: DESC.in
-	-rm -f DESC
-	echo "res $(LJ4RES)" >DESC
-	echo "unitwidth `expr 7620000 / $(LJ4RES)`" >>DESC
-	cat ${DIST_DIR}/DESC.in >>DESC
-	if test "$(PAGE)" = A4; then \
-	  echo "papersize a4" >>DESC; \
-	else \
-	  echo "papersize letter" >>DESC; \
-	fi
-	test -z '$(LJ4PRINT)' || echo print '$(LJ4PRINT)' >>DESC
-
-fonts:
-	$(MAKE) -f ${DIST_DIR}/generate/Makefile srcdir=${DIST_DIR}/generate \
-	  HPFTODIT=${.CURDIR}/../hpftodit/hpftodit
-
-.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/Makefile b/gnu/usr.bin/groff/font/Makefile
new file mode 100644
index 0000000..d78fc81
--- /dev/null
+++ b/gnu/usr.bin/groff/font/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+SUBDIR=		devX100 devX100-12 devX75 devX75-12 \
+		devascii devcp1047 devdvi devhtml devkoi8-r \
+		devlatin1 devlbp devlj4 devps devutf8
+
+.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
index dcff4f8..85be29a 100644
--- a/gnu/usr.bin/groff/font/Makefile.dev
+++ b/gnu/usr.bin/groff/font/Makefile.dev
@@ -1,17 +1,11 @@
 # $FreeBSD$
 
-.include "../Makefile.cfg"
+DEVICEDIR?=	${fontdir}/dev${DEV}
 
-FONTDIR?=	/usr/share/groff_font
-DEVICEDIR?=	$(FONTDIR)/dev$(DEV)
-FONTOWN?=	${BINOWN}
-FONTGRP?=	${BINGRP}
-FONTMODE?=	${NOBINMODE}
-
-all:	$(DEVFILES)
+all: ${DEVFILES}
 
 beforeinstall: ${DEVFILES}
-	${INSTALL} -c -o ${FONTOWN} -g ${FONTGRP} -m ${FONTMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
 		${.ALLSRC} ${DESTDIR}${DEVICEDIR}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/font/Makefile.inc b/gnu/usr.bin/groff/font/Makefile.inc
new file mode 100644
index 0000000..22a1a42
--- /dev/null
+++ b/gnu/usr.bin/groff/font/Makefile.inc
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+DIST_SUBDIR=	font/${.CURDIR:T}
+TOPREL=		../..
+
+.include "../Makefile.inc"
diff --git a/gnu/usr.bin/groff/font/Makefile.tty b/gnu/usr.bin/groff/font/Makefile.tty
index 49caf98..d515835 100644
--- a/gnu/usr.bin/groff/font/Makefile.tty
+++ b/gnu/usr.bin/groff/font/Makefile.tty
@@ -1,19 +1,17 @@
 # $FreeBSD$
 
-.MAIN: all
+FONTS?=R I B BI S L CW
+DEVFILES=$(FONTS) DESC
+CLEANFILES=$(DEVFILES)
 
 RES=240
 CPI=10
 LPI=6
-FONTS=R I B BI S L CW
-
-DEVFILES=$(FONTS) DESC
-CLEANFILES=$(DEVFILES)
 
 $(FONTS): R.proto
-	@${ECHO} Making $@
+	@${ECHO} Making ${.TARGET}
 	@(charwidth=`expr $(RES) / $(CPI)` ; \
- 	 sed -e "s/^name [A-Z]*$$/name $@/" \
+ 	 sed -e "s/^name [A-Z]*$$/name ${.TARGET}/" \
 	     -e "s/^\\([^	]*\\)	[0-9]+	/\\1	$$charwidth	/" \
 	     -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
 	     -e "s/^internalname .*$$/internalname $@/" \
@@ -21,12 +19,12 @@ $(FONTS): R.proto
 	     -e "/^internalname/s/B/2/" \
 	     -e "/^internalname/s/I/1/" \
 	     -e "/^internalname .*[^ 0-9]/d" \
-	     ${DIST_DIR}/R.proto >$@)
+	     ${.ALLSRC} >$.${.TARGET})
 
 DESC: DESC.proto
-	@${ECHO} Making $@
+	@${ECHO} Making ${.TARGET}
 	@sed -e "s/^res .*$$/res $(RES)/" \
 	    -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
 	    -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
 	    -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
-	    ${DIST_DIR}/DESC.proto >$@
+	    ${.ALLSRC} >${.TARGET}
diff --git a/gnu/usr.bin/groff/font/devX100-12/Makefile b/gnu/usr.bin/groff/font/devX100-12/Makefile
new file mode 100644
index 0000000..9a136b8
--- /dev/null
+++ b/gnu/usr.bin/groff/font/devX100-12/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+NOOBJ=
+
+.include "../Makefile.inc"
+.include "${DIST_DIR}/Makefile.sub"
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/devX100/Makefile b/gnu/usr.bin/groff/font/devX100/Makefile
new file mode 100644
index 0000000..9a136b8
--- /dev/null
+++ b/gnu/usr.bin/groff/font/devX100/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+NOOBJ=
+
+.include "../Makefile.inc"
+.include "${DIST_DIR}/Makefile.sub"
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/devX75-12/Makefile b/gnu/usr.bin/groff/font/devX75-12/Makefile
new file mode 100644
index 0000000..9a136b8
--- /dev/null
+++ b/gnu/usr.bin/groff/font/devX75-12/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+NOOBJ=
+
+.include "../Makefile.inc"
+.include "${DIST_DIR}/Makefile.sub"
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/devX75/Makefile b/gnu/usr.bin/groff/font/devX75/Makefile
new file mode 100644
index 0000000..9a136b8
--- /dev/null
+++ b/gnu/usr.bin/groff/font/devX75/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+NOOBJ=
+
+.include "../Makefile.inc"
+.include "${DIST_DIR}/Makefile.sub"
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devascii/Makefile b/gnu/usr.bin/groff/font/devascii/Makefile
index 544ec16..544ec16 100644
--- a/gnu/usr.bin/groff/devascii/Makefile
+++ b/gnu/usr.bin/groff/font/devascii/Makefile
diff --git a/gnu/usr.bin/groff/devcp1047/Makefile b/gnu/usr.bin/groff/font/devcp1047/Makefile
index d0a887a..d0a887a 100644
--- a/gnu/usr.bin/groff/devcp1047/Makefile
+++ b/gnu/usr.bin/groff/font/devcp1047/Makefile
diff --git a/gnu/usr.bin/groff/devdvi/Makefile b/gnu/usr.bin/groff/font/devdvi/Makefile
index cb747a5..cb747a5 100644
--- a/gnu/usr.bin/groff/devdvi/Makefile
+++ b/gnu/usr.bin/groff/font/devdvi/Makefile
diff --git a/gnu/usr.bin/groff/font/devhtml/Makefile b/gnu/usr.bin/groff/font/devhtml/Makefile
new file mode 100644
index 0000000..f44b144
--- /dev/null
+++ b/gnu/usr.bin/groff/font/devhtml/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+DEV=		html
+FONTS=		R I B BI CR S
+
+.include "../Makefile.tty"
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devkoi8-r/Makefile b/gnu/usr.bin/groff/font/devkoi8-r/Makefile
index 399d2b6..399d2b6 100644
--- a/gnu/usr.bin/groff/devkoi8-r/Makefile
+++ b/gnu/usr.bin/groff/font/devkoi8-r/Makefile
diff --git a/gnu/usr.bin/groff/devlatin1/Makefile b/gnu/usr.bin/groff/font/devlatin1/Makefile
index 2383202..2383202 100644
--- a/gnu/usr.bin/groff/devlatin1/Makefile
+++ b/gnu/usr.bin/groff/font/devlatin1/Makefile
diff --git a/gnu/usr.bin/groff/font/devlbp/Makefile b/gnu/usr.bin/groff/font/devlbp/Makefile
new file mode 100644
index 0000000..4ea437e
--- /dev/null
+++ b/gnu/usr.bin/groff/font/devlbp/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+DEV=		lbp
+LBPPRINT=	${PSPRINT}
+DEVFILES=	DESC HB HBI HI HR TB TBI TI TR
+
+CLEANFILES+=	DESC
+
+DESC:	DESC.in
+	cat ${.ALLSRC} >${.TARGET}
+	if test "${PAGE}" = A4; then \
+	  echo "papersize a4" >>${.TARGET}; \
+        else \
+	  echo "papersize letter" >>${.TARGET}; \
+        fi
+	test -z '${LBPPRINT}' || echo print '${LBPPRINT}' >>${.TARGET}
+
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/devlj4/Makefile b/gnu/usr.bin/groff/font/devlj4/Makefile
new file mode 100644
index 0000000..504677c
--- /dev/null
+++ b/gnu/usr.bin/groff/font/devlj4/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+DEV=		lj4
+LJ4RES=		600
+LJ4PRINT=	${PSPRINT}
+DEVFILES=	DESC \
+		ALBB ALBR AOB AOI AOR CB CBI CI CR GB GBI GI GR \
+		LGB LGI LGR OB OBI OI OR TB TBI TI TR UB UBI UI UR \
+		UCB UCBI UCI UCR CLARENDON CORONET MARIGOLD S \
+		generate/Makefile generate/text.map generate/special.map
+
+CLEANFILES+=	DESC
+
+DESC: DESC.in
+	echo "res ${LJ4RES}" >${.TARGET}
+	echo "unitwidth `expr 7620000 / ${LJ4RES}`" >>${.TARGET}
+	cat ${.ALLSRC} >>${.TARGET}
+	if test "${PAGE}" = A4; then \
+	  echo "papersize a4" >>${.TARGET}; \
+	else \
+	  echo "papersize letter" >>${.TARGET}; \
+	fi
+	test -z '${LJ4PRINT}' || echo print '${LJ4PRINT}' >>${.TARGET}
+
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devps/Makefile b/gnu/usr.bin/groff/font/devps/Makefile
index cef3fd1..0383d01 100644
--- a/gnu/usr.bin/groff/devps/Makefile
+++ b/gnu/usr.bin/groff/font/devps/Makefile
@@ -6,10 +6,10 @@ DISTFILES=	text.enc download \
 		CB CBI CI CR HB HBI HI HR HNB HNBI HNI HNR \
 		NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI
 PSFILES=	prologue symbolsl.pfa zapfdr.pfa
-DEVGENFILES=	generate/Makefile generate/afmname generate/dingbatsmap \
-		generate/dingbatsrmap generate/lgreekmap generate/symbol.sed \
+DEVGENFILES=	generate/Makefile generate/afmname generate/dingbats.map \
+		generate/dingbats.rmap generate/lgreekmap generate/symbol.sed \
 		generate/symbolchars generate/symbolsl.afm generate/textmap
-DEVFILES=	DESC $(PSFILES) $(DISTFILES) $(DEVGENFILES)
+DEVFILES=	DESC ${PSFILES} ${DISTFILES} ${DEVGENFILES}
 
 CLEANFILES+=	DESC ${PSFILES}
 
@@ -24,10 +24,6 @@ DESC: DESC.in
 	fi
 	test -z '${PSPRINT}' ||	echo print '${PSPRINT}' >>DESC
 
-fonts: DESC
-	${MAKE} -f ${DIST_DIR}/generate/Makefile \
-	  srcdir=${DIST_DIR}/generate DESC=${DIST_DIR}/DESC.in
-
 ${PSFILES}:
 	-rm -f $@
 	sed -f ${DIST_DIR}/psstrip.sed $? >$@
diff --git a/gnu/usr.bin/groff/devutf8/Makefile b/gnu/usr.bin/groff/font/devutf8/Makefile
index bf5965e..bf5965e 100644
--- a/gnu/usr.bin/groff/devutf8/Makefile
+++ b/gnu/usr.bin/groff/font/devutf8/Makefile
diff --git a/gnu/usr.bin/groff/grn/Makefile b/gnu/usr.bin/groff/grn/Makefile
deleted file mode 100644
index d8cdd73..0000000
--- a/gnu/usr.bin/groff/grn/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-PROG=		grn
-SRCS=		hdb.cc hpoint.cc hgraph.cc main.cc
-CFLAGS+=	-I${.CURDIR}/../include
-LDADD+= 	${LIBGROFF} -lm
-DPADD+= 	${LIBGROFF} ${LIBM}
-
-CLEANFILES+=	grn.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grodvi/Makefile b/gnu/usr.bin/groff/grodvi/Makefile
deleted file mode 100644
index bdbad24..0000000
--- a/gnu/usr.bin/groff/grodvi/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PROG=		grodvi
-SRCS=		dvi.cc
-LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
-DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-
-CLEANFILES+=	grodvi.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/groff/Makefile b/gnu/usr.bin/groff/groff/Makefile
deleted file mode 100644
index 05ffd14..0000000
--- a/gnu/usr.bin/groff/groff/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-PROG=		groff
-SRCS=		groff.cc pipeline.c
-CFLAGS+=	-I${.CURDIR}/../include
-LDADD+=		${LIBGROFF} -lm
-DPADD+=		${LIBGROFF} ${LIBM}
-
-CLEANFILES+=	groff.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grohtml/Makefile b/gnu/usr.bin/groff/grohtml/Makefile
deleted file mode 100644
index 3010146..0000000
--- a/gnu/usr.bin/groff/grohtml/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-PROG=		grohtml
-SRCS=		html.cc output.cc
-
-LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
-DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-
-CLEANFILES+=	grohtml.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grolbp/Makefile b/gnu/usr.bin/groff/grolbp/Makefile
deleted file mode 100644
index 43c7791..0000000
--- a/gnu/usr.bin/groff/grolbp/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PROG=		grolbp
-SRCS=		lbp.cc
-LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
-DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-
-CLEANFILES+=	grolbp.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grolj4/Makefile b/gnu/usr.bin/groff/grolj4/Makefile
deleted file mode 100644
index 1ff29aa..0000000
--- a/gnu/usr.bin/groff/grolj4/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PROG=		grolj4
-SRCS=		lj4.cc
-LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
-DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-
-CLEANFILES+=	grolj4.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grops/Makefile b/gnu/usr.bin/groff/grops/Makefile
deleted file mode 100644
index 7c7c3bb..0000000
--- a/gnu/usr.bin/groff/grops/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PROG=		grops
-SRCS=		ps.cc psrm.cc
-LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
-DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-
-CLEANFILES+=	grops.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grotty/Makefile b/gnu/usr.bin/groff/grotty/Makefile
deleted file mode 100644
index d8c5fda..0000000
--- a/gnu/usr.bin/groff/grotty/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PROG=		grotty
-SRCS=		tty.cc
-LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
-DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-
-CLEANFILES+=	grotty.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/hpftodit/Makefile b/gnu/usr.bin/groff/hpftodit/Makefile
deleted file mode 100644
index 5fd7c52..0000000
--- a/gnu/usr.bin/groff/hpftodit/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PROG=		hpftodit
-SRCS=		hpftodit.cc
-LDADD+=		${LIBGROFF} -lm
-DPADD+=		${LIBGROFF} ${LIBM}
-
-CLEANFILES+=	hpftodit.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/include/defs.h b/gnu/usr.bin/groff/include/defs.h
deleted file mode 100644
index df2efba..0000000
--- a/gnu/usr.bin/groff/include/defs.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#define PROG_PREFIX ""
-#define DEVICE "ps"
-#define FONTPATH "/usr/share/groff_font"
-#define MACROPATH "/usr/share/tmac"
-#define INDEX_SUFFIX ".i"
-#define COMMON_WORDS_FILE "/usr/share/dict/eign"
-#define DEFAULT_INDEX_DIR "/usr/share/dict/papers"
-#define DEFAULT_INDEX_NAME "Ind"
-#define DEFAULT_INDEX "/usr/share/dict/papers/Ind"
diff --git a/gnu/usr.bin/groff/libbib/Makefile b/gnu/usr.bin/groff/libbib/Makefile
deleted file mode 100644
index df2c5a9..0000000
--- a/gnu/usr.bin/groff/libbib/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Makefile for libbib
-
-LIB=		bib
-SRCS=		common.cc index.cc linear.cc search.cc map.c
-CFLAGS+=	-I$(.CURDIR)/../include
-
-NOMAN=		noman
-NOPROFILE=	noprofile
-
-install:
-
-.include "../Makefile.cfg"
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/groff/lkbib/Makefile b/gnu/usr.bin/groff/lkbib/Makefile
deleted file mode 100644
index c0a3bb4..0000000
--- a/gnu/usr.bin/groff/lkbib/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-PROG=		lkbib
-SRCS=		lkbib.cc
-CFLAGS+=	-I${.CURDIR}/../include
-LDADD+=		${LIBBIB} ${LIBGROFF} -lm
-DPADD+=		${LIBBIB} ${LIBGROFF} ${LIBM}
-
-CLEANFILES+=	lkbib.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/lookbib/Makefile b/gnu/usr.bin/groff/lookbib/Makefile
deleted file mode 100644
index 573421f..0000000
--- a/gnu/usr.bin/groff/lookbib/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PROG=		lookbib
-SRCS=		lookbib.cc
-LDADD+=		$(LIBBIB) $(LIBGROFF) -lm
-DPADD+=		$(LIBBIB) $(LIBGROFF) $(LIBM)
-
-CLEANFILES+=	lookbib.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/man/Makefile b/gnu/usr.bin/groff/man/Makefile
index f79a098..9937f57 100644
--- a/gnu/usr.bin/groff/man/Makefile
+++ b/gnu/usr.bin/groff/man/Makefile
@@ -1,9 +1,7 @@
 # $FreeBSD$
 
-MAN=	groff_font.5 groff_out.5
-MAN+=	groff.7 groff_char.7 roff.7
+MAN=		groff_font.5 groff_out.5
+MAN+=		groff.7 groff_char.7 roff.7
+CLEANFILES=	${MAN}
 
-CLEANFILES+=	${MAN}
-
-.include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/nroff/Makefile b/gnu/usr.bin/groff/nroff/Makefile
deleted file mode 100644
index 685f0b8..0000000
--- a/gnu/usr.bin/groff/nroff/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-SCRIPTS=	nroff.sh psroff.sh
-MAN=		nroff.1 psroff.1
-
-CLEANFILES+=	nroff.1
-
-.include <../Makefile.cfg>
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/pfbtops/Makefile b/gnu/usr.bin/groff/pfbtops/Makefile
deleted file mode 100644
index 28eac95..0000000
--- a/gnu/usr.bin/groff/pfbtops/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-PROG=		pfbtops
-LDADD+=		${LIBGROFF}
-DPADD+=		${LIBGROFF}
-
-CLEANFILES+=	pfbtops.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/Makefile b/gnu/usr.bin/groff/src/Makefile
new file mode 100644
index 0000000..7d2ca90
--- /dev/null
+++ b/gnu/usr.bin/groff/src/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=		libs devices preproc roff utils
+
+.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/src/devices/Makefile b/gnu/usr.bin/groff/src/devices/Makefile
new file mode 100644
index 0000000..8af4ff8
--- /dev/null
+++ b/gnu/usr.bin/groff/src/devices/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=		grodvi grohtml grolbp grolj4 grops grotty
+
+.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/src/devices/Makefile.inc b/gnu/usr.bin/groff/src/devices/Makefile.inc
new file mode 100644
index 0000000..4619cbe
--- /dev/null
+++ b/gnu/usr.bin/groff/src/devices/Makefile.inc
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+TOPREL=		../../..
+DIST_SUBDIR=	src/devices/${.CURDIR:T}
+
+.include "../../Makefile.inc"
diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
new file mode 100644
index 0000000..771bc1e
--- /dev/null
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		grodvi
+SRCS=		dvi.cc
+DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
+LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
new file mode 100644
index 0000000..6b67f98
--- /dev/null
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		post-grohtml
+SRCS=		post-html.cc html-text.cc output.cc
+DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
+LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+NOMAN=		YES
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
new file mode 100644
index 0000000..304e3ad
--- /dev/null
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		grolbp
+SRCS=		lbp.cc
+DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
+LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
new file mode 100644
index 0000000..52a43f8
--- /dev/null
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		grolj4
+SRCS=		lj4.cc
+DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
+LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile b/gnu/usr.bin/groff/src/devices/grops/Makefile
new file mode 100644
index 0000000..3e8c255
--- /dev/null
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		grops
+SRCS=		ps.cc psrm.cc
+DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
+LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile b/gnu/usr.bin/groff/src/devices/grotty/Makefile
new file mode 100644
index 0000000..1c4fd81
--- /dev/null
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		grotty
+SRCS=		tty.cc
+DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
+LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/include/defs.h b/gnu/usr.bin/groff/src/include/defs.h
index df2efba..76bd117 100644
--- a/gnu/usr.bin/groff/src/include/defs.h
+++ b/gnu/usr.bin/groff/src/include/defs.h
@@ -1,5 +1,8 @@
+/* $FreeBSD$ */
+
 #define PROG_PREFIX ""
 #define DEVICE "ps"
+#define BINPATH "/usr/bin"
 #define FONTPATH "/usr/share/groff_font"
 #define MACROPATH "/usr/share/tmac"
 #define INDEX_SUFFIX ".i"
diff --git a/gnu/usr.bin/groff/src/libs/Makefile b/gnu/usr.bin/groff/src/libs/Makefile
new file mode 100644
index 0000000..1461cda
--- /dev/null
+++ b/gnu/usr.bin/groff/src/libs/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=		libgroff libdriver libbib
+
+.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/src/libs/Makefile.inc b/gnu/usr.bin/groff/src/libs/Makefile.inc
new file mode 100644
index 0000000..627553f
--- /dev/null
+++ b/gnu/usr.bin/groff/src/libs/Makefile.inc
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+TOPREL=		../../..
+DIST_SUBDIR=	src/libs/${.CURDIR:T}
+
+.include "../../Makefile.inc"
diff --git a/gnu/usr.bin/groff/src/libs/libbib/Makefile b/gnu/usr.bin/groff/src/libs/libbib/Makefile
new file mode 100644
index 0000000..af1f605
--- /dev/null
+++ b/gnu/usr.bin/groff/src/libs/libbib/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+LIB=		bib
+INTERNALLIB=	YES
+INTERNALSTATICLIB=YES
+SRCS=		common.cc index.cc linear.cc search.cc map.c
+
+.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/groff/libdriver/Makefile b/gnu/usr.bin/groff/src/libs/libdriver/Makefile
index 9851328..e082c79 100644
--- a/gnu/usr.bin/groff/libdriver/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libdriver/Makefile
@@ -1,12 +1,8 @@
 # $FreeBSD$
 
 LIB=		driver
+INTERNALLIB=	YES
+INTERNALSTATICLIB=YES
 SRCS=		input.cc printer.cc
 
-NOMAN=		YES
-NOPROFILE=	YES
-
-install:
-
-.include "../Makefile.cfg"
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/groff/libgroff/Makefile b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
index 2797fd6..d8cfcf0 100644
--- a/gnu/usr.bin/groff/libgroff/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
 LIB=		groff
+INTERNALLIB=	YES
+INTERNALSTATICLIB=YES
 SRCS=		assert.cc change_lf.cc cmap.cc cset.cc device.cc errarg.cc\
 		error.cc fatal.cc filename.cc font.cc fontfile.cc\
 		htmlindicate.cc lf.cc\
@@ -8,21 +10,13 @@ SRCS=		assert.cc change_lf.cc cmap.cc cset.cc device.cc errarg.cc\
 	 	progname.cc ptable.cc searchpath.cc string.cc strsave.cc\
 		tmpfile.cc illegal.cc version.cc
 SRCS+=		getopt.c getopt1.c iftoa.c itoa.c matherr.c
-CFLAGS+=	-I$(.CURDIR)/../include
+CLEANFILES=	version.cc
 
-NOMAN=		noman
-NOPROFILE=	noprofile
-
-CLEANFILES+=	version.cc
-
-install:
-
-.include "../Makefile.cfg"
 .include <bsd.lib.mk>
 
-version.cc: $(GROFF_DIST)/VERSION $(GROFF_DIST)/REVISION
+version.cc: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION
 	@${ECHO} Making version.cc
-	@echo const char \*version_string = \"`cat $(GROFF_DIST)/VERSION`\"\; >$@
-	@echo const char \*revision_string = \"`cat $(GROFF_DIST)/REVISION`\"\; >>$@
-	@echo const char \*Version_string = \"`cat $(GROFF_DIST)/VERSION`.`cat $(GROFF_DIST)/REVISION`\"\; | \
+	@echo const char \*version_string = \"`cat ${GROFF_DIST}/VERSION`\"\; >$@
+	@echo const char \*revision_string = \"`cat ${GROFF_DIST}/REVISION`\"\; >>$@
+	@echo const char \*Version_string = \"`cat ${GROFF_DIST}/VERSION`.`cat ${GROFF_DIST}/REVISION`\"\; | \
 	  sed -e 's/\.0\"/\"/' >>$@
diff --git a/gnu/usr.bin/groff/src/preproc/Makefile b/gnu/usr.bin/groff/src/preproc/Makefile
new file mode 100644
index 0000000..680399c
--- /dev/null
+++ b/gnu/usr.bin/groff/src/preproc/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+SUBDIR=		eqn grn html pic refer tbl
+
+# BSD already provides soelim(1)
+MISC=		soelim
+
+.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/Makefile.inc b/gnu/usr.bin/groff/src/preproc/Makefile.inc
new file mode 100644
index 0000000..16c104a
--- /dev/null
+++ b/gnu/usr.bin/groff/src/preproc/Makefile.inc
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+TOPREL=		../../..
+DIST_SUBDIR=	src/preproc/${.CURDIR:T}
+
+.include "../../Makefile.inc"
diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
index ed1b7f9..217c305 100644
--- a/gnu/usr.bin/groff/eqn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
@@ -4,18 +4,13 @@ PROG=		eqn
 SRCS=		eqn.cc eqn_tab.h main.cc lex.cc \
 		box.cc limit.cc list.cc over.cc text.cc \
 		script.cc mark.cc other.cc delim.cc sqrt.cc pile.cc special.cc
+CFLAGS+=	-I${DIST_DIR} -I.
 DPADD=		${LIBGROFF}
 LDADD=		${LIBGROFF}
 SCRIPTS=	neqn
 MAN=		eqn.1 neqn.1
-CLEANFILES=	eqn.cc eqn_tab.h ${MAN} ${SCRIPTS} y.tab.c y.tab.h
-
-neqn: neqn.sh
-	sed -e 's/@g@/${g}/g' ${.ALLSRC} > ${.TARGET}
+CLEANFILES=	eqn.cc eqn_tab.h ${SCRIPTS} ${MAN} y.tab.c y.tab.h
 
 eqn_tab.h: eqn.cc
 
-.include "../Makefile.cfg"
 .include <bsd.prog.mk>
-
-INCLUDES+=	-I${DIST_DIR} -I.
diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile
new file mode 100644
index 0000000..8192e8d
--- /dev/null
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		grn
+SRCS=		hdb.cc hpoint.cc hgraph.cc main.cc
+DPADD=	 	${LIBGROFF} ${LIBM}
+LDADD=	 	${LIBGROFF} -lm
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile
new file mode 100644
index 0000000..0cf0783
--- /dev/null
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		pre-grohtml
+SRCS=		pre-html.cc pushbackbuffer.cc
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+NOMAN=		YES
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/pic/Makefile b/gnu/usr.bin/groff/src/preproc/pic/Makefile
index 91de6f62..36a3b7e 100644
--- a/gnu/usr.bin/groff/pic/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile
@@ -3,13 +3,11 @@
 PROG=		pic
 SRCS=		lex.cc main.cc object.cc pic.cc pic_tab.h \
 		common.cc troff.cc tex.cc
+CFLAGS+=	-I${DIST_DIR} -I.
 DPADD=		${LIBGROFF} ${LIBM}
 LDADD=		${LIBGROFF} -lm
-CLEANFILES=	pic.1 pic.cc pic_tab.h y.tab.c y.tab.h
+CLEANFILES=	${MAN} pic.cc pic_tab.h y.tab.c y.tab.h
 
 pic_tab.h: pic.cc
 
-.include "../Makefile.cfg"
 .include <bsd.prog.mk>
-
-INCLUDES+=	-I${DIST_DIR} -I.
diff --git a/gnu/usr.bin/groff/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile
index 91c27b3..ac3799b 100644
--- a/gnu/usr.bin/groff/refer/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile
@@ -2,11 +2,9 @@
 
 PROG=		refer
 SRCS=		command.cc label.cc ref.cc refer.cc token.cc
+CFLAGS+=	-I${DIST_DIR}
 DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBBIB} ${LIBGROFF} -lm
-CLEANFILES=	label.cc label_tab.h refer.1 y.tab.c y.tab.h
+CLEANFILES=	label.cc label_tab.h ${MAN} y.tab.c y.tab.h
 
-.include "../Makefile.cfg"
 .include <bsd.prog.mk>
-
-INCLUDES+=	-I${DIST_DIR} -I${.CURDIR}/../include
diff --git a/gnu/usr.bin/groff/src/preproc/soelim/Makefile b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
new file mode 100644
index 0000000..662a678
--- /dev/null
+++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		soelim
+SRCS=		soelim.cc
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
new file mode 100644
index 0000000..d625af5
--- /dev/null
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		tbl
+SRCS=		main.cc table.cc
+DPADD=		${LIBGROFF} ${LIBM}
+LDADD=		${LIBGROFF} -lm
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/roff/Makefile b/gnu/usr.bin/groff/src/roff/Makefile
new file mode 100644
index 0000000..543a990
--- /dev/null
+++ b/gnu/usr.bin/groff/src/roff/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=		groff grog nroff psroff troff
+
+.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/src/roff/Makefile.inc b/gnu/usr.bin/groff/src/roff/Makefile.inc
new file mode 100644
index 0000000..f893659
--- /dev/null
+++ b/gnu/usr.bin/groff/src/roff/Makefile.inc
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+TOPREL=		../../..
+DIST_SUBDIR=	src/roff/${.CURDIR:T}
+
+.include "../../Makefile.inc"
diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile
new file mode 100644
index 0000000..97eb904
--- /dev/null
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		groff
+SRCS=		groff.cc pipeline.c
+DPADD=		${LIBGROFF} ${LIBM}
+LDADD=		${LIBGROFF} -lm
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grog/Makefile b/gnu/usr.bin/groff/src/roff/grog/Makefile
index d8304be..718f0cf 100644
--- a/gnu/usr.bin/groff/grog/Makefile
+++ b/gnu/usr.bin/groff/src/roff/grog/Makefile
@@ -4,8 +4,4 @@ SCRIPTS=	grog
 MAN=		grog.1
 CLEANFILES=	${SCRIPTS} ${MAN}
 
-grog: grog.sh
-	sed -e 's/@g@/$(g)/g' ${.ALLSRC} > ${.TARGET}
-
-.include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/roff/nroff/Makefile b/gnu/usr.bin/groff/src/roff/nroff/Makefile
new file mode 100644
index 0000000..6971890
--- /dev/null
+++ b/gnu/usr.bin/groff/src/roff/nroff/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+SCRIPTS=	nroff
+MAN=		nroff.1
+CLEANFILES=	${SCRIPTS} ${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/roff/psroff/Makefile b/gnu/usr.bin/groff/src/roff/psroff/Makefile
new file mode 100644
index 0000000..74bb4ad
--- /dev/null
+++ b/gnu/usr.bin/groff/src/roff/psroff/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+SCRIPTS=	psroff.sh
+MAN=		psroff.1
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile
index c2752cb..6ce2b97 100644
--- a/gnu/usr.bin/groff/troff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile
@@ -3,19 +3,10 @@
 PROG=		troff
 SRCS=		env.cc node.cc input.cc div.cc symbol.cc dictionary.cc reg.cc \
 		number.cc majorminor.cc
-CFLAGS+=	-I${.CURDIR}/../include
-LDADD+=		${LIBGROFF} -lm
-DPADD+=		${LIBGROFF} ${LIBM}
+DPADD=		${LIBGROFF} ${LIBM}
+LDADD=		${LIBGROFF} -lm
+CLEANFILES=	majorminor.cc ${MAN}
 
-CLEANFILES+=	majorminor.cc troff.1
-
-afterinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${DIST_DIR}/hyphen.us \
-		${DESTDIR}${tmacdir}/hyphen.us
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${GROFF_DIST}/tmac/locale/hyphen.us-ru ${DESTDIR}${tmacdir}/locale/hyphen.us-ru
-
-.include "../Makefile.cfg"
 .include <bsd.prog.mk>
 
 majorminor.cc: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION
diff --git a/gnu/usr.bin/groff/src/utils/Makefile b/gnu/usr.bin/groff/src/utils/Makefile
new file mode 100644
index 0000000..14953b9
--- /dev/null
+++ b/gnu/usr.bin/groff/src/utils/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=		addftinfo afmtodit hpftodit indxbib lkbib lookbib pfbtops tfmtodit
+
+.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/src/utils/Makefile.inc b/gnu/usr.bin/groff/src/utils/Makefile.inc
new file mode 100644
index 0000000..68945ab
--- /dev/null
+++ b/gnu/usr.bin/groff/src/utils/Makefile.inc
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+TOPREL=		../../..
+DIST_SUBDIR=	src/utils/${.CURDIR:T}
+
+.include "../../Makefile.inc"
diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
new file mode 100644
index 0000000..44d2b62
--- /dev/null
+++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		addftinfo
+SRCS=		addftinfo.cc guess.cc
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/afmtodit/Makefile b/gnu/usr.bin/groff/src/utils/afmtodit/Makefile
new file mode 100644
index 0000000..00f88ad
--- /dev/null
+++ b/gnu/usr.bin/groff/src/utils/afmtodit/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+SCRIPTS=	afmtodit
+MAN=		afmtodit.1
+CLEANFILES=	${SCRIPTS} ${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
new file mode 100644
index 0000000..7d50e48
--- /dev/null
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		hpftodit
+SRCS=		hpftodit.cc
+DPADD=		${LIBGROFF} ${LIBM}
+LDADD=		${LIBGROFF} -lm
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
index b9df1e5..2fa2059 100644
--- a/gnu/usr.bin/groff/indxbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
@@ -2,15 +2,12 @@
 
 PROG=		indxbib
 SRCS=		indxbib.cc dirnamemax.c signal.c
-CFLAGS+=	-I${.CURDIR}/../include
-LDADD+= 	${LIBBIB} ${LIBGROFF} -lm
-DPADD+= 	${LIBBIB} ${LIBGROFF} ${LIBM}
-
-CLEANFILES+=	indxbib.1
+DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
+LDADD=		${LIBBIB} ${LIBGROFF} -lm
+CLEANFILES=	${MAN}
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
 	    ${DIST_DIR}/eign ${DESTDIR}${SHAREDIR}/dict/
 
-.include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
new file mode 100644
index 0000000..7d59bf0
--- /dev/null
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		lkbib
+SRCS=		lkbib.cc
+DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
+LDADD=		${LIBBIB} ${LIBGROFF} -lm
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
new file mode 100644
index 0000000..50fb796
--- /dev/null
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		lookbib
+SRCS=		lookbib.cc
+DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
+LDADD=		${LIBBIB} ${LIBGROFF} -lm
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
new file mode 100644
index 0000000..4fa71b5
--- /dev/null
+++ b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+PROG=		pfbtops
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
new file mode 100644
index 0000000..3478871
--- /dev/null
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=		tfmtodit
+SRCS=		tfmtodit.cc
+DPADD=		${LIBGROFF} ${LIBM}
+LDADD=		${LIBGROFF} -lm
+CLEANFILES=	${MAN}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tbl/Makefile b/gnu/usr.bin/groff/tbl/Makefile
deleted file mode 100644
index 45c41a5..0000000
--- a/gnu/usr.bin/groff/tbl/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PROG=		tbl
-SRCS=		main.cc table.cc
-LDADD+=		${LIBGROFF} -lm
-DPADD+=		${LIBGROFF} ${LIBM}
-
-CLEANFILES+=	tbl.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tfmtodit/Makefile b/gnu/usr.bin/groff/tfmtodit/Makefile
deleted file mode 100644
index a0c17dd..0000000
--- a/gnu/usr.bin/groff/tfmtodit/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PROG=		tfmtodit
-SRCS=		tfmtodit.cc
-LDADD+=		${LIBGROFF} -lm
-DPADD+=		${LIBGROFF} ${LIBM}
-
-CLEANFILES+=	tfmtodit.1
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index ed11344..8b9de6e 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -1,68 +1,74 @@
 # $FreeBSD$
 
-.include "../Makefile.inc"
-
 TMACOWN?=	${BINOWN}
 TMACGRP?=	${BINGRP}
 TMACMODE?=	${NOBINMODE}
 TMACDIR?=	${SHAREDIR}/tmac
 MDOCDIR?=	${TMACDIR}/mdoc
-LOCALEDIR?=     ${MDOCDIR}/locale
 
 MAN=		groff_tmac.5
 MLINKS+=	groff_tmac.5 tmac.5
-MAN+=		groff_ms.7 groff_man.7 groff_me.7 groff_msafer.7 groff_markup.7
+MAN+=		groff_ms.7 groff_man.7 groff_me.7 groff_mdoc.7 groff_mwww.7
 MLINKS+=	groff_ms.7 ms.7
+MLINKS+=	groff_man.7 man.7
 MLINKS+=	groff_me.7 me.7
-MLINKS+=	groff_msafer.7 msafer.7
-MLINKS+=	groff_markup.7 markup.7
-LINKS=          ${TMACDIR}/tmac.andoc ${TMACDIR}/tmac.an
+MLINKS+=	groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7
+MLINKS+=	groff_mwww.7 mwww.7
 
-CLEANFILES=	${MAN} ${MDOCFILES} ${STRIPFILES} ${SPECIALFILES}
-CLEANFILES+=	tmac.an-old
+CLEANFILES=	${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/}
 
-FILES=          tmac.mandoc tmac.andoc tmac.pic tmac.ps tmac.psnew tmac.psold \
-		tmac.pspic tmac.psatk tmac.dvi tmac.tty tmac.tty-char \
-		tmac.X tmac.Xps tmac.latin1 tmac.lj4 eqnrc troffrc troffrc-end \
-		tmac.safer tmac.html tmac.markup tmac.arkup tmac.a4 \
-		tmac.trace tmac.me tmac.mdoc tmac.s tmac.lbp
-STRIPFILES=     tmac.e tmac.doc
-SPECIALFILES=	tmac.man tmac.ms
-MDOCFILES=	doc-common doc-ditroff doc-nroff doc-syms
-LOCALEFILES=    locale-list koi8-r
+NORMALFILES=	mandoc.tmac andoc.tmac an-old.tmac \
+		me.tmac \
+		mdoc.tmac \
+		pic.tmac \
+		a4.tmac \
+		safer.tmac \
+		trace.tmac \
+		ps.tmac psold.tmac pspic.tmac psatk.tmac \
+		dvi.tmac \
+		tty.tmac tty-char.tmac latin1.tmac \
+		X.tmac Xps.tmac \
+		lj4.tmac \
+		html.tmac mwww.tmac www.tmac \
+		eqnrc \
+		troffrc troffrc-end \
+		hyphen.us
+SPECIALFILES=	an.tmac man.tmac s.tmac ms.tmac
+STRIPFILES=	e.tmac doc.tmac mdoc.local
+MDOCFILES=	doc-common doc-ditroff doc-nroff doc-syms koi8-r
 
-all: ${MDOCFILES} ${STRIPFILES} ${SPECIALFILES} tmac.an-old
+all: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/}
 
 .for f in ${MDOCFILES} ${STRIPFILES}
-$f: ${DIST_DIR}/$f
+$f-s: $f
 	sed -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET}
 .endfor
 
 .for f in ${SPECIALFILES}
-$f: ${DIST_DIR}/$f
-	sed -e "s;@TMAC_AN_PREFIX@;$(tmac_an_prefix);g" \
-	    -e "s;@TMAC_S_PREFIX@;$(tmac_s_prefix);g" \
+$f-s: $f
+	sed -e "s;@TMAC_AN_PREFIX@;${tmac_an_prefix};g" \
+	    -e "s;@TMAC_S_PREFIX@;${tmac_s_prefix};g" \
 		${.ALLSRC} > ${.TARGET}
 .endfor
 
-tmac.an-old: tmac.an
-	sed -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET}
-
 beforeinstall:
-	${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-	    ${MDOCFILES} ${DESTDIR}${MDOCDIR}
-	${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-	    ${STRIPFILES} ${SPECIALFILES} tmac.an-old ${DESTDIR}${TMACDIR}
 	cd ${DIST_DIR}; \
 	    ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-	    ${FILES} ${DESTDIR}${TMACDIR}
-	cd ${DIST_DIR}/locale; \
-	    ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-	    ${LOCALEFILES} ${DESTDIR}${LOCALEDIR}
+	    ${NORMALFILES} ${DESTDIR}${TMACDIR}
+	cd ${.CURDIR}; \
+	    ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+	    hyphen.us-ru ${DESTDIR}${TMACDIR}
+.for f in ${STRIPFILES} ${SPECIALFILES}
+	${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+	    $f-s ${DESTDIR}${TMACDIR}/$f
+.endfor
+.for f in ${MDOCFILES}
+	${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+	    $f-s ${DESTDIR}${MDOCDIR}/$f
+.endfor
 .if !exists(${DESTDIR}${TMACDIR}/man.local)
 	${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 	    ${DIST_DIR}/man.local ${DESTDIR}${TMACDIR}
 .endif
 
-.include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tmac/koi8-r b/gnu/usr.bin/groff/tmac/koi8-r
new file mode 100644
index 0000000..58391a8
--- /dev/null
+++ b/gnu/usr.bin/groff/tmac/koi8-r
@@ -0,0 +1,150 @@
+.\" Copyright (c) 2001 Ruslan Ermilov <ru@FreeBSD.org>.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.\"     %beginstrip%
+.
+.\" локализация .Dt
+.ds doc-volume-ds-1 Справочник основных команд FreeBSD
+.ds doc-volume-ds-2 Справочник системных вызовов FreeBSD
+.ds doc-volume-ds-3 Справочник библиотечных функций FreeBSD
+.ds doc-volume-ds-4 Справочник интерфейсов ядра FreeBSD
+.ds doc-volume-ds-5 Справочник форматов файлов FreeBSD
+.ds doc-volume-ds-6 Справочник игр FreeBSD
+.ds doc-volume-ds-7 Справочник разной информации FreeBSD
+.ds doc-volume-ds-8 Справочник системного администратора
+.ds doc-volume-ds-9 Справочник разработчика ядра FreeBSD
+.
+.ds doc-volume-ds-USD   Дополнительные документы для пользователя
+.ds doc-volume-ds-PS1   Дополнительные документы для программиста
+.ds doc-volume-ds-AMD   Документы унаследованного справочника
+.ds doc-volume-ds-SMM   Руководство системного администратора
+.ds doc-volume-ds-URM   Справочное руководство
+.ds doc-volume-ds-PRM   Руководство программиста
+.ds doc-volume-ds-KM    Руководство по ядру
+.ds doc-volume-ds-IND   Основной предметный указатель справочника
+.ds doc-volume-ds-LOCAL Локальный справочник
+.ds doc-volume-ds-CON   Справочник по дополнительному ПО
+.
+.ds doc-volume-as-alpha    (архитектура Alpha)
+.ds doc-volume-as-amiga    (архитектура Amiga)
+.ds doc-volume-as-arc      (архитектура Arc)
+.ds doc-volume-as-arm26    (архитектура ARM26)
+.ds doc-volume-as-arm32    (архитектура ARM32)
+.ds doc-volume-as-atari    (архитектура Atari)
+.ds doc-volume-as-bebox    (архитектура BEbox)
+.ds doc-volume-as-cobalt   (архитектура Cobalt)
+.ds doc-volume-as-evbsh3   (архитектура Evbsh3)
+.ds doc-volume-as-hp300    (архитектура HP300)
+.ds doc-volume-as-hpcmips  (архитектура HPcmips)
+.ds doc-volume-as-i386     (архитектура i386)
+.ds doc-volume-as-luna68k  (архитектура luna68k)
+.ds doc-volume-as-m68k     (архитектура m68k)
+.ds doc-volume-as-mac68k   (архитектура mac68k)
+.ds doc-volume-as-macppc   (архитектура macppc)
+.ds doc-volume-as-mips     (архитектура MIPS)
+.ds doc-volume-as-mmeye    (архитектура mmeye)
+.ds doc-volume-as-mvme68k  (архитектура mvme68k)
+.ds doc-volume-as-news68k  (архитектура news68k)
+.ds doc-volume-as-newsmips (архитектура newsmips)
+.ds doc-volume-as-next68k  (архитектура next68k)
+.ds doc-volume-as-ofppc    (архитектура ofppc)
+.ds doc-volume-as-pc532    (архитектура pc532)
+.ds doc-volume-as-pmax     (архитектура pmax)
+.ds doc-volume-as-powerpc  (архитектура powerpc)
+.ds doc-volume-as-prep     (архитектура prep)
+.ds doc-volume-as-sgimips  (архитектура sgimips)
+.ds doc-volume-as-sh3      (архитектура sh3)
+.ds doc-volume-as-sparc    (архитектура SPARC)
+.ds doc-volume-as-sparc64  (архитектура sparc64)
+.ds doc-volume-as-sun3     (архитектура sun3)
+.ds doc-volume-as-tahoe    (архитектура Tahoe)
+.ds doc-volume-as-vax      (архитектура VAX)
+.ds doc-volume-as-x68k     (архитектура x68k)
+.
+.\" локализация .Os
+.ds doc-operating-system-ATT-7    7я\~редакция
+.ds doc-operating-system-BSD-3    3й\~дистрибутив Беркли
+.ds doc-operating-system-BSD-4    4й\~дистрибутив Беркли
+.ds doc-operating-system-BSD-4.1  4.1\~дистрибутив Беркли
+.ds doc-operating-system-BSD-4.2  4.2\~дистрибутив Беркли
+.ds doc-operating-system-BSD-4.3  4.3\~дистрибутив Беркли
+.ds doc-operating-system-BSD-4.3T 4.3-Tahoe дистрибутив Беркли
+.ds doc-operating-system-BSD-4.3R 4.3-Reno дистрибутив Беркли
+.
+.\" локализация .Sh
+.ds doc-section-name        НАЗВАНИЕ
+.ds doc-section-synopsis    СИНТАКСИС
+.ds doc-section-description ОПИСАНИЕ
+.ds doc-section-see-also    СМОТРИ
+.ds doc-section-files       ФАЙЛЫ
+.ds doc-section-authors     АВТОРЫ
+.
+.\" локализация .Lb (XXX)
+.ds doc-str-Lb-libarm32    Библиотека архитектуры ARM32 (libarm32, \-larm32)
+.ds doc-str-Lb-libc        Стандартная библиотека\~C (libc, \-lc)
+.ds doc-str-Lb-libc_r      Реентерабельная библиотека\~C (libc_r, \-pthread)
+.ds doc-str-Lb-libcalendar Библиотека календарной арифметики (libcalendar, \-lcalendar)
+.ds doc-str-Lb-libcam      Пользовательская библиотека CAM (libcam, \-lcam)
+.ds doc-str-Lb-libcipher   Библиотека криптографии FreeSec (libcipher, \-lcipher)
+.ds doc-str-Lb-libcompat   Библиотека совместимости (libcompat, \-lcompat)
+.ds doc-str-Lb-libcrypt    Библиотека криптографии (libcrypt, \-lcrypt)
+.ds doc-str-Lb-libcurses   Curses Library (libcurses, \-lcurses)
+.ds doc-str-Lb-libdevstat  Библиотека статистики устройств (libdevstat, \-ldevstat)
+.ds doc-str-Lb-libdisk     Interface to Slice and Partition Labels Library (libdisk, \-ldisk)
+.ds doc-str-Lb-libedit     Библиотека редактора командной строки (libedit, \-ledit)
+.ds doc-str-Lb-libfetch    Библиотека файловой передачи (libfetch, \-lfetch)
+.ds doc-str-Lb-libi386     Библиотека архитектуры i386 (libi386, \-li386)
+.ds doc-str-Lb-libipsec    Библиотека управления IPsec Policy (libipsec, \-lipsec)
+.ds doc-str-Lb-libipx      Библиотека поддержки конверсии адресов IPX (libipx, \-lipx)
+.ds doc-str-Lb-libkvm      Библиотека доступа к данным ядра (libkvm, \-lkvm)
+.ds doc-str-Lb-libm        Библиотека математических функций (libm, \-lm)
+.ds doc-str-Lb-libmd       Message Digest (MD4, MD5, и т.д.) Support Library (libmd, \-lmd)
+.ds doc-str-Lb-libmenu     Curses Menu Library (libmenu, \-lmenu)
+.ds doc-str-Lb-libnetgraph Пользовательская библиотека Netgraph (libnetgraph, \-lnetgraph)
+.ds doc-str-Lb-libossaudio Библиотека эмуляции OSS Audio (libossaudio, \-lossaudio)
+.ds doc-str-Lb-libposix    Библиотека \*[Px]\-совместимости (libposix, \-lposix)
+.ds doc-str-Lb-libposix1e  Библиотека интерфейсов безопасности POSIX.1e (libposix1e, \-lposix1e)
+.ds doc-str-Lb-libresolv   DNS Resolver Library (libresolv, \-lresolv)
+.ds doc-str-Lb-librpcsvc   Библиотека служб RPC (librpcsvc, \-lrpcsvc)
+.ds doc-str-Lb-libskey     S/Key Password Control Table Access Library (libskey, \-lskey)
+.ds doc-str-Lb-libtermcap  Библиотека доступа к termcap (libtermcap, \-ltermcap)
+.ds doc-str-Lb-libusb      Библиотека функций доступа к USB HID (libusb, \-lusb)
+.ds doc-str-Lb-libutil     Библиотека системных утилит (libutil, \-lutil)
+.ds doc-str-Lb-libvgl      Библиотека видео-графики (libvgl, \-lvgl)
+.ds doc-str-Lb-libz        Библиотека компрессии (libz, \-lz)
+.
+.\" локализация .Rv
+.ds doc-str-Rv-prefix "Функция
+.ds doc-str-Rv-suffix "возвращает\~0 в случае успешного завершения;
+.as doc-str-Rv-suffix " в противном случае она возвращает\~-1,
+.as doc-str-Rv-suffix " а код ошибки сохраняется в глобальной
+.as doc-str-Rv-suffix " переменной \*[doc-Va-font]errno\f[P].
+.
+.\" локализация .Ar
+.ds doc-str-Ar-default "файл\ .\|.\|.
+.
+.\" локализация .%A
+.ds doc-str-dpra "и
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
new file mode 100644
index 0000000..b5ec9cd
--- /dev/null
+++ b/gnu/usr.bin/groff/tmac/mdoc.local
@@ -0,0 +1,62 @@
+.\" Copyright (c) 2001 Ruslan Ermilov <ru@FreeBSD.org>.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.\"     %beginstrip%
+.
+.\" FreeBSD section names
+.ds doc-volume-ds-1 FreeBSD General Commands Manual
+.ds doc-volume-ds-2 FreeBSD System Calls Manual
+.ds doc-volume-ds-3 FreeBSD Library Functions Manual
+.ds doc-volume-ds-4 FreeBSD Kernel Interfaces Manual
+.ds doc-volume-ds-5 FreeBSD File Formats Manual
+.ds doc-volume-ds-6 FreeBSD Games Manual
+.ds doc-volume-ds-7 FreeBSD Miscellaneous Information Manual
+.ds doc-volume-ds-8 FreeBSD System Manager's Manual
+.ds doc-volume-ds-9 FreeBSD Kernel Developer's Manual
+.
+.\" FreeBSD .Lb values
+.ds doc-str-Lb-libc_r      Reentrant C\~Library (libc_r, \-lc_r)
+.ds doc-str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar)
+.ds doc-str-Lb-libcam      Common Access Method User Library (libcam, \-lcam)
+.ds doc-str-Lb-libcipher   FreeSec Crypt Library (libcipher, \-lcipher)
+.ds doc-str-Lb-libdevstat  Device Statistics Library (libdevstat, \-ldevstat)
+.ds doc-str-Lb-libdisk     Interface to Slice and Partition Labels Library (libdisk, \-ldisk)
+.ds doc-str-Lb-libedit     Line Editor and History Library (libedit, \-ledit)
+.ds doc-str-Lb-libfetch    File Transfer Library (libfetch, \-lfetch)
+.ds doc-str-Lb-libipx      IPX Address Conversion Support Library (libipx, \-lipx)
+.ds doc-str-Lb-libmd       Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd)
+.ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph)
+.ds doc-str-Lb-librpcsvc   RPC Service Library (librpcsvc, \-lrpcsvc)
+.ds doc-str-Lb-libskey     S/Key Password Control Table Access Library (libskey, \-lskey)
+.ds doc-str-Lb-libusb      USB HID access routines library (libusb, \-lusb)
+.ds doc-str-Lb-libvgl      Video Graphics Library (libvgl, \-lvgl)
+.
+.\" Default .Os value
+.ds doc-operating-system FreeBSD\~5.0
+.
+.
+.\" KOI8-R locale support
+.if "\*[.T]"koi8-r" .mso mdoc/koi8-r
diff --git a/gnu/usr.bin/groff/tmac/ru.KOI8-R b/gnu/usr.bin/groff/tmac/ru.KOI8-R
new file mode 100644
index 0000000..58391a8
--- /dev/null
+++ b/gnu/usr.bin/groff/tmac/ru.KOI8-R
@@ -0,0 +1,150 @@
+.\" Copyright (c) 2001 Ruslan Ermilov <ru@FreeBSD.org>.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.\"     %beginstrip%
+.
+.\" локализация .Dt
+.ds doc-volume-ds-1 Справочник основных команд FreeBSD
+.ds doc-volume-ds-2 Справочник системных вызовов FreeBSD
+.ds doc-volume-ds-3 Справочник библиотечных функций FreeBSD
+.ds doc-volume-ds-4 Справочник интерфейсов ядра FreeBSD
+.ds doc-volume-ds-5 Справочник форматов файлов FreeBSD
+.ds doc-volume-ds-6 Справочник игр FreeBSD
+.ds doc-volume-ds-7 Справочник разной информации FreeBSD
+.ds doc-volume-ds-8 Справочник системного администратора
+.ds doc-volume-ds-9 Справочник разработчика ядра FreeBSD
+.
+.ds doc-volume-ds-USD   Дополнительные документы для пользователя
+.ds doc-volume-ds-PS1   Дополнительные документы для программиста
+.ds doc-volume-ds-AMD   Документы унаследованного справочника
+.ds doc-volume-ds-SMM   Руководство системного администратора
+.ds doc-volume-ds-URM   Справочное руководство
+.ds doc-volume-ds-PRM   Руководство программиста
+.ds doc-volume-ds-KM    Руководство по ядру
+.ds doc-volume-ds-IND   Основной предметный указатель справочника
+.ds doc-volume-ds-LOCAL Локальный справочник
+.ds doc-volume-ds-CON   Справочник по дополнительному ПО
+.
+.ds doc-volume-as-alpha    (архитектура Alpha)
+.ds doc-volume-as-amiga    (архитектура Amiga)
+.ds doc-volume-as-arc      (архитектура Arc)
+.ds doc-volume-as-arm26    (архитектура ARM26)
+.ds doc-volume-as-arm32    (архитектура ARM32)
+.ds doc-volume-as-atari    (архитектура Atari)
+.ds doc-volume-as-bebox    (архитектура BEbox)
+.ds doc-volume-as-cobalt   (архитектура Cobalt)
+.ds doc-volume-as-evbsh3   (архитектура Evbsh3)
+.ds doc-volume-as-hp300    (архитектура HP300)
+.ds doc-volume-as-hpcmips  (архитектура HPcmips)
+.ds doc-volume-as-i386     (архитектура i386)
+.ds doc-volume-as-luna68k  (архитектура luna68k)
+.ds doc-volume-as-m68k     (архитектура m68k)
+.ds doc-volume-as-mac68k   (архитектура mac68k)
+.ds doc-volume-as-macppc   (архитектура macppc)
+.ds doc-volume-as-mips     (архитектура MIPS)
+.ds doc-volume-as-mmeye    (архитектура mmeye)
+.ds doc-volume-as-mvme68k  (архитектура mvme68k)
+.ds doc-volume-as-news68k  (архитектура news68k)
+.ds doc-volume-as-newsmips (архитектура newsmips)
+.ds doc-volume-as-next68k  (архитектура next68k)
+.ds doc-volume-as-ofppc    (архитектура ofppc)
+.ds doc-volume-as-pc532    (архитектура pc532)
+.ds doc-volume-as-pmax     (архитектура pmax)
+.ds doc-volume-as-powerpc  (архитектура powerpc)
+.ds doc-volume-as-prep     (архитектура prep)
+.ds doc-volume-as-sgimips  (архитектура sgimips)
+.ds doc-volume-as-sh3      (архитектура sh3)
+.ds doc-volume-as-sparc    (архитектура SPARC)
+.ds doc-volume-as-sparc64  (архитектура sparc64)
+.ds doc-volume-as-sun3     (архитектура sun3)
+.ds doc-volume-as-tahoe    (архитектура Tahoe)
+.ds doc-volume-as-vax      (архитектура VAX)
+.ds doc-volume-as-x68k     (архитектура x68k)
+.
+.\" локализация .Os
+.ds doc-operating-system-ATT-7    7я\~редакция
+.ds doc-operating-system-BSD-3    3й\~дистрибутив Беркли
+.ds doc-operating-system-BSD-4    4й\~дистрибутив Беркли
+.ds doc-operating-system-BSD-4.1  4.1\~дистрибутив Беркли
+.ds doc-operating-system-BSD-4.2  4.2\~дистрибутив Беркли
+.ds doc-operating-system-BSD-4.3  4.3\~дистрибутив Беркли
+.ds doc-operating-system-BSD-4.3T 4.3-Tahoe дистрибутив Беркли
+.ds doc-operating-system-BSD-4.3R 4.3-Reno дистрибутив Беркли
+.
+.\" локализация .Sh
+.ds doc-section-name        НАЗВАНИЕ
+.ds doc-section-synopsis    СИНТАКСИС
+.ds doc-section-description ОПИСАНИЕ
+.ds doc-section-see-also    СМОТРИ
+.ds doc-section-files       ФАЙЛЫ
+.ds doc-section-authors     АВТОРЫ
+.
+.\" локализация .Lb (XXX)
+.ds doc-str-Lb-libarm32    Библиотека архитектуры ARM32 (libarm32, \-larm32)
+.ds doc-str-Lb-libc        Стандартная библиотека\~C (libc, \-lc)
+.ds doc-str-Lb-libc_r      Реентерабельная библиотека\~C (libc_r, \-pthread)
+.ds doc-str-Lb-libcalendar Библиотека календарной арифметики (libcalendar, \-lcalendar)
+.ds doc-str-Lb-libcam      Пользовательская библиотека CAM (libcam, \-lcam)
+.ds doc-str-Lb-libcipher   Библиотека криптографии FreeSec (libcipher, \-lcipher)
+.ds doc-str-Lb-libcompat   Библиотека совместимости (libcompat, \-lcompat)
+.ds doc-str-Lb-libcrypt    Библиотека криптографии (libcrypt, \-lcrypt)
+.ds doc-str-Lb-libcurses   Curses Library (libcurses, \-lcurses)
+.ds doc-str-Lb-libdevstat  Библиотека статистики устройств (libdevstat, \-ldevstat)
+.ds doc-str-Lb-libdisk     Interface to Slice and Partition Labels Library (libdisk, \-ldisk)
+.ds doc-str-Lb-libedit     Библиотека редактора командной строки (libedit, \-ledit)
+.ds doc-str-Lb-libfetch    Библиотека файловой передачи (libfetch, \-lfetch)
+.ds doc-str-Lb-libi386     Библиотека архитектуры i386 (libi386, \-li386)
+.ds doc-str-Lb-libipsec    Библиотека управления IPsec Policy (libipsec, \-lipsec)
+.ds doc-str-Lb-libipx      Библиотека поддержки конверсии адресов IPX (libipx, \-lipx)
+.ds doc-str-Lb-libkvm      Библиотека доступа к данным ядра (libkvm, \-lkvm)
+.ds doc-str-Lb-libm        Библиотека математических функций (libm, \-lm)
+.ds doc-str-Lb-libmd       Message Digest (MD4, MD5, и т.д.) Support Library (libmd, \-lmd)
+.ds doc-str-Lb-libmenu     Curses Menu Library (libmenu, \-lmenu)
+.ds doc-str-Lb-libnetgraph Пользовательская библиотека Netgraph (libnetgraph, \-lnetgraph)
+.ds doc-str-Lb-libossaudio Библиотека эмуляции OSS Audio (libossaudio, \-lossaudio)
+.ds doc-str-Lb-libposix    Библиотека \*[Px]\-совместимости (libposix, \-lposix)
+.ds doc-str-Lb-libposix1e  Библиотека интерфейсов безопасности POSIX.1e (libposix1e, \-lposix1e)
+.ds doc-str-Lb-libresolv   DNS Resolver Library (libresolv, \-lresolv)
+.ds doc-str-Lb-librpcsvc   Библиотека служб RPC (librpcsvc, \-lrpcsvc)
+.ds doc-str-Lb-libskey     S/Key Password Control Table Access Library (libskey, \-lskey)
+.ds doc-str-Lb-libtermcap  Библиотека доступа к termcap (libtermcap, \-ltermcap)
+.ds doc-str-Lb-libusb      Библиотека функций доступа к USB HID (libusb, \-lusb)
+.ds doc-str-Lb-libutil     Библиотека системных утилит (libutil, \-lutil)
+.ds doc-str-Lb-libvgl      Библиотека видео-графики (libvgl, \-lvgl)
+.ds doc-str-Lb-libz        Библиотека компрессии (libz, \-lz)
+.
+.\" локализация .Rv
+.ds doc-str-Rv-prefix "Функция
+.ds doc-str-Rv-suffix "возвращает\~0 в случае успешного завершения;
+.as doc-str-Rv-suffix " в противном случае она возвращает\~-1,
+.as doc-str-Rv-suffix " а код ошибки сохраняется в глобальной
+.as doc-str-Rv-suffix " переменной \*[doc-Va-font]errno\f[P].
+.
+.\" локализация .Ar
+.ds doc-str-Ar-default "файл\ .\|.\|.
+.
+.\" локализация .%A
+.ds doc-str-dpra "и