43 files changed, 256 insertions, 226 deletions

diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile
index fc6c920f319e9..81b7fa782ae8e 100644
--- a/gnu/usr.bin/groff/Makefile
+++ b/gnu/usr.bin/groff/Makefile
@@ -1,16 +1,15 @@
-# Makefile for groff
-#
 # $FreeBSD$
 
 SUBDIR=		libgroff libdriver libbib \
-		addftinfo eqn \
-		grodvi groff grog grohtml grolj4 grops grotty \
-		indxbib lkbib lookbib man mm nroff \
-		pfbtops pic psbb refer tbl tfmtodit tmac troff \
-		devX100 devX100-12 devX75 devX75-12 devascii devdvi \
-		devhtml devlatin1 devkoi8-r devlj4 devps
+		addftinfo afmtodit 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 be default
-MISC=		soelim afmtodit doc hpftodit xditview
+# BSD already provides soelim and we don't want xditview compiled by default
+MISC=		soelim doc xditview
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/Makefile.cfg b/gnu/usr.bin/groff/Makefile.cfg
index 3138a7790f44f..90964d49c3cae 100644
--- a/gnu/usr.bin/groff/Makefile.cfg
+++ b/gnu/usr.bin/groff/Makefile.cfg
@@ -43,7 +43,8 @@ DVIPRINT=lpr -d
 
 g=
 tmac_s_prefix=
-tmac_m=m
+tmac_m_prefix=
+tmac_an_prefix=
 device=ps
 fontdir=/usr/share/groff_font
 fontpath=$(fontdir)
@@ -71,17 +72,29 @@ LIBBIB=		$(.CURDIR)/../libbib/libbib.a
 DEFINES=	-DHAVE_UNISTD_H=1\
 		-DHAVE_DIRENT_H=1\
 		-DHAVE_LIMITS_H=1\
-		-DHAVE_SYS_DIR_H=1\
 		-DHAVE_STDLIB_H=1\
-		-DUNISTD_H_DECLARES_GETOPT=1\
-		-DSTDLIB_H_DECLARES_PUTENV=1\
-		-DSTDIO_H_DECLARES_POPEN=1\
-		-DSTDIO_H_DECLARE_PCLOSE=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
@@ -92,17 +105,18 @@ 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
+	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
+	mv -f y.tab.h $(.PREFIX)_tab.h
 
 .SUFFIXES: .man .1 .2 .3 .4 .5 .6 .7 .8
 
-#.8.man .7.man .6.man .5.man .4.man .3.man .2.man .1.man:
+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 $<
@@ -120,10 +134,11 @@ CXXFLAGS+= -fno-rtti -fno-exceptions
 	-e "s;@MAN5EXT@;5;g" \
 	-e "s;@MAN7EXT@;7;g" \
 	-e "s;@TMAC_S_PREFIX@;$(tmac_s_prefix);g" \
-	-e "s;@TMAC_M@;$(tmac_m);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@;`cat ${GROFF_DIST}/VERSION`;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.tty b/gnu/usr.bin/groff/Makefile.tty
index b745c0247f009..6d27a3b42b4a1 100644
--- a/gnu/usr.bin/groff/Makefile.tty
+++ b/gnu/usr.bin/groff/Makefile.tty
@@ -1,25 +1,4 @@
-#	@(#)Makefile.tty	6.1 (Berkeley) 3/3/91
-#
-# Modified for Berkeley Unix by Donn Seeley, donn@okeeffe.berkeley.edu
-#
-#Copyright (C) 1989, 1990 Free Software Foundation, Inc.
-#     Written by James Clark (jjc@jclark.uucp)
-#
-#This file is part of groff.
-#
-#groff is free software; you can redistribute it and/or modify it under
-#the terms of the GNU General Public License as published by the Free
-#Software Foundation; either version 1, or (at your option) any later
-#version.
-#
-#groff is distributed in the hope that it will be useful, but WITHOUT ANY
-#WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#for more details.
-#
-#You should have received a copy of the GNU General Public License along
-#with groff; see the file LICENSE.  If not, write to the Free Software
-#Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# $FreeBSD$
 
 .MAIN: all
 
@@ -33,7 +12,7 @@ CLEANFILES=$(DEVFILES)
 
 $(FONTS): R.proto
 	@${ECHO} Making $@
