Layer in all FreeBSD patches

45 files changed, 912 insertions, 13 deletions

diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile
index 8d93c93..49af0bc 100644
--- a/gnu/usr.bin/groff/Makefile
+++ b/gnu/usr.bin/groff/Makefile
@@ -1,3 +1,16 @@
+# Makefile for groff
+
+SUBDIR=		libgroff libdriver libbib\
+		groff troff nroff tbl pic eqn grops grotty grodvi\
+		refer lookbib indxbib lkbib \
+		tfmtodit addftinfo pfbtops psbb \
+		devX100 devX100-12 devX75 devX75-12 devascii devdvi devlatin1 \
+		devps tmac mm man xditview
+
+# BSD already provides soelim 
+MISC=		soelim
+
+.include <bsd.subdir.mk>
 # Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
diff --git a/gnu/usr.bin/groff/Makefile.cfg b/gnu/usr.bin/groff/Makefile.cfg
new file mode 100644
index 0000000..c296038
--- /dev/null
+++ b/gnu/usr.bin/groff/Makefile.cfg
@@ -0,0 +1,121 @@
+# 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=
+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(${.CURDIR}/../libgroff/obj)
+LIBGROFF=	$(.CURDIR)/../libgroff/obj/libgroff.a
+LIBDRIVER=	$(.CURDIR)/../libdriver/obj/libdriver.a
+LIBBIB=		$(.CURDIR)/../libbib/obj/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_SYS_DIR_H=1\
+		-DHAVE_CC_LIMITS_H=1\
+		-DHAVE_CC_UNISTD_H=1\
+		-DSTDLIB_H_DECLARES_GETOPT=1\
+		-DUNISTD_H_DECLARES_GETOPT=1\
+		-DSTDLIB_H_DECLARES_PUTENV=1\
+		-DSTDIO_H_DECLARES_POPEN=1\
+		-DSTDIO_H_DECLARE_PCLOSE=1\
+		-DRETSIGTYPE=void\
+		-DHAVE_MMAP=1\
+		-DHAVE_RENAME=1\
+		-DHAVE_MKSTEMP=1\
+		-DHAVE_SYS_SIGLIST=1
+
+CFLAGS+=$(DEFINES)
+
+.y.o:
+	$(YACC) $(YFLAGS) $(.IMPSRC)
+	mv y.tab.c $(.PREFIX).cc
+	mv y.tab.h $(.PREFIX).tab.h
+	${CXX} ${CXXFLAGS} -c $(.PREFIX).cc -o ${.TARGET}
+.y.cc:
+	$(YACC) $(YFLAGS) $(.IMPSRC)
+	mv y.tab.c $(.PREFIX).cc
+	mv 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:
+
+.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@;$(tmac_s);g" \
+	-e "s;@TMAC_M@;$(tmac_m);g" \
+	-e "s;@TMAC_MDIR@;$(tmacdir)/mm;g" \
+	-e "s;@BROKEN_SPOOLER_FLAGS@;$(BROKEN_SPOOLER_FLAGS);g" \
+	-e "s;@VERSION@;`cat ${.CURDIR}/../VERSION`;g" \
+	-e "s;@MDATE@;`$(SHELL) ${.CURDIR}/../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
index ae9a672..311eac9 100644
--- a/gnu/usr.bin/groff/Makefile.dev
+++ b/gnu/usr.bin/groff/Makefile.dev
@@ -1,3 +1,46 @@
+#	@(#)Makefile.dev	6.2 (Berkeley) 3/16/91
+
+# Client Makefiles define DEVICE and FONTFILES and provide rules for
+#	individual font files
+
+.include "../Makefile.cfg"
+
+FONTDIR?=	/usr/share/groff_font
+DEVICEDIR?=	$(FONTDIR)/dev$(DEVICE)
+FONTOWN?=	bin
+FONTGRP?=	bin
+FONTMODE?=	444
+
+CLEANFILES+=	$(FONTFILES)
+
+all:	$(FONTFILES)
+
+.if !target(maninstall)
+maninstall:
+	@echo -n
+.endif
+
+.if !target(install)
+install:
+	-if test ! -d $(DESTDIR)$(DEVICEDIR); then \
+		mkdir $(DESTDIR)$(DEVICEDIR); \
+		chown $(BINOWN).$(BINGRP) $(DESTDIR)$(DEVICEDIR); \
+		chmod 755 $(DESTDIR)$(DEVICEDIR); \
+	fi
+	-if test -d $(.CURDIR)/generate; then \
+		if test ! -d $(DESTDIR)$(DEVICEDIR)/generate; then \
+			mkdir $(DESTDIR)$(DEVICEDIR)/generate; \
+			chown $(BINOWN).$(BINGRP) $(DESTDIR)$(DEVICEDIR)/generate; \
+			chmod 755 $(DESTDIR)$(DEVICEDIR)/generate; \
+		fi; \
+	fi
+	-for f in $(FONTFILES); do \
+		install -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$f \
+			$(DESTDIR)$(DEVICEDIR)/$$f; \
+	done
+.endif
+
+.include <bsd.prog.mk>
 all: $(DEVFILES)
 install_data: install_dev
 uninstall_sub: uninstall_dev
diff --git a/gnu/usr.bin/groff/Makefile.tty b/gnu/usr.bin/groff/Makefile.tty
new file mode 100644
index 0000000..0c4b9ba
--- /dev/null
+++ b/gnu/usr.bin/groff/Makefile.tty
@@ -0,0 +1,52 @@
+#	@(#)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.
+
+.MAIN: all
+
+RES=240
+CPI=10
+LPI=6
+FONTS=R I B BI
+
+FONTFILES=$(FONTS) DESC
+
+$(FONTS): R.proto
+	@${ECHO} Making $@
+	@(charwidth=`echo  $(RES) / $(CPI) | bc` ; \
+ 	 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" \
+	     $(.CURDIR)/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/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
+	    $(.CURDIR)/DESC.proto >$@
diff --git a/gnu/usr.bin/groff/addftinfo/Makefile b/gnu/usr.bin/groff/addftinfo/Makefile
new file mode 100644
index 0000000..5106496
--- /dev/null
+++ b/gnu/usr.bin/groff/addftinfo/Makefile
@@ -0,0 +1,14 @@
+# Makefile for addftinfo
+
+PROG=		addftinfo
+SRCS=		addftinfo.cc guess.cc
+CFLAGS+=	-I${.CURDIR}/../include
+LDADD+=		${LIBGROFF}
+DPADD+=		${LIBGROFF}
+
+MANDEPEND=	addftinfo.1
+CLEANFILES+=	${MANDEPEND}
+
+.include "../../../usr.bin/Makefile.inc"
+.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
new file mode 100644
index 0000000..4936ceb
--- /dev/null
+++ b/gnu/usr.bin/groff/devX100-12/Makefile
@@ -0,0 +1,10 @@
+# Makefile for devX100-12
+
+DEVICE=		X100-12
+FONTFILES=	CB CBI CI CR HB HBI HI HR NB NBI NI NR S TB TBI TI TR DESC
+
+NOOBJ=		noobj
+
+clean cleandir:
+
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devX100/Makefile b/gnu/usr.bin/groff/devX100/Makefile
new file mode 100644
index 0000000..0cf8d28
--- /dev/null
+++ b/gnu/usr.bin/groff/devX100/Makefile
@@ -0,0 +1,10 @@
+# Makefile for devX100
+
+DEVICE=		X100
+FONTFILES=	CB CBI CI CR HB HBI HI HR NB NBI NI NR S TB TBI TI TR DESC
+
+NOOBJ=		noobj
+
+clean cleandir:
+
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devX75-12/Makefile b/gnu/usr.bin/groff/devX75-12/Makefile
new file mode 100644
index 0000000..705e3ea
--- /dev/null
+++ b/gnu/usr.bin/groff/devX75-12/Makefile
@@ -0,0 +1,10 @@
+# Makefile for devX75-12
+
+DEVICE=		X75-12
+FONTFILES=	CB CBI CI CR HB HBI HI HR NB NBI NI NR S TB TBI TI TR DESC
+
+NOOBJ=		noobj
+
+clean cleandir:
+
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devX75/Makefile b/gnu/usr.bin/groff/devX75/Makefile
new file mode 100644
index 0000000..e53468a
--- /dev/null
+++ b/gnu/usr.bin/groff/devX75/Makefile
@@ -0,0 +1,10 @@
+# Makefile for devX75
+
+DEVICE=		X75
+FONTFILES=	CB CBI CI CR HB HBI HI HR NB NBI NI NR S TB TBI TI TR DESC
+
+NOOBJ=		noobj
+
+clean cleandir:
+
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devascii/Makefile b/gnu/usr.bin/groff/devascii/Makefile
new file mode 100644
index 0000000..47057d8
--- /dev/null
+++ b/gnu/usr.bin/groff/devascii/Makefile
@@ -0,0 +1,6 @@
+# Makefile for devascii 
+
+DEVICE=		ascii
+
+.include "../Makefile.tty"
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devascii/R.proto b/gnu/usr.bin/groff/devascii/R.proto
index 876c74c..9a8909e 100644
--- a/gnu/usr.bin/groff/devascii/R.proto
+++ b/gnu/usr.bin/groff/devascii/R.proto
@@ -3,11 +3,15 @@ internalname 0
 spacewidth 24
 charset
 !	24	0	0041
+r!	"
+TP	"
+Tp	"
 "	24	0	0042
 lq	"
 rq	"
 #	24	0	0043
 sh	"
+sc	"
 $	24	0	0044
 Do	"
 %	24	0	0045
@@ -16,12 +20,20 @@ Do	"
 aa	"
 fm	"
 aq	"
+ac	"
 (	24	0	0050
 )	24	0	0051
 *	24	0	0052
 **	"
+ho	"
 +	24	0	0053
 pl	"
+dg	"
+dd	"
+ad	"
+ah	"
+-D	"
+Sd	"
 ,	24	0	0054
 \-	24	0	0055
 hy	"
@@ -49,10 +61,12 @@ la	"
 fo	"
 =	24	0	0075
 eq	"
+ss	"
 >	24	0	0076
 ra	"
 fc	"
 ?	24	0	0077
+r?	"
 @	24	0	0100
 at	"
 A	24	0	0101
@@ -105,6 +119,8 @@ rB	"
 a^	24	0	0136
 ^	"
 ha	"
+ua	"
+de	"
 _	24	0	0137
 ru	"
 ul	"
@@ -128,6 +144,8 @@ m	24	0	0155
 n	24	0	0156
 o	24	0	0157
 *o	"
+a-	"
+ao	"
 p	24	0	0160
 q	24	0	0161
 r	24	0	0162
@@ -135,6 +153,7 @@ s	24	0	0163
 t	24	0	0164
 u	24	0	0165
 v	24	0	0166
+da	"
 w	24	0	0167
 x	24	0	0170
 mu	"
diff --git a/gnu/usr.bin/groff/devdvi/Makefile b/gnu/usr.bin/groff/devdvi/Makefile
new file mode 100644
index 0000000..95c1717
--- /dev/null
+++ b/gnu/usr.bin/groff/devdvi/Makefile
@@ -0,0 +1,17 @@
+DEVICE=		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\
+		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
+
+NOOBJ=		noobj
+
+clean cleandir:
+	rm -f DESC
+
+DESC:	DESC.in
+	cat ${.CURDIR}/DESC.in >DESC
+	test -z '${DVIPRINT}' || echo print '${DVIPRINT}' >>DESC
+
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devlatin1/Makefile b/gnu/usr.bin/groff/devlatin1/Makefile
new file mode 100644
index 0000000..b431078
--- /dev/null
+++ b/gnu/usr.bin/groff/devlatin1/Makefile
@@ -0,0 +1,6 @@
+# Makefile for devlatin1
+
+DEVICE=		latin1
+
+.include "../Makefile.tty"
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devps/Makefile b/gnu/usr.bin/groff/devps/Makefile
new file mode 100644
index 0000000..5f9277b
--- /dev/null
+++ b/gnu/usr.bin/groff/devps/Makefile
@@ -0,0 +1,40 @@
+DEVICE=		ps
+FONTFILES=	$(FONTS) $(SUPPORT) $(DEVGENFILES) DESC
+FONTS=		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
+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
+
+NOOBJ=		noobj
+
+clean cleandir:
+	rm -f DESC ${PSFILES}
+
+DESC: DESC.in
+	-rm -f DESC
+	cat ${.CURDIR}/DESC.in >DESC
+	echo broken ${BROKEN_SPOOLER_FLAGS} >>DESC
+	if test "${PAGE}" = A4; then \
+	  echo "paperlength 841890" >>DESC; \
+	else \
+	  echo "paperlength 792000" >>DESC; \
+	fi
+	test -z '${PSPRINT}' ||	echo print '${PSPRINT}' >>DESC
+
+${PSFILES}:
+	-rm -f $@
+	sed -f ${.CURDIR}/psstrip.sed $? >$@
+
+fonts: DESC
+	${MAKE} -f ${.CURDIR}/generate/Makefile \
+	  srcdir=${.CURDIR}/generate DESC=${.CURDIR}/DESC.in
+
+prologue: prologue.ps
+zapfdr.pfa: zapfdr.ps
+symbolsl.pfa: symbolsl.ps
+
+.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
new file mode 100644
index 0000000..f0bb84c
--- /dev/null
+++ b/gnu/usr.bin/groff/eqn/Makefile
@@ -0,0 +1,23 @@
+# Makefile for eqn
+
+PROG=		eqn
+SRCS=		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
+OBJS=		eqn.o 
+CFLAGS+=	-I. -I${.CURDIR}/../include
+LDADD+=		${LIBGROFF}
+DPADD+=		${LIBGROFF}
+
+MANDEPEND=	eqn.1
+CLEANFILES+=	eqn.cc eqn.tab.h ${MANDEPEND}
+
+afterinstall:
+	sed -e 's/@g@/${g}/g' ${.CURDIR}/neqn.sh > ${DESTDIR}${BINDIR}/neqn
+	chown ${BINOWN}.${BINGRP} ${DESTDIR}${BINDIR}/neqn
+	chmod ${BINMODE} ${DESTDIR}${BINDIR}/neqn
+
+beforedepend: eqn.cc
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
index ae9a672..311eac9 100644
--- a/gnu/usr.bin/groff/font/Makefile.dev
+++ b/gnu/usr.bin/groff/font/Makefile.dev
@@ -1,3 +1,46 @@
+#	@(#)Makefile.dev	6.2 (Berkeley) 3/16/91
+
+# Client Makefiles define DEVICE and FONTFILES and provide rules for
+#	individual font files
+
+.include "../Makefile.cfg"
+
+FONTDIR?=	/usr/share/groff_font
+DEVICEDIR?=	$(FONTDIR)/dev$(DEVICE)
+FONTOWN?=	bin
+FONTGRP?=	bin
+FONTMODE?=	444
+
+CLEANFILES+=	$(FONTFILES)
+
+all:	$(FONTFILES)
+
+.if !target(maninstall)
+maninstall:
+	@echo -n
+.endif
+
+.if !target(install)
+install:
+	-if test ! -d $(DESTDIR)$(DEVICEDIR); then \
+		mkdir $(DESTDIR)$(DEVICEDIR); \
+		chown $(BINOWN).$(BINGRP) $(DESTDIR)$(DEVICEDIR); \
+		chmod 755 $(DESTDIR)$(DEVICEDIR); \
+	fi
+	-if test -d $(.CURDIR)/generate; then \
+		if test ! -d $(DESTDIR)$(DEVICEDIR)/generate; then \
+			mkdir $(DESTDIR)$(DEVICEDIR)/generate; \
+			chown $(BINOWN).$(BINGRP) $(DESTDIR)$(DEVICEDIR)/generate; \
+			chmod 755 $(DESTDIR)$(DEVICEDIR)/generate; \
+		fi; \
+	fi
+	-for f in $(FONTFILES); do \
+		install -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$f \
+			$(DESTDIR)$(DEVICEDIR)/$$f; \
+	done
+.endif
+
+.include <bsd.prog.mk>
 all: $(DEVFILES)
 install_data: install_dev
 uninstall_sub: uninstall_dev
diff --git a/gnu/usr.bin/groff/font/Makefile.tty b/gnu/usr.bin/groff/font/Makefile.tty
new file mode 100644
index 0000000..0c4b9ba
--- /dev/null
+++ b/gnu/usr.bin/groff/font/Makefile.tty
@@ -0,0 +1,52 @@
+#	@(#)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.
+
+.MAIN: all
+
+RES=240
+CPI=10
+LPI=6
+FONTS=R I B BI
+
+FONTFILES=$(FONTS) DESC
+
+$(FONTS): R.proto
+	@${ECHO} Making $@
+	@(charwidth=`echo  $(RES) / $(CPI) | bc` ; \
+ 	 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" \
+	     $(.CURDIR)/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/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
+	    $(.CURDIR)/DESC.proto >$@
diff --git a/gnu/usr.bin/groff/grodvi/Makefile b/gnu/usr.bin/groff/grodvi/Makefile
new file mode 100644
index 0000000..25d12da
--- /dev/null
+++ b/gnu/usr.bin/groff/grodvi/Makefile
@@ -0,0 +1,14 @@
+# Makefile for grodvi
+
+PROG=		grodvi
+SRCS=		dvi.cc
+CFLAGS+=	-I${.CURDIR}/../include
+LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBMATH}
+
+MANDEPEND=	grodvi.1
+CLEANFILES+=	${MANDEPEND}
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/groff/Makefile b/gnu/usr.bin/groff/groff/Makefile
new file mode 100644
index 0000000..f026215
--- /dev/null
+++ b/gnu/usr.bin/groff/groff/Makefile
@@ -0,0 +1,14 @@
+# Makefile for groff
+
+PROG=		groff
+SRCS=		groff.cc pipeline.c
+CFLAGS+=	-I${.CURDIR}/../include
+LDADD+=		${LIBGROFF} -lm
+DPADD+=		${LIBGROFF} ${LIBMATH}
+
+MANDEPEND=	groff.1
+CLEANFILES+=	${MANDEPEND}
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/groff/pipeline.c b/gnu/usr.bin/groff/groff/pipeline.c
index 1203638..f8be66b 100644
--- a/gnu/usr.bin/groff/groff/pipeline.c
+++ b/gnu/usr.bin/groff/groff/pipeline.c
@@ -230,12 +230,5 @@ static char *itoa(n)
 static char *xstrsignal(n)
      int n;
 {
-  static char buf[sizeof("Signal ") + 1 + sizeof(int)*3];
-#ifdef HAVE_SYS_SIGLIST
-  extern char *sys_siglist[];
-  if (n >= 0 && n < NSIG && sys_siglist[n] != 0)
-    return sys_siglist[n];
-#endif /* HAVE_SYS_SIGLIST */
-  sprintf(buf, "Signal %d", n);
-  return buf;
+  return strerror(n);
 }
diff --git a/gnu/usr.bin/groff/grops/Makefile b/gnu/usr.bin/groff/grops/Makefile
new file mode 100644
index 0000000..3c730c1
--- /dev/null
+++ b/gnu/usr.bin/groff/grops/Makefile
@@ -0,0 +1,14 @@
+# Makefile for grops
+
+PROG=		grops
+SRCS=		ps.cc psrm.cc
+CFLAGS+=	-I${.CURDIR}/../include
+LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBMATH}
+
+MANDEPEND=	grops.1
+CLEANFILES+=	${MANDEPEND}
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grotty/Makefile b/gnu/usr.bin/groff/grotty/Makefile
new file mode 100644
index 0000000..a473c32
--- /dev/null
+++ b/gnu/usr.bin/groff/grotty/Makefile
@@ -0,0 +1,14 @@
+# Makefile for grotty
+
+PROG=		grotty
+SRCS=		tty.cc
+CFLAGS+=	-I${.CURDIR}/../include
+LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBMATH}
+
+MANDEPEND=	grotty.1
+CLEANFILES+=	${MANDEPEND}
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/indxbib/Makefile b/gnu/usr.bin/groff/indxbib/Makefile
new file mode 100644
index 0000000..d9187d7
--- /dev/null
+++ b/gnu/usr.bin/groff/indxbib/Makefile
@@ -0,0 +1,22 @@
+# Makefile for indxbib
+
+PROG=		indxbib
+SRCS=		indxbib.cc dirnamemax.c signal.c
+CFLAGS+=	-I${.CURDIR}/../include
+LDADD+= 	${LIBBIB} ${LIBGROFF} -lm
+DPADD+= 	${LIBBIB} ${LIBGROFF} ${LIBMATH}
+
+MANDEPEND=	indxbib.1
+CLEANFILES+=	${MANDEPEND}
+
+# Ugh - I can't grab /usr/share from ../../../share/Makefile.inc
+# since I've already grabbed a BINDIR file for installing indxbib.
+# Sigh... Hardcode it.  	- jkh
+#
+afterinstall:
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/eign \
+		${DESTDIR}/usr/share/dict
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/libbib/Makefile b/gnu/usr.bin/groff/libbib/Makefile
new file mode 100644
index 0000000..df2c5a9
--- /dev/null
+++ b/gnu/usr.bin/groff/libbib/Makefile
@@ -0,0 +1,13 @@
+# 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/libdriver/Makefile b/gnu/usr.bin/groff/libdriver/Makefile
new file mode 100644
index 0000000..780a0e1
--- /dev/null
+++ b/gnu/usr.bin/groff/libdriver/Makefile
@@ -0,0 +1,13 @@
+# Makefile for libdriver
+
+LIB=		driver
+SRCS=		input.cc printer.cc
+CFLAGS+=	-I$(.CURDIR)/../include
+
+NOMAN=		noman
+NOPROFILE=	noprofile
+
+install:
+
+.include "../Makefile.cfg"
+.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/groff/libgroff/Makefile b/gnu/usr.bin/groff/libgroff/Makefile
new file mode 100644
index 0000000..ba150356
--- /dev/null
+++ b/gnu/usr.bin/groff/libgroff/Makefile
@@ -0,0 +1,23 @@
+# Makefile for libgroff
+
+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\
+		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
+CFLAGS+=	-I$(.CURDIR)/../include
+
+NOMAN=		noman
+NOPROFILE=	noprofile	
+
+CLEANFILES+=	version.cc
+version.cc: $(.CURDIR)/../VERSION
+	@${ECHO} Making version.cc
+	@echo const char \*version_string = \"`cat $(.CURDIR)/../VERSION`\"\; >$@
+
+install:
+
+.include "../Makefile.cfg"
+.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/groff/libgroff/cset.cc b/gnu/usr.bin/groff/libgroff/cset.cc
index fcba164..603202a 100644
--- a/gnu/usr.bin/groff/libgroff/cset.cc
+++ b/gnu/usr.bin/groff/libgroff/cset.cc
@@ -33,7 +33,7 @@ cset csprint(CSET_BUILTIN);
 cset csgraph(CSET_BUILTIN);
 cset cscntrl(CSET_BUILTIN);
 
-#ifdef isascii
+#ifdef isascii && !defined(__FreeBSD__)	/* FreeBSD uses rune based ctypes */
 #define ISASCII(c) isascii(c)
 #else
 #define ISASCII(c) (1)
diff --git a/gnu/usr.bin/groff/libgroff/font.cc b/gnu/usr.bin/groff/libgroff/font.cc
index 55c772d..6e05a8a 100644
--- a/gnu/usr.bin/groff/libgroff/font.cc
+++ b/gnu/usr.bin/groff/libgroff/font.cc
@@ -194,7 +194,11 @@ static int scale_round(int n, int x, int y)
   }
   else {
     if (-(unsigned)n <= (-(unsigned)INT_MIN - y2)/x)
-      return (n*x - y2)/y;
+      {
+        // XXX simplify expression to work around bug in gcc-2.6.0
+        int tmp = n*x - y2;
+        return tmp/y;
+      }
     return int(n*double(x)/double(y) - .5);
   }
 }
diff --git a/gnu/usr.bin/groff/lkbib/Makefile b/gnu/usr.bin/groff/lkbib/Makefile
new file mode 100644
index 0000000..288a1a6
--- /dev/null
+++ b/gnu/usr.bin/groff/lkbib/Makefile
@@ -0,0 +1,14 @@
+# Makefile for lkbib
+
+PROG=		lkbib
+SRCS=		lkbib.cc
+CFLAGS+=	-I${.CURDIR}/../include
+LDADD+=		${LIBBIB} ${LIBGROFF} -lm
+DPADD+=		${LIBBIB} ${LIBGROFF} ${LIBMATH}
+
+MANDEPEND=	lkbib.1
+CLEANFILES+=	${MANDEPEND}
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/lookbib/Makefile b/gnu/usr.bin/groff/lookbib/Makefile
new file mode 100644
index 0000000..c1514fd
--- /dev/null
+++ b/gnu/usr.bin/groff/lookbib/Makefile
@@ -0,0 +1,14 @@
+# Makefile for lookbib
+
+PROG=		lookbib
+SRCS=		lookbib.cc
+CFLAGS+=	-I$(.CURDIR)/../include
+LDADD+=		$(LIBBIB) $(LIBGROFF) -lm
+DPADD+=		$(LIBBIB) $(LIBGROFF) $(LIBMATH)
+
+MANDEPEND=	lookbib.1
+CLEANFILES+=	${MANDEPEND}
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/man/Makefile b/gnu/usr.bin/groff/man/Makefile
new file mode 100644
index 0000000..4723c0a
--- /dev/null
+++ b/gnu/usr.bin/groff/man/Makefile
@@ -0,0 +1,10 @@
+# Makefile for manpages
+
+MAN5=	groff_font.5 groff_out.5
+MAN7=	groff_char.7
+
+MANDEPEND=	${MAN5} ${MAN7}
+CLEANFILES+=	${MANDEPEND}
+
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/mm/Makefile b/gnu/usr.bin/groff/mm/Makefile
new file mode 100644
index 0000000..7406c48
--- /dev/null
+++ b/gnu/usr.bin/groff/mm/Makefile
@@ -0,0 +1,37 @@
+TMACOWN?=	bin
+TMACGRP?=	bin
+TMACMODE?=	444
+TMACDIR?=	/usr/share/tmac
+
+FILES=		0.MT 5.MT 4.MT ms.cov se_ms.cov 
+LOCALE=		locale se_locale
+
+MAN7=		groff_mm.7 groff_mmse.7
+MLINKS=		groff_mm.7 mm.7 groff_mmse.7 mmse.7
+
+MANDEPEND=	${MAN7}
+CLEANFILES+=	${MANDEPEND}
+
+afterinstall:
+	install -c -o $(TMACOWN) -g $(TMACGRP) -m $(TMACMODE) \
+		$(.CURDIR)/tmac.m $(DESTDIR)$(TMACDIR)/tmac.m
+	install -c -o $(TMACOWN) -g $(TMACGRP) -m $(TMACMODE) \
+		$(.CURDIR)/tmac.m $(DESTDIR)$(TMACDIR)/tmac.mse
+
+	test -d $(DESTDIR)$(TMACDIR)/mm || mkdir $(DESTDIR)$(TMACDIR)/mm
+	chown $(TMACOWN).$(TMACGRP) $(DESTDIR)$(TMACDIR)/mm
+	chmod 755 $(DESTDIR)$(TMACDIR)/mm
+
+	for f in $(FILES); do \
+		rm -f $(TMACDIR)/mm/$$f; \
+		install -c -o $(TMACOWN) -g $(TMACGRP) -m $(TMACMODE) \
+			$(.CURDIR)/mm/$$f $(DESTDIR)$(TMACDIR)/mm/$$f; \
+	done
+	for f in $(LOCALE); do \
+		test -f $(DESTDIR)$(TMACDIR)/mm/$$f || touch $(DESTDIR)$(TMACDIR)/mm/$$f; \
+		chown $(TMACOWN).$(TMACGRP) $(DESTDIR)$(TMACDIR)/mm/$$f; \
+		chmod $(TMACMODE) $(DESTDIR)$(TMACDIR)/mm/$$f; \
+	done
+
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/nroff/Makefile b/gnu/usr.bin/groff/nroff/Makefile
new file mode 100644
index 0000000..0f7e13c
--- /dev/null
+++ b/gnu/usr.bin/groff/nroff/Makefile
@@ -0,0 +1,14 @@
+MAN1=		nroff.1
+MANDEPEND=	nroff.1
+
+CLEANFILES+=	${MANDEPEND}
+
+afterinstall:
+	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+		$(.CURDIR)/nroff.sh $(DESTDIR)$(BINDIR)/nroff
+	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+		$(.CURDIR)/psroff.sh $(DESTDIR)$(BINDIR)/psroff
+
+.include <../../../usr.bin/Makefile.inc>
+.include <../Makefile.cfg>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/pfbtops/Makefile b/gnu/usr.bin/groff/pfbtops/Makefile
new file mode 100644
index 0000000..16ab64a
--- /dev/null
+++ b/gnu/usr.bin/groff/pfbtops/Makefile
@@ -0,0 +1,13 @@
+# Makefile for pfbtops
+
+PROG=		pfbtops
+SRCS=		pfbtops.c
+LDADD+=		${LIBGROFF}
+DPADD+=		${LIBGROFF}
+
+MANDEPEND=	pfbtops.1
+CLEANFILES+=	${MANDEPEND}
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/pic/Makefile b/gnu/usr.bin/groff/pic/Makefile
new file mode 100644
index 0000000..cdd7071
--- /dev/null
+++ b/gnu/usr.bin/groff/pic/Makefile
@@ -0,0 +1,17 @@
+# Makefile for pic
+
+PROG=		pic
+SRCS=		lex.cc main.cc object.cc common.cc troff.cc tex.cc
+OBJS=		pic.o
+CFLAGS+=	-I. -I${.CURDIR}/../include
+LDADD+=		${LIBGROFF} -lm
+DPADD+=		${LIBGROFF} ${LIBMATH}
+
+MANDEPEND=	pic.1
+CLEANFILES+=	pic.cc pic.tab.h ${MANDEPEND}
+
+beforedepend: pic.cc
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/psbb/Makefile b/gnu/usr.bin/groff/psbb/Makefile
new file mode 100644
index 0000000..209813f
--- /dev/null
+++ b/gnu/usr.bin/groff/psbb/Makefile
@@ -0,0 +1,11 @@
+# Makefile for psbb
+
+PROG=		psbb
+SRCS=		psbb.c
+
+MANDEPEND=	psbb.1
+CLEANFILES+=	${MANDEPEND}
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/refer/Makefile b/gnu/usr.bin/groff/refer/Makefile
new file mode 100644
index 0000000..147f50b
--- /dev/null
+++ b/gnu/usr.bin/groff/refer/Makefile
@@ -0,0 +1,15 @@
+# Makefile for refer
+
+PROG=		refer
+SRCS=		command.cc ref.cc refer.cc token.cc
+OBJS=		label.o
+CFLAGS+=	-I. -I${.CURDIR}/../include
+LDADD+=		${LIBBIB} ${LIBGROFF} -lm
+DPADD+=		${LIBBIB} ${LIBGROFF} ${LIBMATH}
+
+MANDEPEND=	refer.1
+CLEANFILES+=	label.cc label.tab.h ${MANDEPEND}
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tbl/Makefile b/gnu/usr.bin/groff/tbl/Makefile
new file mode 100644
index 0000000..0e76df4
--- /dev/null
+++ b/gnu/usr.bin/groff/tbl/Makefile
@@ -0,0 +1,14 @@
+# Makefile for tbl
+
+PROG=		tbl
+SRCS=		main.cc table.cc
+CFLAGS+=	-I${.CURDIR}/../include
+LDADD+=		${LIBGROFF} -lm
+DPADD+=		${LIBGROFF} ${LIBMATH}
+
+MANDEPEND=	tbl.1
+CLEANFILES+=	${MANDEPEND}
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tfmtodit/Makefile b/gnu/usr.bin/groff/tfmtodit/Makefile
new file mode 100644
index 0000000..4140a25
--- /dev/null
+++ b/gnu/usr.bin/groff/tfmtodit/Makefile
@@ -0,0 +1,14 @@
+# Makefile for tfmtodit
+
+PROG=		tfmtodit
+SRCS=		tfmtodit.cc
+CFLAGS+=	-I${.CURDIR}/../include
+LDADD+=		${LIBGROFF} -lm
+DPADD+=		${LIBGROFF} ${LIBMATH}
+
+MANDEPEND=	tfmtodit.1
+CLEANFILES+=	${MANDEPEND}
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
new file mode 100644
index 0000000..115b24d
--- /dev/null
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -0,0 +1,50 @@
+# Makefile for groff macros
+
+TMACOWN?=	bin
+TMACGRP?=	bin
+TMACMODE?=	444
+TMACDIR?=	/usr/share/tmac
+MDOCDIR?=	$(TMACDIR)/mdoc
+
+MAN7=		groff_ms.7 me.7
+MLINKS=		groff_ms.7 ms.7
+
+MANDEPEND=	${MAN7}
+CLEANFILES+=	temp ${MANDEPEND}
+
+FILES=		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 eqnrc troffrc
+STRIPFILES=	tmac.e tmac.doc tmac.doc.old
+MDOCFILES=	doc-common doc-ditroff doc-nroff doc-syms
+
+
+afterinstall:
+	for f in ${FILES}; do \
+		install -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+			${.CURDIR}/$$f ${DESTDIR}${TMACDIR}; \
+	done
+	install -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+		${.CURDIR}/tmac.s ${DESTDIR}${TMACDIR}/tmac.groff_ms
+	install -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+		${.CURDIR}/tmac.an ${DESTDIR}${TMACDIR}/tmac.groff_an
+	install -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+		${.CURDIR}/tmac.andoc ${DESTDIR}${TMACDIR}/tmac.an
+	for f in ${STRIPFILES}; do \
+		rm -f temp; \
+	  	sed -f ${.CURDIR}/strip.sed ${.CURDIR}/$$f >temp; \
+		install -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+			temp ${DESTDIR}${TMACDIR}/$$f; \
+	done
+	for f in ${MDOCFILES}; do \
+		rm -f temp; \
+		sed -f ${.CURDIR}/strip.sed ${.CURDIR}/$$f >temp; \
+		install -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+			temp ${DESTDIR}${MDOCDIR}/$$f; \
+	done
+	-test -f ${DESTDIR}${TMACDIR}/man.local || \
+		install -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+			${.CURDIR}/man.local ${DESTDIR}${MDOCDIR}
+
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tmac/tmac.andoc b/gnu/usr.bin/groff/tmac/tmac.andoc
index fd1bad0..e9dcea7 100644
--- a/gnu/usr.bin/groff/tmac/tmac.andoc
+++ b/gnu/usr.bin/groff/tmac/tmac.andoc
@@ -7,6 +7,6 @@
 ..
 .de TH
 .rm TH
-.mso tmac.an
+.mso tmac.groff_an
 \\*(TH\\
 ..
diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile
new file mode 100644
index 0000000..ca925ce
--- /dev/null
+++ b/gnu/usr.bin/groff/troff/Makefile
@@ -0,0 +1,25 @@
+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} ${LIBMATH}
+MANDEPEND=	troff.1
+
+CLEANFILES+=	majorminor.cc ${MANDEPEND}
+
+majorminor.cc: ${.CURDIR}/../VERSION
+	@${ECHO} Making $@
+	@-rm -f $@
+	@echo const char \*major_version = \
+	\"`sed -e 's/^\([^.]*\)\..*$$/\1/' ${.CURDIR}/../VERSION`\"\; >$@
+	@echo const char \*minor_version = \
+	\"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' ${.CURDIR}/../VERSION`\"\; >>$@
+
+afterinstall:
+	install -c -o bin -g bin -m 444 ${.CURDIR}/hyphen.us \
+		${DESTDIR}${tmacdir}/hyphen.us
+
+.include "../../../usr.bin/Makefile.inc"
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/troff/troff.man b/gnu/usr.bin/groff/troff/troff.man
index b9ff679..25a7cc6 100644
--- a/gnu/usr.bin/groff/troff/troff.man
+++ b/gnu/usr.bin/groff/troff/troff.man
@@ -1357,7 +1357,7 @@ In Unix troff, the
 contents of
 .I filename
 is immediately copied through to the output regardless of whether