-	@(charwidth=`echo  $(RES) / $(CPI) | bc` ; \
+	@(charwidth=`expr $(RES) / $(CPI)` ; \
  	 sed -e "s/^name [A-Z]*$$/name $@/" \
 	     -e "s/^\\([^	]*\\)	[0-9]+	/\\1	$$charwidth	/" \
 	     -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
@@ -47,8 +26,8 @@ $(FONTS): R.proto
 DESC: DESC.proto
 	@${ECHO} Making $@
 	@sed -e "s/^res .*$$/res $(RES)/" \
-	    -e "s/^hor .*$$/hor `echo $(RES) / $(CPI) | bc`/" \
-	    -e "s/^vert .*$$/vert `echo $(RES) / $(LPI) | bc`/" \
+	    -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
index 7ca9a6038b162..b510b11bb884c 100644
--- a/gnu/usr.bin/groff/addftinfo/Makefile
+++ b/gnu/usr.bin/groff/addftinfo/Makefile
@@ -1,13 +1,11 @@
-# Makefile for addftinfo
+# $FreeBSD$
 
 PROG=		addftinfo
 SRCS=		addftinfo.cc guess.cc
-#CFLAGS+=	-I${.CURDIR}/../include
 LDADD+=		${LIBGROFF}
 DPADD+=		${LIBGROFF}
 
-MANDEPEND=	addftinfo.1
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN1}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/afmtodit/Makefile b/gnu/usr.bin/groff/afmtodit/Makefile
new file mode 100644
index 0000000000000..ac347b39c0e5a
--- /dev/null
+++ b/gnu/usr.bin/groff/afmtodit/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+MAN1=		afmtodit.1
+
+CLEANFILES+=	${MAN1}
+
+beforeinstall:
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+		${DIST_DIR}/afmtodit.pl ${DESTDIR}${BINDIR}/afmtodit
+
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/devascii/Makefile b/gnu/usr.bin/groff/devascii/Makefile
index 71fe94255df97..544ec16e475d5 100644
--- a/gnu/usr.bin/groff/devascii/Makefile
+++ b/gnu/usr.bin/groff/devascii/Makefile
@@ -1,7 +1,6 @@
-# Makefile for devascii
+# $FreeBSD$
 
 DEV=		ascii
 
-.include "../Makefile.inc"
 .include "../Makefile.tty"
 .include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devcp1047/Makefile b/gnu/usr.bin/groff/devcp1047/Makefile
new file mode 100644
index 0000000000000..d0a887a685c44
--- /dev/null
+++ b/gnu/usr.bin/groff/devcp1047/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+DEV=		cp1047
+
+.include "../Makefile.tty"
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devdvi/Makefile b/gnu/usr.bin/groff/devdvi/Makefile
index 788b4f024a72e..be769922c54ab 100644
--- a/gnu/usr.bin/groff/devdvi/Makefile
+++ b/gnu/usr.bin/groff/devdvi/Makefile
@@ -1,14 +1,14 @@
+# $FreeBSD$
+
 DEV=		dvi
-FONTFILES=	R I B BI CW MI S EX H HI HB SA SB DESC $(DEVGENFILES)
-DEVGENFILES=	generate/CompileFonts generate/Makefile generate/msam.map\
+DEVFILES=	DESC R I B BI CW CWI MI S EX H HI HB SA SB \
+		generate/CompileFonts generate/Makefile generate/msam.map\
 		generate/msbm.map generate/texb.map generate/texex.map \
 		generate/texi.map generate/texmi.map generate/texr.map \
-		generate/texsy.map generate/textt.map generate/cork.map
+		generate/texsy.map generate/textt.map
 
 CLEANFILES+=	DESC
 
-DEVFILES=	$(FONTFILES)
-
 .include "../Makefile.inc"
 
 DESC:	DESC.in
diff --git a/gnu/usr.bin/groff/devhtml/Makefile b/gnu/usr.bin/groff/devhtml/Makefile
index 1a50e261d2e54..06265d9b9ac7b 100644
--- a/gnu/usr.bin/groff/devhtml/Makefile
+++ b/gnu/usr.bin/groff/devhtml/Makefile
@@ -1,9 +1,7 @@
 # $FreeBSD$
-#
-# Generic groff font makefile
 
-NOOBJ=
+DEV=		html
+DEVFILES=	DESC TR TI TB TBI CR CI CB CBI HR HI HB HBI NR NI NB NBI S
 
-.include "${.CURDIR}/../Makefile.inc"
-.include "${DIST_DIR}/Makefile.sub"
-.include "${.CURDIR}/../Makefile.dev"
+.include "../Makefile.inc"
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devkoi8-r/Makefile b/gnu/usr.bin/groff/devkoi8-r/Makefile
index 8dc253021ecbc..399d2b6d0879f 100644
--- a/gnu/usr.bin/groff/devkoi8-r/Makefile
+++ b/gnu/usr.bin/groff/devkoi8-r/Makefile
@@ -1,6 +1,6 @@
-# Makefile for devkoi8-r
+# $FreeBSD$
 
-DEV=         koi8-r
+DEV=		koi8-r
 
 .include "../Makefile.tty"
 .include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devlatin1/Makefile b/gnu/usr.bin/groff/devlatin1/Makefile
index a3d9e406b2e5a..238320216c1e8 100644
--- a/gnu/usr.bin/groff/devlatin1/Makefile
+++ b/gnu/usr.bin/groff/devlatin1/Makefile
@@ -1,4 +1,4 @@
-# Makefile for devlatin1
+# $FreeBSD$
 
 DEV=		latin1
 
diff --git a/gnu/usr.bin/groff/devlbp/Makefile b/gnu/usr.bin/groff/devlbp/Makefile
new file mode 100644
index 0000000000000..164d9eced7f6b
--- /dev/null
+++ b/gnu/usr.bin/groff/devlbp/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+DEV=		lbp
+LBPPRINT=	${PSPRINT}
+DEVFILES=	DESC HB HBI HI HR TB TBI TI TR
+
+CLEANFILES+=	DESC
+
+.include "../Makefile.inc"
+
+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
index 94d19f59a5914..386abf6419b24 100644
--- a/gnu/usr.bin/groff/devlj4/Makefile
+++ b/gnu/usr.bin/groff/devlj4/Makefile
@@ -1,11 +1,14 @@
+# $FreeBSD$
+
 DEV=		lj4
-LJ4RES=		300
+LJ4RES=		600
 LJ4PRINT=	$(PSPRINT)
-DEVFILES=	$(FONTS) $(SUPPORT) $(DEVGENFILES) DESC
-FONTS=		ALBB ALBR AOB AOI AOR CB CBI CI CR GB GBI GI GR \
+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
-#DEVGENFILES=	generate/Makefile generate/text.map generate/special.map
+		UCB UCBI UCI UCR CLARENDON CORONET MARIGOLD S \
+		generate/Makefile generate/text.map generate/special.map
+
 CLEANFILES+=	DESC
 
 .include "../Makefile.inc"
@@ -22,9 +25,8 @@ DESC: DESC.in
 	fi
 	test -z '$(LJ4PRINT)' || echo print '$(LJ4PRINT)' >>DESC
 
-fonts:	DESC
-	$(MAKE) -f ${DIST_DIR}/generate/Makefile \
-		srcdir=${DIST_DIR}/generate DESC=${DIST_DIR}/DESC.in \
-	  	HPFTODIT=${.CURDIR}/../hpftodit/hpftodit
+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/devps/Makefile b/gnu/usr.bin/groff/devps/Makefile
index fd8cfc09ff71d..3a43b1894ea3e 100644
--- a/gnu/usr.bin/groff/devps/Makefile
+++ b/gnu/usr.bin/groff/devps/Makefile
@@ -1,14 +1,15 @@
+# $FreeBSD$
+
 DEV=		ps
-FONTS=		S ZD ZDR SS AB ABI AI AR BMB BMBI BMI BMR \
+DISTFILES=	text.enc download \
+		S ZD ZDR SS AB ABI AI AR BMB BMBI BMI BMR \
 		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
-SUPPORT=	download prologue symbolsl.pfa text.enc zapfdr.pfa
+PSFILES=	prologue symbolsl.pfa zapfdr.pfa
 DEVGENFILES=	generate/Makefile generate/afmname generate/dingbatsmap \
 		generate/dingbatsrmap generate/lgreekmap generate/symbol.sed \
 		generate/symbolchars generate/symbolsl.afm generate/textmap
-PSFILES=	prologue symbolsl.pfa zapfdr.pfa
-FONTFILES=	$(FONTS) $(SUPPORT) $(DEVGENFILES) DESC
-DEVFILES=	$(FONTFILES)
+DEVFILES=	DESC $(PSFILES) $(DISTFILES) $(DEVGENFILES)
 
 CLEANFILES+=	DESC ${PSFILES}
 
@@ -25,10 +26,6 @@ DESC: DESC.in
 	fi
 	test -z '${PSPRINT}' ||	echo print '${PSPRINT}' >>DESC
 
-${PSFILES}:
-	-rm -f $@
-	sed -f ${DIST_DIR}/psstrip.sed $? >$@
-
 fonts: DESC
 	${MAKE} -f ${DIST_DIR}/generate/Makefile \
 	  srcdir=${DIST_DIR}/generate DESC=${DIST_DIR}/DESC.in
@@ -37,4 +34,8 @@ prologue:	${DIST_DIR}/prologue.ps
 zapfdr.pfa:	${DIST_DIR}/zapfdr.ps
 symbolsl.pfa:	${DIST_DIR}/symbolsl.ps
 
+${PSFILES}:
+	-rm -f $@
+	sed -f ${DIST_DIR}/psstrip.sed $? >$@
+
 .include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devutf8/Makefile b/gnu/usr.bin/groff/devutf8/Makefile
new file mode 100644
index 0000000000000..bf5965e19d3e0
--- /dev/null
+++ b/gnu/usr.bin/groff/devutf8/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+DEV=		utf8
+
+.include "../Makefile.tty"
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
index 795fcca5bbe61..d031a260c2e3c 100644
--- a/gnu/usr.bin/groff/eqn/Makefile
+++ b/gnu/usr.bin/groff/eqn/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 PROG=		eqn
-SRCS=		eqn.cc eqn.tab.h main.cc lex.cc \
+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
 DPADD=		${LIBGROFF}
 LDADD=		${LIBGROFF}
 MAN1=		eqn.1 neqn.1
-CLEANFILES=	eqn.cc eqn.tab.h ${MAN1} neqn y.tab.c y.tab.h
+CLEANFILES=	eqn.cc eqn_tab.h ${MAN1} neqn y.tab.c y.tab.h
 
 all: neqn
 
@@ -15,7 +15,7 @@ beforeinstall:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} neqn \
 	    ${DESTDIR}${BINDIR}
 
-eqn.tab.h: eqn.cc
+eqn_tab.h: eqn.cc
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/font/Makefile.tty b/gnu/usr.bin/groff/font/Makefile.tty
index b745c0247f009..6d27a3b42b4a1 100644
--- a/gnu/usr.bin/groff/font/Makefile.tty
+++ b/gnu/usr.bin/groff/font/Makefile.tty
@@ -1,25 +1,4 @@
-#	@(#)Makefile.tty	6.1 (Berkeley) 3/3/91
-#
-# Modified for Berkeley Unix by Donn Seeley, donn@okeeffe.berkeley.edu
-#
-#Copyright (C) 1989, 1990 Free Software Foundation, Inc.
-#     Written by James Clark (jjc@jclark.uucp)
-#
-#This file is part of groff.
-#
-#groff is free software; you can redistribute it and/or modify it under
-#the terms of the GNU General Public License as published by the Free
-#Software Foundation; either version 1, or (at your option) any later
-#version.
-#
-#groff is distributed in the hope that it will be useful, but WITHOUT ANY
-#WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#for more details.
-#
-#You should have received a copy of the GNU General Public License along
-#with groff; see the file LICENSE.  If not, write to the Free Software
-#Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# $FreeBSD$
 
 .MAIN: all
 
@@ -33,7 +12,7 @@ CLEANFILES=$(DEVFILES)
 
 $(FONTS): R.proto
 	@${ECHO} Making $@