-there is a current diversion; this behaviour is so anomalous that it
+there is a current diversion; this behavior is so anomalous that it
 must be considered a bug.
 .TP
 .BI .ev\  xx
@@ -1399,7 +1399,7 @@ if the end of a sentence occurs at the end of a line in fill mode, then
 both an inter-word space and a sentence space will be added;
 if two spaces follow the end of a sentence in the middle of a line,
 then the second space will be a sentence space.
-Note that the behaviour of Unix troff will be exactly
+Note that the behavior of Unix troff will be exactly
 that exhibited by GNU troff if a second argument is never given to the
 .B ss
 request.
diff --git a/gnu/usr.bin/groff/xditview/Makefile b/gnu/usr.bin/groff/xditview/Makefile
index 6dea45f..e8f4c30 100644
--- a/gnu/usr.bin/groff/xditview/Makefile
+++ b/gnu/usr.bin/groff/xditview/Makefile
@@ -1,3 +1,37 @@
+.if exists(${X11BASE}/include)
+.if exists(${X11BASE}/lib)
+.if exists(${DESTDIR}${X11BASE}/bin)
+.if exists(${DESTDIR}${X11BASE}/man/man1)
+.if exists(${DESTDIR}${X11BASE}/lib/X11/app-defaults)
+
+BINDIR=		${X11BASE}/bin
+MANDIR=		${X11BASE}/man/man
+
+MANDEPEND=	gxditview.1
+CLEANFILES+=	${MANDEPEND}
+
+PROG=		gxditview
+CFLAGS+=	-I${X11BASE}/include -DFONTPATH=\"$(fontpath)\"
+SRCS+=		xditview.c Dvi.c draw.c font.c lex.c page.c parse.c \
+		XFontName.c DviChar.c device.c
+LDDESTDIR+=	-L${X11BASE}/lib
+LDADD+=		-lXaw -lXmu -lXt -lXext -lX11 -lm 
+DPADD+=		${X11BASE}/lib/libXaw.a ${X11BASE}/lib/libXmu.a \
+		${X11BASE}/lib/libXt.a ${X11BASE}/lib/libXext.a \
+		${X11BASE}/lib/libX11.a
+
+afterinstall:
+		install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+		${.CURDIR}/GXditview.ad \
+		${DESTDIR}${X11BASE}/lib/X11/app-defaults/GXditview
+.endif
+.endif
+.endif
+.endif
+.endif
+
+.include "../Makefile.cfg"
+.include <bsd.prog.mk>
 # Makefile generated by imake - do not edit!
 # $XConsortium: imake.c,v 1.65 91/07/25 17:50:17 rws Exp $
 #
diff --git a/gnu/usr.bin/groff/xditview/device.c b/gnu/usr.bin/groff/xditview/device.c
index 26c0f2a3..d14c538 100644
--- a/gnu/usr.bin/groff/xditview/device.c
+++ b/gnu/usr.bin/groff/xditview/device.c
@@ -27,8 +27,12 @@ searching for device and font description files. */
 #define WS " \t\r\n"
 
 /* Minimum and maximum values a `signed int' can hold.  */
+#ifndef	INT_MIN
 #define INT_MIN (-INT_MAX-1)
+#endif
+#ifndef	INT_MAX
 #define INT_MAX 2147483647
+#endif
 
 #define CHAR_TABLE_SIZE 307