-	@(charwidth=`echo  $(RES) / $(CPI) | bc` ; \
+	@(charwidth=`expr $(RES) / $(CPI)` ; \
  	 sed -e "s/^name [A-Z]*$$/name $@/" \
 	     -e "s/^\\([^	]*\\)	[0-9]+	/\\1	$$charwidth	/" \
 	     -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
@@ -47,8 +26,8 @@ $(FONTS): R.proto
 DESC: DESC.proto
 	@${ECHO} Making $@
 	@sed -e "s/^res .*$$/res $(RES)/" \
-	    -e "s/^hor .*$$/hor `echo $(RES) / $(CPI) | bc`/" \
-	    -e "s/^vert .*$$/vert `echo $(RES) / $(LPI) | bc`/" \
+	    -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/grn/Makefile b/gnu/usr.bin/groff/grn/Makefile
new file mode 100644
index 0000000000000..ee63e49e71228
--- /dev/null
+++ b/gnu/usr.bin/groff/grn/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PROG=		grn
+SRCS=		hdb.cc hpoint.cc hgraph.cc main.cc
+CFLAGS+=	-I${.CURDIR}/../include
+LDADD+= 	${LIBGROFF} -lm
+DPADD+= 	${LIBGROFF} ${LIBM}
+
+CLEANFILES+=	${MAN1}
+
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grodvi/Makefile b/gnu/usr.bin/groff/grodvi/Makefile
index aa87393efe99d..5c15975b9c6a4 100644
--- a/gnu/usr.bin/groff/grodvi/Makefile
+++ b/gnu/usr.bin/groff/grodvi/Makefile
@@ -1,13 +1,11 @@
-# Makefile for grodvi
+# $FreeBSD$
 
 PROG=		grodvi
 SRCS=		dvi.cc
-#CFLAGS+=	-I${.CURDIR}/../include
 LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
 DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 
-MANDEPEND=	grodvi.1
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN1}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/groff/Makefile b/gnu/usr.bin/groff/groff/Makefile
index 9539f700d5605..d909179f2a095 100644
--- a/gnu/usr.bin/groff/groff/Makefile
+++ b/gnu/usr.bin/groff/groff/Makefile
@@ -1,4 +1,4 @@
-# Makefile for groff
+# $FreeBSD$
 
 PROG=		groff
 SRCS=		groff.cc pipeline.c
@@ -6,8 +6,7 @@ CFLAGS+=	-I${.CURDIR}/../include
 LDADD+=		${LIBGROFF} -lm
 DPADD+=		${LIBGROFF} ${LIBM}
 
-MANDEPEND=	groff.1
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN1}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grog/Makefile b/gnu/usr.bin/groff/grog/Makefile
index 3062160094577..0ae3a5e1758e1 100644
--- a/gnu/usr.bin/groff/grog/Makefile
+++ b/gnu/usr.bin/groff/grog/Makefile
@@ -12,5 +12,5 @@ beforeinstall:
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
 
-grog: ${DIST_DIR}/grog.sh
-	sed -e 's/gsoelim/soelim/' ${.ALLSRC} > ${.TARGET}
+grog: grog.sh
+	sed -e 's/@g@/$(g)/g' ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/groff/grohtml/Makefile b/gnu/usr.bin/groff/grohtml/Makefile
index 10111e98b74ec..c75f93a2ae4da 100644
--- a/gnu/usr.bin/groff/grohtml/Makefile
+++ b/gnu/usr.bin/groff/grohtml/Makefile
@@ -1,15 +1,12 @@
 # $FreeBSD$
-#
-# Makefile for grohtml
 
 PROG=		grohtml
-SRCS=		html.cc
+SRCS=		html.cc output.cc
 
 LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
 DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 
-MANDEPEND=	grohtml.1
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN1}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grolbp/Makefile b/gnu/usr.bin/groff/grolbp/Makefile
new file mode 100644
index 0000000000000..e71fd34913c8c
--- /dev/null
+++ b/gnu/usr.bin/groff/grolbp/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PROG=		grolbp
+SRCS=		lbp.cc
+LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
+
+CLEANFILES+=	${MAN1}
+
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grolj4/Makefile b/gnu/usr.bin/groff/grolj4/Makefile
index b5594e616c38c..a803ab991a23d 100644
--- a/gnu/usr.bin/groff/grolj4/Makefile
+++ b/gnu/usr.bin/groff/grolj4/Makefile
@@ -1,13 +1,11 @@
-# Makefile for grolj4
+# $FreeBSD$
 
 PROG=		grolj4
 SRCS=		lj4.cc
-#CFLAGS+=	-I${.CURDIR}/../include
 LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
 DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 
-MANDEPEND=	grolj4.1
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN1}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grops/Makefile b/gnu/usr.bin/groff/grops/Makefile
index 2a5b8a200de78..5ce668ddc4896 100644
--- a/gnu/usr.bin/groff/grops/Makefile
+++ b/gnu/usr.bin/groff/grops/Makefile
@@ -1,13 +1,11 @@
-# Makefile for grops
+# $FreeBSD$
 
 PROG=		grops
 SRCS=		ps.cc psrm.cc
-#CFLAGS+=	-I${.CURDIR}/../include
 LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
 DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 
-MANDEPEND=	grops.1
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN1}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grotty/Makefile b/gnu/usr.bin/groff/grotty/Makefile
index 68f7316caabc4..9da934f4d8404 100644
--- a/gnu/usr.bin/groff/grotty/Makefile
+++ b/gnu/usr.bin/groff/grotty/Makefile
@@ -1,13 +1,11 @@
-# Makefile for grotty
+# $FreeBSD$
 
 PROG=		grotty
 SRCS=		tty.cc
-#CFLAGS+=	-I${.CURDIR}/../include
 LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
 DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 
-MANDEPEND=	grotty.1
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN1}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/hpftodit/Makefile b/gnu/usr.bin/groff/hpftodit/Makefile
new file mode 100644
index 0000000000000..c1a0945f98bbe
--- /dev/null
+++ b/gnu/usr.bin/groff/hpftodit/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PROG=		hpftodit
+SRCS=		hpftodit.cc
+LDADD+=		${LIBGROFF} -lm
+DPADD+=		${LIBGROFF} ${LIBM}
+
+CLEANFILES+=	${MAN1}
+
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/indxbib/Makefile b/gnu/usr.bin/groff/indxbib/Makefile
index 1e5768a51f43a..d0a070dff5e5b 100644
--- a/gnu/usr.bin/groff/indxbib/Makefile
+++ b/gnu/usr.bin/groff/indxbib/Makefile
@@ -1,4 +1,4 @@
-# Makefile for indxbib
+# $FreeBSD$
 
 PROG=		indxbib
 SRCS=		indxbib.cc dirnamemax.c signal.c
@@ -6,8 +6,7 @@ CFLAGS+=	-I${.CURDIR}/../include
 LDADD+= 	${LIBBIB} ${LIBGROFF} -lm
 DPADD+= 	${LIBBIB} ${LIBGROFF} ${LIBM}
 
-MANDEPEND=	indxbib.1
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN1}
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
diff --git a/gnu/usr.bin/groff/libdriver/Makefile b/gnu/usr.bin/groff/libdriver/Makefile
index f1522d14edeb7..9851328dfe70c 100644
--- a/gnu/usr.bin/groff/libdriver/Makefile
+++ b/gnu/usr.bin/groff/libdriver/Makefile
@@ -1,11 +1,10 @@
-# Makefile for libdriver
+# $FreeBSD$
 
 LIB=		driver
 SRCS=		input.cc printer.cc
-CFLAGS+=	-I$(DIST_DIR)/../include
 
-NOMAN=		noman
-NOPROFILE=	noprofile
+NOMAN=		YES
+NOPROFILE=	YES
 
 install:
 
diff --git a/gnu/usr.bin/groff/libgroff/Makefile b/gnu/usr.bin/groff/libgroff/Makefile
index 8a5dcb47a48c9..2797fd636cde6 100644
--- a/gnu/usr.bin/groff/libgroff/Makefile
+++ b/gnu/usr.bin/groff/libgroff/Makefile
@@ -1,16 +1,13 @@
-# Makefile for libgroff
-#
 # $FreeBSD$
-#
-.include "../Makefile.inc"
 
 LIB=		groff
 SRCS=		assert.cc change_lf.cc cmap.cc cset.cc device.cc errarg.cc\
-		error.cc fatal.cc filename.cc font.cc fontfile.cc lf.cc\
+		error.cc fatal.cc filename.cc font.cc fontfile.cc\
+		htmlindicate.cc lf.cc\
 		lineno.cc macropath.cc nametoindex.cc new.cc prime.cc\
 	 	progname.cc ptable.cc searchpath.cc string.cc strsave.cc\
 		tmpfile.cc illegal.cc version.cc
-SRCS+=		iftoa.c itoa.c matherr.c
+SRCS+=		getopt.c getopt1.c iftoa.c itoa.c matherr.c
 CFLAGS+=	-I$(.CURDIR)/../include
 
 NOMAN=		noman
@@ -18,11 +15,14 @@ NOPROFILE=	noprofile
 
 CLEANFILES+=	version.cc
 
-version.cc: $(GROFF_DIST)/VERSION
-	@${ECHO} Making version.cc
-	@echo const char \*version_string = \"`cat $(GROFF_DIST)/VERSION`\"\; >$@
-
 install:
 
 .include "../Makefile.cfg"
 .include <bsd.lib.mk>
+
+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`\"\; | \
+	  sed -e 's/\.0\"/\"/' >>$@
diff --git a/gnu/usr.bin/groff/lkbib/Makefile b/gnu/usr.bin/groff/lkbib/Makefile
index d00f0f688975a..b341761988af2 100644
--- a/gnu/usr.bin/groff/lkbib/Makefile
+++ b/gnu/usr.bin/groff/lkbib/Makefile
@@ -1,4 +1,4 @@
-# Makefile for lkbib
+# $FreeBSD$
 
 PROG=		lkbib
 SRCS=		lkbib.cc
@@ -6,8 +6,7 @@ CFLAGS+=	-I${.CURDIR}/../include
 LDADD+=		${LIBBIB} ${LIBGROFF} -lm
 DPADD+=		${LIBBIB} ${LIBGROFF} ${LIBM}
 
-MANDEPEND=	lkbib.1
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN1}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/lookbib/Makefile b/gnu/usr.bin/groff/lookbib/Makefile
index fb1a65c87f66c..6ca3e7c3f6a3d 100644
--- a/gnu/usr.bin/groff/lookbib/Makefile
+++ b/gnu/usr.bin/groff/lookbib/Makefile
@@ -1,13 +1,11 @@
-# Makefile for lookbib
+# $FreeBSD$
 
 PROG=		lookbib
 SRCS=		lookbib.cc
-CFLAGS+=	-I$(.CURDIR)/../include
 LDADD+=		$(LIBBIB) $(LIBGROFF) -lm
 DPADD+=		$(LIBBIB) $(LIBGROFF) $(LIBM)
 
-MANDEPEND=	lookbib.1
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN1}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/man/Makefile b/gnu/usr.bin/groff/man/Makefile
index 4723c0aae82b8..dd7e9c5da2c1c 100644
--- a/gnu/usr.bin/groff/man/Makefile
+++ b/gnu/usr.bin/groff/man/Makefile
@@ -1,10 +1,9 @@
-# Makefile for manpages
+# $FreeBSD$
 
 MAN5=	groff_font.5 groff_out.5
-MAN7=	groff_char.7
+MAN7=	groff.7 groff_char.7 roff.7
 
-MANDEPEND=	${MAN5} ${MAN7}
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN5} ${MAN7}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/mm/Makefile b/gnu/usr.bin/groff/mm/Makefile
index 8ca6a1bb2c03e..c98db04fc4e9a 100644
--- a/gnu/usr.bin/groff/mm/Makefile
+++ b/gnu/usr.bin/groff/mm/Makefile
@@ -1,25 +1,26 @@
+# $FreeBSD$
+
 TMACOWN?=	${BINOWN}
 TMACGRP?=	${BINGRP}
 TMACMODE?=	${NOBINMODE}
-TMACDIR?=	/usr/share/tmac
+TMACDIR?=	${SHAREDIR}/tmac
 
 FILES=		0.MT 5.MT 4.MT ms.cov se_ms.cov
 LOCALE=		locale se_locale
 
-MAN7=		groff_mm.7 groff_mmse.7
+MAN7=		groff_mm.7 groff_mmse.7 mmroff.7
 MLINKS=		groff_mm.7 mm.7 groff_mmse.7 mmse.7
 
-MANDEPEND=	${MAN7}
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN7}
 
 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 ${DESTDIR}${TMACDIR}/
-	${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-		${DIST_DIR}/tmac.m ${DESTDIR}${TMACDIR}/tmac.mse
+		${DIST_DIR}/tmac.m ${DIST_DIR}/tmac.mse ${DESTDIR}${TMACDIR}
 .for file in ${FILES}
 	${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-		${DIST_DIR}/mm/${file} ${DESTDIR}${TMACDIR}/mm/
+		${DIST_DIR}/mm/${file} ${DESTDIR}${TMACDIR}/mm
 .endfor
 .for locale in ${LOCALE}
 .if !exists(${locale}) || empty(${locale})
diff --git a/gnu/usr.bin/groff/nroff/Makefile b/gnu/usr.bin/groff/nroff/Makefile
index fbd7422670bf8..bbcf99030c62d 100644
--- a/gnu/usr.bin/groff/nroff/Makefile
+++ b/gnu/usr.bin/groff/nroff/Makefile
@@ -1,9 +1,10 @@
+# $FreeBSD$
+
 MAN1=		nroff.1 psroff.1
-MANDEPEND=	nroff.1 psroff.1
 
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN1}
 
-afterinstall:
+beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		$(DIST_DIR)/nroff.sh $(DESTDIR)$(BINDIR)/nroff
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/gnu/usr.bin/groff/pfbtops/Makefile b/gnu/usr.bin/groff/pfbtops/Makefile
index b2773a8851f29..32503a52b57e6 100644
--- a/gnu/usr.bin/groff/pfbtops/Makefile
+++ b/gnu/usr.bin/groff/pfbtops/Makefile
@@ -1,12 +1,10 @@
-# Makefile for pfbtops
+# $FreeBSD$
 
 PROG=		pfbtops
-SRCS=		pfbtops.c
 LDADD+=		${LIBGROFF}
 DPADD+=		${LIBGROFF}
 
-MANDEPEND=	pfbtops.1
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN1}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/pic/Makefile b/gnu/usr.bin/groff/pic/Makefile
index bb799a3fbceeb..df2ca675746ce 100644
--- a/gnu/usr.bin/groff/pic/Makefile
+++ b/gnu/usr.bin/groff/pic/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 PROG=		pic
-SRCS=		lex.cc main.cc object.cc pic.cc pic.tab.h \
+SRCS=		lex.cc main.cc object.cc pic.cc pic_tab.h \
 		common.cc troff.cc tex.cc
 DPADD=		${LIBGROFF} ${LIBM}
 LDADD=		${LIBGROFF} -lm
-CLEANFILES=	${MAN1} pic.cc pic.tab.h y.tab.c y.tab.h
+CLEANFILES=	${MAN1} pic.cc pic_tab.h y.tab.c y.tab.h
 
-pic.tab.h: pic.cc
+pic_tab.h: pic.cc
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/psbb/Makefile b/gnu/usr.bin/groff/psbb/Makefile
deleted file mode 100644
index 1339f539c618f..0000000000000
--- a/gnu/usr.bin/groff/psbb/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Makefile for psbb
-
-PROG=		psbb
-SRCS=		psbb.c
-
-MANDEPEND=	psbb.1
-CLEANFILES+=	${MANDEPEND}
-
-.include "../Makefile.cfg"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/refer/Makefile b/gnu/usr.bin/groff/refer/Makefile
index b25f726e86772..76607183c3001 100644
--- a/gnu/usr.bin/groff/refer/Makefile
+++ b/gnu/usr.bin/groff/refer/Makefile
@@ -4,7 +4,7 @@ PROG=		refer
 SRCS=		command.cc label.cc ref.cc refer.cc token.cc
 DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBBIB} ${LIBGROFF} -lm
-CLEANFILES=	label.cc label.tab.h ${MAN1} y.tab.c y.tab.h
+CLEANFILES=	label.cc label_tab.h ${MAN1} y.tab.c y.tab.h
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tbl/Makefile b/gnu/usr.bin/groff/tbl/Makefile
index bdf9431dc9140..cbc44a02c5bf6 100644
--- a/gnu/usr.bin/groff/tbl/Makefile
+++ b/gnu/usr.bin/groff/tbl/Makefile
@@ -1,13 +1,11 @@
-# Makefile for tbl
+# $FreeBSD$
 
 PROG=		tbl
 SRCS=		main.cc table.cc
-CFLAGS+=	-I${.CURDIR}/../include
 LDADD+=		${LIBGROFF} -lm
 DPADD+=		${LIBGROFF} ${LIBM}
 
-MANDEPEND=	tbl.1
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN1}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tfmtodit/Makefile b/gnu/usr.bin/groff/tfmtodit/Makefile
index 541398642ab47..72bf531b30996 100644
--- a/gnu/usr.bin/groff/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/tfmtodit/Makefile
@@ -1,13 +1,11 @@
-# Makefile for tfmtodit
+# $FreeBSD$
 
 PROG=		tfmtodit
 SRCS=		tfmtodit.cc
-CFLAGS+=	-I${.CURDIR}/../include
 LDADD+=		${LIBGROFF} -lm
 DPADD+=		${LIBGROFF} ${LIBM}
 
-MANDEPEND=	tfmtodit.1
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES+=	${MAN1}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 94716f1afcb73..28ce582decc8c 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -5,31 +5,46 @@
 TMACOWN?=	${BINOWN}
 TMACGRP?=	${BINGRP}
 TMACMODE?=	${NOBINMODE}
-TMACDIR?=	/usr/share/tmac
+TMACDIR?=	${SHAREDIR}/tmac
 MDOCDIR?=	${TMACDIR}/mdoc
 LOCALEDIR?=     ${MDOCDIR}/locale
 
-MAN7=           groff_ms.7 groff_me.7 groff_msafer.7
-MLINKS=         groff_ms.7 ms.7 groff_me.7 me.7 groff_msafer.7 msafer.7
+MAN5=		groff_tmac.5
+MLINKS+=	groff_tmac.5 tmac.5
+MAN7=		groff_ms.7 groff_man.7 groff_me.7 groff_msafer.7 groff_markup.7
+MLINKS+=	groff_ms.7 ms.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
 
-CLEANFILES=	${MAN7} ${MDOCFILES} ${STRIPFILES} tmac.groff_an
+CLEANFILES=	${MAN5} ${MAN7} ${MDOCFILES} ${STRIPFILES} ${SPECIALFILES}
+CLEANFILES+=	tmac.groff_an
 
-FILES=          tmac.andoc tmac.pic tmac.ps tmac.psnew tmac.psold\
-		tmac.pspic tmac.psatk tmac.dvi tmac.safer tmac.tty \
-		tmac.tty-char tmac.X tmac.Xps tmac.latin1 tmac.lj4 eqnrc \
-		troffrc tmac.arkup tmac.html
-STRIPFILES=     tmac.e tmac.s tmac.doc
+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
 
-all: ${MDOCFILES} ${STRIPFILES} tmac.groff_an
+all: ${MDOCFILES} ${STRIPFILES} ${SPECIALFILES} tmac.groff_an
 
 .for f in ${MDOCFILES} ${STRIPFILES}
 $f: ${DIST_DIR}/$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" \
+		${.ALLSRC} > ${.TARGET}
+.endfor
+
 tmac.groff_an: tmac.an
 	sed -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET}
 
@@ -37,7 +52,7 @@ beforeinstall:
 	${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 	    ${MDOCFILES} ${DESTDIR}${MDOCDIR}
 	${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-	    ${STRIPFILES} tmac.groff_an ${DESTDIR}${TMACDIR}
+	    ${STRIPFILES} ${SPECIALFILES} tmac.groff_an ${DESTDIR}${TMACDIR}
 	cd ${DIST_DIR}; \
 	    ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 	    ${FILES} ${DESTDIR}${TMACDIR}
diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile
index 4d887f17537b7..1af9d90cb61ce 100644
--- a/gnu/usr.bin/groff/troff/Makefile
+++ b/gnu/usr.bin/groff/troff/Makefile
@@ -6,19 +6,8 @@ SRCS=		env.cc node.cc input.cc div.cc symbol.cc dictionary.cc reg.cc \
 CFLAGS+=	-I${.CURDIR}/../include
 LDADD+=		${LIBGROFF} -lm
 DPADD+=		${LIBGROFF} ${LIBM}
-MANDEPEND=	troff.1
 
-CLEANFILES+=	majorminor.cc ${MANDEPEND}
-
-.include "../Makefile.inc"
-
-majorminor.cc: ${GROFF_DIST}/VERSION
-	@${ECHO} Making $@
-	@-rm -f $@
-	@echo const char \*major_version = \
-	\"`sed -e 's/^\([^.]*\)\..*$$/\1/' ${GROFF_DIST}/VERSION`\"\; >$@
-	@echo const char \*minor_version = \
-	\"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' ${GROFF_DIST}/VERSION`\"\; >>$@
+CLEANFILES+=	majorminor.cc ${MAN1}
 
 afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${DIST_DIR}/hyphen.us \
@@ -28,3 +17,12 @@ afterinstall:
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
+
+majorminor.cc: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION
+	@${ECHO} Making $@
+	@-rm -f $@
+	@echo const char \*major_version = \
+	\"`sed -e 's/^\([^.]*\)\..*$$/\1/' ${GROFF_DIST}/VERSION`\"\; >$@
+	@echo const char \*minor_version = \
+	\"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' ${GROFF_DIST}/VERSION`\"\; >>$@
+	@echo const char \*revision = \"`cat ${GROFF_DIST}/REVISION`\"\; >>$@