From: Jeroen Ruigrok/asmodai <asmodai@dragonflybsd.org>
Date: Thu, 1 Sep 2005 20:47:14 +0000 (+0000)
Subject: Update to groff 1.19.1.
X-Git-Url: https://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/commitdiff_plain/dbf63eef06ff0b1fcba23b97bae3524335fda0a3

Update to groff 1.19.1.
This synchronises us with FreeBSD up till 1.19 (Ids adjusted accordingly).

Big help fixing PATCHES behaviour: joerg
---

diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile
index a869b81e8e..c5ed194724 100644
--- a/gnu/usr.bin/groff/Makefile
+++ b/gnu/usr.bin/groff/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/Makefile,v 2.6.2.2 2001/04/26 17:07:52 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/Makefile,v 1.2 2003/06/17 04:25:45 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/Makefile,v 2.11 2003/05/02 00:55:52 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/Makefile,v 1.3 2005/09/01 20:47:11 asmodai Exp $
 
 SUBDIR=		contrib doc font man src tmac
 
diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc
index 76f71171bd..54b05913db 100644
--- a/gnu/usr.bin/groff/Makefile.inc
+++ b/gnu/usr.bin/groff/Makefile.inc
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.3.6.2 2003/02/14 15:22:12 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/Makefile.inc,v 1.2 2003/06/17 04:25:45 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.11 2005/06/10 07:06:07 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/Makefile.inc,v 1.3 2005/09/01 20:47:11 asmodai Exp $
 
 BINDIR?=	/usr/bin
 SHELL=		/bin/sh
@@ -66,16 +66,9 @@ 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_CONFIG_H
 CFLAGS+=	-I${GROFF_DIST}/src/include -I${.CURDIR}/${TOPREL}/src/include
@@ -83,13 +76,13 @@ CXXFLAGS+=	-fno-rtti -fno-exceptions
 
 .y.o:
 	$(YACC) $(YFLAGS) $(.IMPSRC)
-	mv -f y.tab.c $(.PREFIX).cc
+	mv -f y.tab.c $(.PREFIX).cpp
 	mv -f y.tab.h $(.PREFIX)_tab.h
-	${CXX} ${CXXFLAGS} -c $(.PREFIX).cc -o ${.TARGET}
+	${CXX} ${CXXFLAGS} -c $(.PREFIX).cpp -o ${.TARGET}
 
-.y.cc:
+.y.cpp:
 	$(YACC) $(YFLAGS) $(.IMPSRC)
-	mv -f y.tab.c $(.PREFIX).cc
+	mv -f y.tab.c $(.PREFIX).cpp
 	mv -f y.tab.h $(.PREFIX)_tab.h
 
 .SUFFIXES: .man .1 .2 .3 .4 .5 .6 .7 .8
@@ -126,7 +119,7 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION`
 	-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" \
+	-e "s;@G@;`echo $(g) | LC_ALL=C tr a-z A-Z`;g" \
 	$< >$@
 
 .SUFFIXES: .sh .pl
@@ -134,12 +127,15 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION`
 .sh .pl:
 	@${ECHO} Making ${.TARGET} from ${.IMPSRC}
 	@sed -e "s|@BINDIR@|${BINDIR}|g" \
+	     -e "s;@FONTDIR@;$(fontdir);g" \
+	     -e "s|@GROFF_BIN_PATH_SETUP@|GROFF_RUNTIME=\"\$${GROFF_BIN_PATH=${BINDIR}}:\"|g" \
+	     -e "s|@SEP@|:|g" \
 	     -e "s|@VERSION@|$(version)$(revision)|" \
 	     -e "s|@g@|$(g)|g" \
 	     ${.IMPSRC} >${.TARGET}
 
 TOPREL?=	..
-GROFF_DIST=	${.CURDIR}/${TOPREL}/../../../contrib/groff
+GROFF_DIST=	${.CURDIR}/${TOPREL}/../../../contrib/groff-1.19
 DIST_SUBDIR?=	${.CURDIR:T}
 DIST_DIR=	${GROFF_DIST}/${DIST_SUBDIR}
 .PATH: ${DIST_DIR}
diff --git a/gnu/usr.bin/groff/contrib/Makefile b/gnu/usr.bin/groff/contrib/Makefile
index b6a7eb6d58..061e56d16d 100644
--- a/gnu/usr.bin/groff/contrib/Makefile
+++ b/gnu/usr.bin/groff/contrib/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/contrib/Makefile,v 1.1.2.1 2001/04/26 17:07:55 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/contrib/Makefile,v 1.2 2003/06/17 04:25:45 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/contrib/Makefile,v 1.1 2001/04/17 12:36:32 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/contrib/Makefile,v 1.3 2005/09/01 20:47:11 asmodai Exp $
 
 SUBDIR=		mm
 
diff --git a/gnu/usr.bin/groff/contrib/Makefile.inc b/gnu/usr.bin/groff/contrib/Makefile.inc
index 551d3a7e1f..897915adb6 100644
--- a/gnu/usr.bin/groff/contrib/Makefile.inc
+++ b/gnu/usr.bin/groff/contrib/Makefile.inc
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/contrib/Makefile.inc,v 1.1.2.1 2001/04/26 17:07:55 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/contrib/Makefile.inc,v 1.2 2003/06/17 04:25:45 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/contrib/Makefile.inc,v 1.1 2001/04/17 12:36:32 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/contrib/Makefile.inc,v 1.3 2005/09/01 20:47:11 asmodai Exp $
 
 DIST_SUBDIR=	contrib/${.CURDIR:T}
 TOPREL=		../..
diff --git a/gnu/usr.bin/groff/contrib/groffer/Makefile b/gnu/usr.bin/groff/contrib/groffer/Makefile
index 52c148dc0a..d803eda8ea 100644
--- a/gnu/usr.bin/groff/contrib/groffer/Makefile
+++ b/gnu/usr.bin/groff/contrib/groffer/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/contrib/groffer/Makefile,v 1.1.4.1 2003/02/14 15:22:12 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/contrib/groffer/Attic/Makefile,v 1.2 2003/06/17 04:25:45 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/contrib/groffer/Makefile,v 1.1 2002/10/11 08:58:13 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/contrib/groffer/Attic/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 SCRIPTS=	groffer
 MAN=		groffer.1
diff --git a/gnu/usr.bin/groff/contrib/mm/Makefile b/gnu/usr.bin/groff/contrib/mm/Makefile
index 80ee1ca868..c78ffcef15 100644
--- a/gnu/usr.bin/groff/contrib/mm/Makefile
+++ b/gnu/usr.bin/groff/contrib/mm/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/contrib/mm/Makefile,v 1.1.2.6 2003/02/14 15:22:13 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/contrib/mm/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/contrib/mm/Makefile,v 1.6 2002/10/11 08:58:13 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/contrib/mm/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 SCRIPTS=	mmroff.pl
 MAN=		mmroff.1
diff --git a/gnu/usr.bin/groff/doc/Makefile b/gnu/usr.bin/groff/doc/Makefile
index 2913f691e2..8fa74ddaa3 100644
--- a/gnu/usr.bin/groff/doc/Makefile
+++ b/gnu/usr.bin/groff/doc/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/doc/Makefile,v 1.4.2.1 2000/12/07 09:57:02 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/doc/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/doc/Makefile,v 1.4 2000/12/06 12:17:01 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/doc/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 INFO=	groff
 SRCDIR=	${DIST_DIR}
diff --git a/gnu/usr.bin/groff/font/Makefile b/gnu/usr.bin/groff/font/Makefile
index 2562c5b928..6cb4c5e24c 100644
--- a/gnu/usr.bin/groff/font/Makefile
+++ b/gnu/usr.bin/groff/font/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile,v 2.1.2.1 2001/04/26 17:08:01 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile,v 2.1 2001/04/17 12:36:42 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 SUBDIR=		devX100 devX100-12 devX75 devX75-12 \
 		devascii devcp1047 devdvi devhtml devkoi8-r \
diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
index 754d73066e..31e8bc1858 100644
--- a/gnu/usr.bin/groff/font/Makefile.dev
+++ b/gnu/usr.bin/groff/font/Makefile.dev
@@ -1,7 +1,12 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.8.2.4 2003/02/14 15:22:13 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/Makefile.dev,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.12 2003/05/01 13:22:18 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/Makefile.dev,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 FILES=		${DEVFILES}
 FILESDIR?=	${fontdir}/dev${DEV}
+SCRIPTS=	${DEVSCRIPTS}
+SCRIPTSDIR?=	${fontdir}/dev${DEV}
+.for script in ${SCRIPTS}
+SCRIPTSNAME_${script:T}= ${script:T}
+.endfor
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/font/Makefile.inc b/gnu/usr.bin/groff/font/Makefile.inc
index 25058180b4..e5576e7219 100644
--- a/gnu/usr.bin/groff/font/Makefile.inc
+++ b/gnu/usr.bin/groff/font/Makefile.inc
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.inc,v 2.1.2.1 2001/04/26 17:08:01 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/Makefile.inc,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.inc,v 2.1 2001/04/17 12:36:42 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/Makefile.inc,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 DIST_SUBDIR=	font/${.CURDIR:T}
 TOPREL=		../..
diff --git a/gnu/usr.bin/groff/font/Makefile.tty b/gnu/usr.bin/groff/font/Makefile.tty
index 0a094440d5..9e77d366f6 100644
--- a/gnu/usr.bin/groff/font/Makefile.tty
+++ b/gnu/usr.bin/groff/font/Makefile.tty
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.tty,v 2.7.2.1 2001/04/26 17:08:01 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/Makefile.tty,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.tty,v 2.7 2001/04/17 12:36:42 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/Makefile.tty,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 FONTS?=R I B BI S L CW
 DEVFILES=$(FONTS) DESC
diff --git a/gnu/usr.bin/groff/font/devX100-12/Makefile b/gnu/usr.bin/groff/font/devX100-12/Makefile
index e92b7f306b..b74e7b397a 100644
--- a/gnu/usr.bin/groff/font/devX100-12/Makefile
+++ b/gnu/usr.bin/groff/font/devX100-12/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devX100-12/Makefile,v 1.1.2.1 2001/04/26 17:08:02 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devX100-12/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devX100-12/Makefile,v 1.2 2004/12/21 08:46:51 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devX100-12/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 NOOBJ=
 
diff --git a/gnu/usr.bin/groff/font/devX100/Makefile b/gnu/usr.bin/groff/font/devX100/Makefile
index adc8723055..e99efd3f11 100644
--- a/gnu/usr.bin/groff/font/devX100/Makefile
+++ b/gnu/usr.bin/groff/font/devX100/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devX100/Makefile,v 1.1.2.1 2001/04/26 17:08:02 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devX100/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devX100/Makefile,v 1.2 2004/12/21 08:46:51 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devX100/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 NOOBJ=
 
diff --git a/gnu/usr.bin/groff/font/devX75-12/Makefile b/gnu/usr.bin/groff/font/devX75-12/Makefile
index 87e85cffa9..63aadd7ce2 100644
--- a/gnu/usr.bin/groff/font/devX75-12/Makefile
+++ b/gnu/usr.bin/groff/font/devX75-12/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devX75-12/Makefile,v 1.1.2.1 2001/04/26 17:08:03 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devX75-12/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devX75-12/Makefile,v 1.2 2004/12/21 08:46:51 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devX75-12/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 NOOBJ=
 
diff --git a/gnu/usr.bin/groff/font/devX75/Makefile b/gnu/usr.bin/groff/font/devX75/Makefile
index b1c2e47a34..7d08a81034 100644
--- a/gnu/usr.bin/groff/font/devX75/Makefile
+++ b/gnu/usr.bin/groff/font/devX75/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devX75/Makefile,v 1.1.2.1 2001/04/26 17:08:02 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devX75/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devX75/Makefile,v 1.2 2004/12/21 08:46:51 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devX75/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 NOOBJ=
 
diff --git a/gnu/usr.bin/groff/font/devascii/Makefile b/gnu/usr.bin/groff/font/devascii/Makefile
index 705a6032a3..812f4652bf 100644
--- a/gnu/usr.bin/groff/font/devascii/Makefile
+++ b/gnu/usr.bin/groff/font/devascii/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devascii/Makefile,v 1.1.2.1 2001/04/26 17:08:03 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devascii/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devascii/Makefile,v 1.1 2001/04/17 12:36:46 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devascii/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 DEV=		ascii
 
diff --git a/gnu/usr.bin/groff/font/devcp1047/Makefile b/gnu/usr.bin/groff/font/devcp1047/Makefile
index 8b24cb154d..d084740718 100644
--- a/gnu/usr.bin/groff/font/devcp1047/Makefile
+++ b/gnu/usr.bin/groff/font/devcp1047/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devcp1047/Makefile,v 1.1.2.1 2001/04/26 17:08:03 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devcp1047/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devcp1047/Makefile,v 1.1 2001/04/17 12:36:46 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devcp1047/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 DEV=		cp1047
 
diff --git a/gnu/usr.bin/groff/font/devdvi/Makefile b/gnu/usr.bin/groff/font/devdvi/Makefile
index ab64a475d2..859d9e9514 100644
--- a/gnu/usr.bin/groff/font/devdvi/Makefile
+++ b/gnu/usr.bin/groff/font/devdvi/Makefile
@@ -1,22 +1,29 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devdvi/Makefile,v 1.1.2.2 2003/02/14 15:22:13 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devdvi/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devdvi/Makefile,v 1.3 2003/05/01 13:22:18 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devdvi/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 DEV=		dvi
 DEVFILES=	DESC \
 		TR TI TB TBI CW CWI HR HI HB HBI \
 		TREC TIEC TBEC TBIEC CWEC CWIEC HREC HIEC HBEC HBIEC \
 		TRTC TITC TBTC TBITC CWTC CWITC HRTC HITC HBTC HBITC \
-		MI S EX SA SB \
-		generate/CompileFonts generate/Makefile \
+		MI S EX SA SB SC \
+		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/ec.map generate/tc.map
+		generate/textt.map generate/textex.map generate/ec.map \
+		generate/tc.map
+DEVSCRIPTS=	generate/CompileFonts
 
 CLEANFILES+=	DESC
 
 DESC:	DESC.in
-	cat ${DIST_DIR}/DESC.in >DESC
-	test -z '${DVIPRINT}' || echo print '${DVIPRINT}' >>DESC
+	cat ${DIST_DIR}/DESC.in >${.TARGET}
+	if test "${PAGE}" = A4; then \
+	  echo "papersize a4" >>${.TARGET}; \
+	else \
+	  echo "papersize letter" >>${.TARGET}; \
+	fi
+	test -z '${DVIPRINT}' || echo print '${DVIPRINT}' >>${.TARGET}
 
 .include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/devhtml/Makefile b/gnu/usr.bin/groff/font/devhtml/Makefile
index f91ad927da..7755797fe4 100644
--- a/gnu/usr.bin/groff/font/devhtml/Makefile
+++ b/gnu/usr.bin/groff/font/devhtml/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devhtml/Makefile,v 1.1.2.2 2003/02/14 15:22:13 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devhtml/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devhtml/Makefile,v 1.2 2002/10/11 08:58:13 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devhtml/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 DEV=		html
 FONTS=		R I B BI CR CI CB CBI S
diff --git a/gnu/usr.bin/groff/font/devkoi8-r/Makefile b/gnu/usr.bin/groff/font/devkoi8-r/Makefile
index a41e00f1a4..1189ef4e8e 100644
--- a/gnu/usr.bin/groff/font/devkoi8-r/Makefile
+++ b/gnu/usr.bin/groff/font/devkoi8-r/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devkoi8-r/Makefile,v 1.1.2.1 2001/04/26 17:08:05 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devkoi8-r/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devkoi8-r/Makefile,v 1.1 2001/04/17 12:36:47 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devkoi8-r/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 DEV=		koi8-r
 
diff --git a/gnu/usr.bin/groff/font/devkoi8-r/R.proto b/gnu/usr.bin/groff/font/devkoi8-r/R.proto
index 578eefc3f2..7d796f926c 100644
--- a/gnu/usr.bin/groff/font/devkoi8-r/R.proto
+++ b/gnu/usr.bin/groff/font/devkoi8-r/R.proto
@@ -1,9 +1,41 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devkoi8-r/R.proto,v 1.4.2.2 2001/05/28 07:19:58 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devkoi8-r/R.proto,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devkoi8-r/R.proto,v 1.6 2003/09/08 17:46:33 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devkoi8-r/R.proto,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 name R
 internalname 0
 spacewidth 24
 charset
+---	24	0	0000
+---	24	0	0001
+---	24	0	0002
+---	24	0	0003
+---	24	0	0004
+---	24	0	0005
+---	24	0	0006
+---	24	0	0007
+---	24	0	0010
+---	24	0	0011
+---	24	0	0012
+---	24	0	0013
+---	24	0	0014
+---	24	0	0015
+---	24	0	0016
+---	24	0	0017
+---	24	0	0020
+---	24	0	0021
+---	24	0	0022
+---	24	0	0023
+---	24	0	0024
+---	24	0	0025
+---	24	0	0026
+---	24	0	0027
+---	24	0	0030
+---	24	0	0031
+---	24	0	0032
+---	24	0	0033
+---	24	0	0034
+---	24	0	0035
+---	24	0	0036
+---	24	0	0037
 !	24	0	0041
 "	24	0	0042
 dq	"
@@ -124,7 +156,6 @@ f	24	0	0146
 g	24	0	0147
 h	24	0	0150
 i	24	0	0151
-.i	"
 j	24	0	0152
 k	24	0	0153
 l	24	0	0154
@@ -142,6 +173,7 @@ v	24	0	0166
 w	24	0	0167
 x	24	0	0170
 mu	"
+tmu	"
 y	24	0	0171
 z	24	0	0172
 lC	24	0	0173
@@ -151,165 +183,151 @@ or	"
 bv	"
 br	"
 |	"
-lb	"
-lc	"
-lf	"
-lk	"
-lt	"
-rb	"
-rc	"
-rf	"
-rk	"
-rt	"
 rC	24	0	0175
 }	"
 a~	24	0	0176
 ~	"
 ap	"
 ti	"
-char128	24	0	0200
-char129	24	0	0201
-char130	24	0	0202
-char131	24	0	0203
-char132	24	0	0204
-char133	24	0	0205
-char134	24	0	0206
-char135	24	0	0207
-char136	24	0	0210
-char137	24	0	0211
-char138	24	0	0212
-char139	24	0	0213
-char140	24	0	0214
-char141	24	0	0215
-char142	24	0	0216
-char143	24	0	0217
-char144	24	0	0220
-char145	24	0	0221
-char146	24	0	0222
-char147	24	0	0223
-char148	24	0	0224
-bu	24	0	0225
-char149	"
-sr	24	0	0226
-char150	"
-~~	24	0	0227
+---	24	0	0177
+u2500	24	0	0200
+u2502	24	0	0201
+br	"
+u250C	24	0	0202
+u2510	24	0	0203
+u2514	24	0	0204
+u2518	24	0	0205
+u251C	24	0	0206
+u2524	24	0	0207
+u252C	24	0	0210
+u2534	24	0	0211
+u253C	24	0	0212
+u2580	24	0	0213
+u2584	24	0	0214
+u2588	24	0	0215
+u258C	24	0	0216
+u2590	24	0	0217
+u2591	24	0	0220
+u2592	24	0	0221
+u2593	24	0	0222
+u2320	24	0	0223
+u25A0	24	0	0224
+u2219	24	0	0225
+u221A	24	0	0226
+sr	"
+sqrt	"
+u2248	24	0	0227
+~~	"
 ~=	"
-char151	"
-<=	24	0	0230
-char152	"
->=	24	0	0231
-char153	"
-char154	24	0	0232
-char155	24	0	0233
-de	24	0	0234
-char156	"
-S2	24	0	0235
-char157	"
-pc	24	0	0236
-char158	"
-di	24	0	0237
-char159	"
-char160	24	0	0240
-char161	24	0	0241
-char162	24	0	0242
-:e	24	0	0243
-char163	"
-char164	24	0	0244
-char165	24	0	0245
-char166	24	0	0246
-char167	24	0	0247
-char168	24	0	0250
-char169	24	0	0251
-char170	24	0	0252
-char171	24	0	0253
-char172	24	0	0254
-char173	24	0	0255
-char174	24	0	0256
-char175	24	0	0257
-char176	24	0	0260
-char177	24	0	0261
-char178	24	0	0262
-:E	24	0	0263
-char179	"
-char180	24	0	0264
-char181	24	0	0265
-char182	24	0	0266
-char183	24	0	0267
-char184	24	0	0270
-char185	24	0	0271
-char186	24	0	0272
-char187	24	0	0273
-char188	24	0	0274
-char189	24	0	0275
-char190	24	0	0276
-co	24	0	0277
-char191	"
-char192	24	0	0300
-char193	24	0	0301
-char194	24	0	0302
-char195	24	0	0303
-char196	24	0	0304
-char197	24	0	0305
-*f	24	0	0306
-char198	"
-char199	24	0	0307
-char200	24	0	0310
-char201	24	0	0311
-char202	24	0	0312
-char203	24	0	0313
-char204	24	0	0314
-char205	24	0	0315
-char206	24	0	0316
-char207	24	0	0317
-*p	24	0	0320
-char208	"
-char209	24	0	0321
-char210	24	0	0322
-char211	24	0	0323
-char212	24	0	0324
-char213	24	0	0325
-char214	24	0	0326
-char215	24	0	0327
-char216	24	0	0330
-char217	24	0	0331
-char218	24	0	0332
-char219	24	0	0333
-char220	24	0	0334
-char221	24	0	0335
-char222	24	0	0336
-char223	24	0	0337
-char224	24	0	0340
-char225	24	0	0341
-char226	24	0	0342
-char227	24	0	0343
-char228	24	0	0344
-char229	24	0	0345
-*F	24	0	0346
-char230	"
-*G	24	0	0347
-char231	"
-char232	24	0	0350
-char233	24	0	0351
-char234	24	0	0352
-char235	24	0	0353
-char236	24	0	0354
-char237	24	0	0355
-char238	24	0	0356
-char239	24	0	0357
-*P	24	0	0360
-char240	"
-char241	24	0	0361
-char242	24	0	0362
-char243	24	0	0363
-char244	24	0	0364
-char245	24	0	0365
-char246	24	0	0366
-char247	24	0	0367
-char248	24	0	0370
-char249	24	0	0371
-char250	24	0	0372
-char251	24	0	0373
-char252	24	0	0374
-char253	24	0	0375
-char254	24	0	0376
-char255	24	0	0377
+u2264	24	0	0230
+<=	"
+u2265	24	0	0231
+>=	"
+u00A0	24	0	0232
+u2321	24	0	0233
+u00B0	24	0	0234
+de	"
+u00B2	24	0	0235
+S2	"
+u00B7	24	0	0236
+pc	"
+u00F7	24	0	0237
+di	"
+tdi	"
+u2550	24	0	0240
+u2551	24	0	0241
+u2552	24	0	0242
+u0435_0308	24	0	0243
+u2553	24	0	0244
+u2554	24	0	0245
+u2555	24	0	0246
+u2556	24	0	0247
+u2557	24	0	0250
+u2558	24	0	0251
+u2559	24	0	0252
+u255A	24	0	0253
+u255B	24	0	0254
+u255C	24	0	0255
+u255D	24	0	0256
+u255E	24	0	0257
+u255F	24	0	0260
+u2560	24	0	0261
+u2561	24	0	0262
+u0415_0308	24	0	0263
+u2562	24	0	0264
+u2563	24	0	0265
+u2564	24	0	0266
+u2565	24	0	0267
+u2566	24	0	0270
+u2567	24	0	0271
+u2568	24	0	0272
+u2569	24	0	0273
+u256A	24	0	0274
+u256B	24	0	0275
+u256C	24	0	0276
+u00A9	24	0	0277
+co	"
+u044E	24	0	0300
+u0430	24	0	0301
+u0431	24	0	0302
+u0446	24	0	0303
+u0434	24	0	0304
+u0435	24	0	0305
+u0444	24	0	0306
+u0433	24	0	0307
+u0445	24	0	0310
+u0438	24	0	0311
+u0438_0306	24	0	0312
+u043A	24	0	0313
+u043B	24	0	0314
+u043C	24	0	0315
+u043D	24	0	0316
+u043E	24	0	0317
+u043F	24	0	0320
+u044F	24	0	0321
+u0440	24	0	0322
+u0441	24	0	0323
+u0442	24	0	0324
+u0443	24	0	0325
+u0436	24	0	0326
+u0432	24	0	0327
+u044C	24	0	0330
+u044B	24	0	0331
+u0437	24	0	0332
+u0448	24	0	0333
+u044D	24	0	0334
+u0449	24	0	0335
+u0447	24	0	0336
+u044A	24	0	0337
+u042E	24	0	0340
+u0410	24	0	0341
+u0411	24	0	0342
+u0426	24	0	0343
+u0414	24	0	0344
+u0415	24	0	0345
+u0424	24	0	0346
+u0413	24	0	0347
+u0425	24	0	0350
+u0418	24	0	0351
+u0418_0306	24	0	0352
+u041A	24	0	0353
+u041B	24	0	0354
+u041C	24	0	0355
+u041D	24	0	0356
+u041E	24	0	0357
+u041F	24	0	0360
+u042F	24	0	0361
+u0420	24	0	0362
+u0421	24	0	0363
+u0422	24	0	0364
+u0423	24	0	0365
+u0416	24	0	0366
+u0412	24	0	0367
+u042C	24	0	0370
+u042B	24	0	0371
+u0417	24	0	0372
+u0428	24	0	0373
+u042D	24	0	0374
+u0429	24	0	0375
+u0427	24	0	0376
+u042A	24	0	0377
diff --git a/gnu/usr.bin/groff/font/devlatin1/Makefile b/gnu/usr.bin/groff/font/devlatin1/Makefile
index c1cc35ab04..2d8b1bb592 100644
--- a/gnu/usr.bin/groff/font/devlatin1/Makefile
+++ b/gnu/usr.bin/groff/font/devlatin1/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devlatin1/Makefile,v 1.1.2.1 2001/04/26 17:08:06 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devlatin1/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devlatin1/Makefile,v 1.1 2001/04/17 12:36:47 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devlatin1/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 DEV=		latin1
 
diff --git a/gnu/usr.bin/groff/font/devlbp/Makefile b/gnu/usr.bin/groff/font/devlbp/Makefile
index 998e8aedcc..204ab7a84b 100644
--- a/gnu/usr.bin/groff/font/devlbp/Makefile
+++ b/gnu/usr.bin/groff/font/devlbp/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devlbp/Makefile,v 1.1.2.2 2003/02/14 15:22:13 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devlbp/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devlbp/Makefile,v 1.2 2002/10/11 08:58:13 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devlbp/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 DEV=		lbp
 LBPPRINT=	${PSPRINT}
diff --git a/gnu/usr.bin/groff/font/devlj4/Makefile b/gnu/usr.bin/groff/font/devlj4/Makefile
index d9a3980d38..81141e7fd2 100644
--- a/gnu/usr.bin/groff/font/devlj4/Makefile
+++ b/gnu/usr.bin/groff/font/devlj4/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devlj4/Makefile,v 1.1.2.1 2001/04/26 17:08:06 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devlj4/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devlj4/Makefile,v 1.1 2001/04/17 12:36:48 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devlj4/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 DEV=		lj4
 LJ4RES=		600
diff --git a/gnu/usr.bin/groff/font/devps/Makefile b/gnu/usr.bin/groff/font/devps/Makefile
index 856b0dcc45..095749a62d 100644
--- a/gnu/usr.bin/groff/font/devps/Makefile
+++ b/gnu/usr.bin/groff/font/devps/Makefile
@@ -1,16 +1,19 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devps/Makefile,v 1.1.2.2 2003/02/14 15:22:13 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devps/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devps/Makefile,v 1.3 2003/05/01 13:22:18 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devps/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 DEV=		ps
 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
+		NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI \
+		EURO freeeuro.pfa
 PSFILES=	prologue symbolsl.pfa zapfdr.pfa
-DEVGENFILES=	generate/Makefile generate/afmname generate/dingbats.map \
-		generate/dingbats.rmap generate/lgreekmap generate/symbol.sed \
+DEVGENFILES=	generate/Makefile generate/dingbats.map \
+		generate/dingbats.rmap generate/lgreekmap \
 		generate/symbolchars generate/symbolsl.afm generate/textmap
+DEVGENSCRIPTS=	generate/afmname generate/symbol.sed
 DEVFILES=	DESC ${PSFILES} ${DISTFILES} ${DEVGENFILES}
+DEVSCRIPTS=	${DEVGENSCRIPTS}
 
 CLEANFILES+=	DESC ${PSFILES}
 
diff --git a/gnu/usr.bin/groff/font/devutf8/Makefile b/gnu/usr.bin/groff/font/devutf8/Makefile
index 6d28856dae..4ed7ee1bcc 100644
--- a/gnu/usr.bin/groff/font/devutf8/Makefile
+++ b/gnu/usr.bin/groff/font/devutf8/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/devutf8/Makefile,v 1.1.2.1 2001/04/26 17:08:07 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/font/devutf8/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/devutf8/Makefile,v 1.1 2001/04/17 12:36:49 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/font/devutf8/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 DEV=		utf8
 
diff --git a/gnu/usr.bin/groff/man/Makefile b/gnu/usr.bin/groff/man/Makefile
index 378123e90b..f68c6e0c1c 100644
--- a/gnu/usr.bin/groff/man/Makefile
+++ b/gnu/usr.bin/groff/man/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/man/Makefile,v 1.5.8.4 2003/02/14 15:22:13 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/man/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/man/Makefile,v 1.9 2002/10/11 08:58:14 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/man/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 MAN=		groff_font.5 groff_out.5 groff_tmac.5
 MLINKS=		groff_tmac.5 tmac.5
diff --git a/gnu/usr.bin/groff/src/Makefile b/gnu/usr.bin/groff/src/Makefile
index 58de4df039..be9e7515c7 100644
--- a/gnu/usr.bin/groff/src/Makefile
+++ b/gnu/usr.bin/groff/src/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/Makefile,v 1.1.2.1 2001/04/26 17:08:21 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/Makefile,v 1.1 2001/04/17 12:37:02 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 SUBDIR=		libs devices preproc roff utils
 
diff --git a/gnu/usr.bin/groff/src/devices/Makefile b/gnu/usr.bin/groff/src/devices/Makefile
index 5cb47e394c..89c3ffe73a 100644
--- a/gnu/usr.bin/groff/src/devices/Makefile
+++ b/gnu/usr.bin/groff/src/devices/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/devices/Makefile,v 1.1.2.1 2001/04/26 17:08:22 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/devices/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/Makefile,v 1.1 2001/04/17 12:37:02 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/devices/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 SUBDIR=		grodvi grohtml grolbp grolj4 grops grotty
 
diff --git a/gnu/usr.bin/groff/src/devices/Makefile.inc b/gnu/usr.bin/groff/src/devices/Makefile.inc
index a95e1f567d..50032705be 100644
--- a/gnu/usr.bin/groff/src/devices/Makefile.inc
+++ b/gnu/usr.bin/groff/src/devices/Makefile.inc
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/devices/Makefile.inc,v 1.1.2.1 2001/04/26 17:08:22 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/devices/Makefile.inc,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/Makefile.inc,v 1.1 2001/04/17 12:37:02 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/devices/Makefile.inc,v 1.3 2005/09/01 20:47:12 asmodai Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/devices/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
index 78762e0f28..b5f1a86acc 100644
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grodvi/Makefile,v 1.1.2.2 2002/07/19 08:34:07 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/devices/grodvi/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grodvi/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/devices/grodvi/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 PROG_CXX=	grodvi
-SRCS=		dvi.cc
+SRCS=		dvi.cpp
 DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
index 30fa0dfa4f..4df8f8a8ad 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile,v 1.1.2.3 2003/02/14 15:22:13 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile,v 1.7 2004/12/21 08:47:00 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 PROG_CXX=	post-grohtml
-SRCS=		post-html.cc html-table.cc html-text.cc output.cc
+SRCS=		post-html.cpp html-table.cpp html-text.cpp output.cpp
 DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
 NOMAN=		YES
diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
index ca646ed084..a64b523364 100644
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolbp/Makefile,v 1.1.2.2 2002/07/19 08:34:08 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/devices/grolbp/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolbp/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/devices/grolbp/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 PROG_CXX=	grolbp
-SRCS=		lbp.cc
+SRCS=		lbp.cpp
 DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
index 05149eabc0..c821a0e51d 100644
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile,v 1.1.2.2 2002/07/19 08:34:08 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 PROG_CXX=	grolj4
-SRCS=		lj4.cc
+SRCS=		lj4.cpp
 DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile b/gnu/usr.bin/groff/src/devices/grops/Makefile
index 75b66ddcfa..fa737926b8 100644
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grops/Makefile,v 1.1.2.2 2002/07/19 08:34:09 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/devices/grops/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grops/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/devices/grops/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 PROG_CXX=	grops
-SRCS=		ps.cc psrm.cc
+SRCS=		ps.cpp psrm.cpp
 DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile b/gnu/usr.bin/groff/src/devices/grotty/Makefile
index 2c5ef64a60..1ba661a2b2 100644
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grotty/Makefile,v 1.1.2.2 2002/07/19 08:34:09 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/devices/grotty/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grotty/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/devices/grotty/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 PROG_CXX=	grotty
-SRCS=		tty.cc
+SRCS=		tty.cpp
 DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/include/config.h b/gnu/usr.bin/groff/src/include/config.h
index de55f0ce68..30121670b5 100644
--- a/gnu/usr.bin/groff/src/include/config.h
+++ b/gnu/usr.bin/groff/src/include/config.h
@@ -1,9 +1,4 @@
-/*
- * $FreeBSD: src/gnu/usr.bin/groff/src/include/config.h,v 1.2.4.2 2003/06/26 13:13:54 ru Exp $
- * $DragonFly: src/gnu/usr.bin/groff/src/include/config.h,v 1.5 2004/02/09 20:12:05 dillon Exp $
- */
-
-#include <osreldate.h>
+/* $DragonFly: src/gnu/usr.bin/groff/src/include/config.h,v 1.6 2005/09/01 20:47:13 asmodai Exp $ */
 
 /* src/include/config.h.  Generated by configure.  */
 /* src/include/config.hin.  Generated from configure.ac by autoheader.  */
@@ -20,6 +15,13 @@
 /* Define if you have a C++ <stdint.h>. */
 #define HAVE_CC_STDINT_H 1
 
+/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
+   don't. */
+#define HAVE_DECL_SYS_SIGLIST 0
+
+/* Define to 1 if you have the <direct.h> header file. */
+/* #undef HAVE_DIRECT_H */
+
 /* Define to 1 if you have the <dirent.h> header file. */
 #define HAVE_DIRENT_H 1
 
@@ -41,6 +43,9 @@
 /* Define to 1 if you have the `isatty' function. */
 #define HAVE_ISATTY 1
 
+/* Define to 1 if you have the `kill' function. */
+#define HAVE_KILL 1
+
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
@@ -56,6 +61,9 @@
 /* Define to 1 if you have a working `mmap' system call. */
 #define HAVE_MMAP 1
 
+/* Define to 1 if you have the <process.h> header file. */
+/* #undef HAVE_PROCESS_H */
+
 /* Define to 1 if you have the `putenv' function. */
 #define HAVE_PUTENV 1
 
@@ -69,10 +77,7 @@
 #define HAVE_SNPRINTF 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
-/* don't try to use stdint.h when bootstrapping tools from freebsd */
-#ifdef __DragonFly__
 #define HAVE_STDINT_H 1
-#endif
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
@@ -99,15 +104,15 @@
 #define HAVE_STRTOL 1
 
 /* Define if <math.h> defines struct exception. */
-#define HAVE_STRUCT_EXCEPTION 1
+/* #undef HAVE_STRUCT_EXCEPTION */
 
 /* Define to 1 if you have the <sys/dir.h> header file. */
 #define HAVE_SYS_DIR_H 1
 
-/* Define if you have sys_errlist in <errno.h> or in <stdio.h>. */
+/* Define if you have sys_errlist in <errno.h>, <stdio.h>, or <stdlib.h>. */
 #define HAVE_SYS_ERRLIST 1
 
-/* Define if you have sysnerr in <errno.h> or <stdio.h>. */
+/* Define if you have sys_nerr in <errno.h>, <stdio.h>, or <stdio.h>. */
 #define HAVE_SYS_NERR 1
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
@@ -122,6 +127,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
+/* Define to 1 if you have the `vsnprintf' function. */
+#define HAVE_VSNPRINTF 1
+
 /* Define if the host's encoding is EBCDIC. */
 /* #undef IS_EBCDIC_HOST */
 
@@ -158,6 +166,12 @@
 /* Define if your C++ doesn't declare strncasecmp(). */
 /* #undef NEED_DECLARATION_STRNCASECMP */
 
+/* Define if your C++ doesn't declare vfprintf(). */
+/* #undef NEED_DECLARATION_VFPRINTF */
+
+/* Define if your C++ doesn't declare vsnprintf(). */
+/* #undef NEED_DECLARATION_VSNPRINTF */
+
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT ""
 
@@ -174,7 +188,7 @@
 #define PACKAGE_VERSION ""
 
 /* Define if the printer's page size is A4. */
-#define PAGEA4 1
+/* #undef PAGEA4 */
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
@@ -185,9 +199,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
-/* Define to 1 if `sys_siglist' is declared by <signal.h> or <unistd.h>. */
-#define SYS_SIGLIST_DECLARED 1
-
 /* Define if your C++ compiler uses a traditional (Reiser) preprocessor. */
 /* #undef TRADITIONAL_CPP */
 
@@ -203,4 +214,4 @@
 
 /* Define uintmax_t to `unsigned long' or `unsigned long long' if <inttypes.h>
    does not exist. */
-/* #define uintmax_t unsigned long long */
+/* #undef uintmax_t */
diff --git a/gnu/usr.bin/groff/src/libs/Makefile b/gnu/usr.bin/groff/src/libs/Makefile
index 510d64bac7..b9a747229c 100644
--- a/gnu/usr.bin/groff/src/libs/Makefile
+++ b/gnu/usr.bin/groff/src/libs/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/libs/Makefile,v 1.1.2.1 2001/04/26 17:08:27 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/libs/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/Makefile,v 1.1 2001/04/17 12:37:08 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/libs/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 SUBDIR=		libgroff libdriver libbib
 
diff --git a/gnu/usr.bin/groff/src/libs/Makefile.inc b/gnu/usr.bin/groff/src/libs/Makefile.inc
index c69f2a7c91..46116d9580 100644
--- a/gnu/usr.bin/groff/src/libs/Makefile.inc
+++ b/gnu/usr.bin/groff/src/libs/Makefile.inc
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/libs/Makefile.inc,v 1.1.2.1 2001/04/26 17:08:27 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/libs/Makefile.inc,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/Makefile.inc,v 1.1 2001/04/17 12:37:08 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/libs/Makefile.inc,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/libs/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/libs/libbib/Makefile b/gnu/usr.bin/groff/src/libs/libbib/Makefile
index 80cf31542f..1dfd1f44ef 100644
--- a/gnu/usr.bin/groff/src/libs/libbib/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libbib/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libbib/Makefile,v 1.1.2.2 2002/07/19 18:46:24 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/libs/libbib/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libbib/Makefile,v 1.4 2004/10/24 15:32:28 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/libs/libbib/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 LIB=		bib
-INTERNALLIB=	YES
-SRCS=		common.cc index.cc linear.cc search.cc map.c
+INTERNALLIB=
+SRCS=		common.cpp index.cpp linear.cpp search.cpp map.c
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/groff/src/libs/libdriver/Makefile b/gnu/usr.bin/groff/src/libs/libdriver/Makefile
index 8819a631c3..2506b41992 100644
--- a/gnu/usr.bin/groff/src/libs/libdriver/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libdriver/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libdriver/Makefile,v 1.1.2.2 2002/07/19 18:46:24 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/libs/libdriver/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libdriver/Makefile,v 1.4 2004/10/24 15:32:28 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/libs/libdriver/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 LIB=		driver
-INTERNALLIB=	YES
-SRCS=		input.cc printer.cc
+INTERNALLIB=
+SRCS=		input.cpp printer.cpp
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/groff/src/libs/libgroff/Makefile b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
index b70db18b86..95fcb1ff89 100644
--- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
@@ -1,21 +1,27 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libgroff/Makefile,v 1.1.2.4 2003/02/14 15:22:14 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/libs/libgroff/Makefile,v 1.3 2005/07/26 21:15:19 joerg Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libgroff/Makefile,v 1.8 2004/10/24 15:32:29 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/libs/libgroff/Makefile,v 1.4 2005/09/01 20:47:13 asmodai Exp $
+
+PATCHES!=       echo ${.CURDIR}/patches/*.patch
+CONTRIBDIR=     ${DIST_DIR}
 
 LIB=		groff
-INTERNALLIB=	YES
-SRCS=		assert.cc change_lf.cc cmap.cc color.cc cset.cc device.cc errarg.cc\
-		error.cc fatal.cc filename.cc font.cc fontfile.cc geometry.cc\
-		htmlhint.cc invalid.cc lf.cc lineno.cc macropath.cc\
-		maxfilename.cc mksdir.cc nametoindex.cc new.cc paper.cc prime.cc\
-	 	progname.cc ptable.cc searchpath.cc string.cc strsave.cc\
-		tmpfile.cc tmpname.cc version.cc
-SRCS+=		getopt.c getopt1.c iftoa.c itoa.c
-CLEANFILES=	version.cc
+INTERNALLIB=
+SRCS=		assert.cpp change_lf.cpp cmap.cpp color.cpp cset.cpp device.cpp\
+		errarg.cpp error.cpp fatal.cpp filename.cpp font.cpp\
+		fontfile.cpp geometry.cpp glyphuni.cpp htmlhint.cpp invalid.cpp\
+		lf.cpp lineno.cpp macropath.cpp maxfilename.cpp mksdir.cpp\
+		nametoindex.cpp new.cpp paper.cpp prime.cpp ptable.cpp\
+		searchpath.cpp string.cpp strsave.cpp tmpfile.cpp\
+		searchpath.cpp string.cpp strsave.cpp symbol.cpp tmpfile.cpp\
+		tmpname.cpp unicode.cpp uniglyph.cpp uniuni.cpp version.cpp
+SRCS+=		iftoa.c itoa.c matherr.c progname.c quotearg.c spawnvp.c
+SRCS+=		${PATCHES}
+CLEANFILES=	version.cpp
 
 .include <bsd.lib.mk>
 
-version.cc: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION
-	@${ECHO} Making version.cc
+version.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION
+	@${ECHO} Making version.cpp
 	@echo const char \*version_string = \"`cat ${GROFF_DIST}/VERSION`\"\; >$@
 	@echo const char \*revision_string = \"`cat ${GROFF_DIST}/REVISION`\"\; >>$@
 	@echo extern \"C\" const char \*Version_string = \"`cat ${GROFF_DIST}/VERSION`.`cat ${GROFF_DIST}/REVISION`\"\; | \
diff --git a/gnu/usr.bin/groff/src/libs/libgroff/patches/cmap.cpp.patch b/gnu/usr.bin/groff/src/libs/libgroff/patches/cmap.cpp.patch
new file mode 100644
index 0000000000..686e829e95
--- /dev/null
+++ b/gnu/usr.bin/groff/src/libs/libgroff/patches/cmap.cpp.patch
@@ -0,0 +1,31 @@
+$DragonFly: src/gnu/usr.bin/groff/src/libs/libgroff/patches/cmap.cpp.patch,v 1.1 2005/09/01 20:47:13 asmodai Exp $
+
+--- cmap.cpp	2005-08-31 14:28:07.000000000 +0200
++++ cmap.cpp	2005-08-31 15:15:08.000000000 +0200
+@@ -19,12 +19,15 @@
+ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 
+ #include <ctype.h>
++#if defined(__DragonFly__) || defined(__FreeBSD__)
++#include <locale.h>
++#endif
+ #include "cmap.h"
+ 
+ cmap cmlower(CMAP_BUILTIN);
+ cmap cmupper(CMAP_BUILTIN);
+ 
+-#ifdef isascii
++#if defined(isascii) && (!defined(__DragonFly__) || !defined(__FreeBSD__))
+ #define ISASCII(c) isascii(c)
+ #else
+ #define ISASCII(c) (1)
+@@ -49,6 +52,9 @@
+   if (initialised)
+     return;
+   initialised = 1;
++#if defined(__DragonFly__) || (__FreeBSD__)
++  (void)setlocale(LC_CTYPE, "");
++#endif
+   for (int i = 0; i <= UCHAR_MAX; i++) {
+     cmupper.v[i] = ISASCII(i) && islower(i) ? toupper(i) : i;
+     cmlower.v[i] = ISASCII(i) && isupper(i) ? tolower(i) : i;
diff --git a/gnu/usr.bin/groff/src/libs/libgroff/patches/cset.cpp.patch b/gnu/usr.bin/groff/src/libs/libgroff/patches/cset.cpp.patch
new file mode 100644
index 0000000000..289af294df
--- /dev/null
+++ b/gnu/usr.bin/groff/src/libs/libgroff/patches/cset.cpp.patch
@@ -0,0 +1,33 @@
+$DragonFly: src/gnu/usr.bin/groff/src/libs/libgroff/patches/cset.cpp.patch,v 1.1 2005/09/01 20:47:13 asmodai Exp $
+
+--- cset.cpp	2005-08-31 14:28:07.000000000 +0200
++++ cset.cpp	2005-08-31 15:53:50.000000000 +0200
+@@ -19,6 +19,9 @@
+ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 
+ #include <ctype.h>
++#if defined(__DragonFly__) || defined(__FreeBSD__)
++#include <locale.h>
++#endif
+ #include "cset.h"
+ 
+ cset csalpha(CSET_BUILTIN);
+@@ -33,7 +36,7 @@
+ cset csgraph(CSET_BUILTIN);
+ cset cscntrl(CSET_BUILTIN);
+ 
+-#ifdef isascii
++#if defined(isascii) && (!defined(__DragonFly__) || !defined(__FreeBSD__))
+ #define ISASCII(c) isascii(c)
+ #else
+ #define ISASCII(c) (1)
+@@ -86,6 +89,9 @@
+   if (initialised)
+     return;
+   initialised = 1;
++#if defined(__DragonFly__) || defined(__FreeBSD__)
++  (void)setlocale(LC_CTYPE, "");
++#endif
+   for (int i = 0; i <= UCHAR_MAX; i++) {
+     csalpha.v[i] = ISASCII(i) && isalpha(i);
+     csupper.v[i] = ISASCII(i) && isupper(i);
diff --git a/gnu/usr.bin/groff/src/libs/libgroff/patches/invalid.cpp.patch b/gnu/usr.bin/groff/src/libs/libgroff/patches/invalid.cpp.patch
new file mode 100644
index 0000000000..1b255e92de
--- /dev/null
+++ b/gnu/usr.bin/groff/src/libs/libgroff/patches/invalid.cpp.patch
@@ -0,0 +1,15 @@
+$DragonFly: src/gnu/usr.bin/groff/src/libs/libgroff/patches/invalid.cpp.patch,v 1.1 2005/09/01 20:47:13 asmodai Exp $
+
+--- invalid.cpp	2005-08-31 14:28:07.000000000 +0200
++++ invalid.cpp	2005-08-31 15:28:51.000000000 +0200
+@@ -31,8 +31,8 @@
+   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
++  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
++  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/gnu/usr.bin/groff/src/preproc/Makefile b/gnu/usr.bin/groff/src/preproc/Makefile
index 97a98fb37d..20df2e370f 100644
--- a/gnu/usr.bin/groff/src/preproc/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/Makefile,v 1.1.2.2 2003/02/14 15:22:14 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/preproc/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/Makefile,v 1.2 2002/10/29 14:56:06 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/preproc/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 SUBDIR=		eqn grn html pic refer soelim tbl
 
diff --git a/gnu/usr.bin/groff/src/preproc/Makefile.inc b/gnu/usr.bin/groff/src/preproc/Makefile.inc
index 39b03d7951..20bfc8b22e 100644
--- a/gnu/usr.bin/groff/src/preproc/Makefile.inc
+++ b/gnu/usr.bin/groff/src/preproc/Makefile.inc
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/Makefile.inc,v 1.1.2.1 2001/04/26 17:08:29 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/preproc/Makefile.inc,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/Makefile.inc,v 1.1 2001/04/17 12:37:09 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/preproc/Makefile.inc,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/preproc/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
index 2fc5a154c1..107ff272f8 100644
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
@@ -1,17 +1,21 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.1.2.2 2002/07/19 08:34:09 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
+
+PATCHES!=       echo ${.CURDIR}/patches/*.patch
+CONTRIBDIR=     ${DIST_DIR}
 
 PROG_CXX=	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
+SRCS=		eqn.cpp eqn_tab.h main.cpp lex.cpp \
+		box.cpp limit.cpp list.cpp over.cpp text.cpp \
+		script.cpp mark.cpp other.cpp delim.cpp sqrt.cpp pile.cpp \
+		special.cpp ${PATCHES}
 CFLAGS+=	-I${DIST_DIR} -I.
 DPADD=		${LIBGROFF}
 LDADD=		${LIBGROFF}
 SCRIPTS=	neqn
 MAN=		eqn.1 neqn.1
-CLEANFILES=	eqn.cc eqn_tab.h ${SCRIPTS} ${MAN} y.tab.c y.tab.h
+CLEANFILES=	eqn.cpp eqn_tab.h ${SCRIPTS} ${MAN} y.tab.c y.tab.h
 
-eqn_tab.h: eqn.cc
+eqn_tab.h: eqn.cpp
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/eqn/patches/neqn.sh.no_obj.patch b/gnu/usr.bin/groff/src/preproc/eqn/patches/neqn.sh.no_obj.patch
new file mode 100644
index 0000000000..46285ee073
--- /dev/null
+++ b/gnu/usr.bin/groff/src/preproc/eqn/patches/neqn.sh.no_obj.patch
@@ -0,0 +1,29 @@
+$DragonFly: src/gnu/usr.bin/groff/src/preproc/eqn/patches/neqn.sh.no_obj.patch,v 1.1 2005/09/01 20:47:13 asmodai Exp $
+
+--- neqn.sh	2005-08-31 14:28:07.000000000 +0200
++++ neqn.sh	2005-08-31 15:32:38.000000000 +0200
+@@ -2,9 +2,23 @@
+ # Provision of this shell script should not be taken to imply that use of
+ # GNU eqn with groff -Tascii|-Tlatin1|-Tutf8|-Tcp1047 is supported.
+ 
++# Default device.
++case "${LC_ALL-${LC_CTYPE-${LANG}}}" in
++  *.UTF-8)
++    T=utf8 ;;
++  iso_8859_1 | *.ISO*8859-1 | *.ISO*8859-15)
++    T=latin1 ;;
++  *.IBM-1047)
++    T=cp1047 ;;
++  *.KOI8-R)
++    T=koi8-r ;;
++  *)
++    T=ascii ;;
++esac
++
+ @GROFF_BIN_PATH_SETUP@
+ PATH="$GROFF_RUNTIME$PATH"
+ export PATH
+-exec @g@eqn -Tascii ${1+"$@"}
++exec @g@eqn -T${T} ${1+"$@"}
+ 
+ # eof
diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile
index 52ef12f835..8cd4532af5 100644
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/grn/Makefile,v 1.1.2.2 2002/07/19 08:34:09 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/preproc/grn/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/grn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/preproc/grn/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 PROG_CXX=	grn
-SRCS=		hdb.cc hpoint.cc hgraph.cc main.cc
+SRCS=		hdb.cpp hpoint.cpp hgraph.cpp main.cpp
 DPADD=	 	${LIBGROFF} ${LIBM}
 LDADD=	 	${LIBGROFF} -lm
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile
index 0371b99077..cd258dc50e 100644
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile
@@ -1,10 +1,10 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/html/Makefile,v 1.1.2.3 2003/02/14 15:22:14 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/preproc/html/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/html/Makefile,v 1.7 2004/12/21 08:47:00 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/preproc/html/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 PROG_CXX=	pre-grohtml
-SRCS=		pre-html.cc pushback.cc
+SRCS=		pre-html.cpp pushback.cpp
 DPADD=		${LIBGROFF}
 LDADD=		${LIBGROFF}
-NOMAN=		YES
+NOMAN=
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile b/gnu/usr.bin/groff/src/preproc/pic/Makefile
index 8514929372..f016e0893d 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile
@@ -1,14 +1,14 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/pic/Makefile,v 1.1.2.2 2002/07/19 08:34:10 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/preproc/pic/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/pic/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/preproc/pic/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 PROG_CXX=	pic
-SRCS=		lex.cc main.cc object.cc pic.cc pic_tab.h \
-		common.cc troff.cc tex.cc
+SRCS=		lex.cpp main.cpp object.cpp pic.cpp pic_tab.h \
+		common.cpp troff.cpp tex.cpp
 CFLAGS+=	-I${DIST_DIR} -I.
 DPADD=		${LIBGROFF} ${LIBM}
 LDADD=		${LIBGROFF} -lm
-CLEANFILES=	${MAN} pic.cc pic_tab.h y.tab.c y.tab.h
+CLEANFILES=	${MAN} pic.cpp pic_tab.h y.tab.c y.tab.h
 
-pic_tab.h: pic.cc
+pic_tab.h: pic.cpp
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile
index 5d14eee5e8..2a469f841d 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile
@@ -1,11 +1,11 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/refer/Makefile,v 1.1.2.2 2002/07/19 08:34:10 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/preproc/refer/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/refer/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/preproc/refer/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 PROG_CXX=	refer
-SRCS=		command.cc label.cc ref.cc refer.cc token.cc
+SRCS=		command.cpp label.cpp ref.cpp refer.cpp token.cpp
 CFLAGS+=	-I${DIST_DIR}
 DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBBIB} ${LIBGROFF} -lm
-CLEANFILES=	label.cc label_tab.h ${MAN} y.tab.c y.tab.h
+CLEANFILES=	label.cpp label_tab.h ${MAN} y.tab.c y.tab.h
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/soelim/Makefile b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
index 5fcafefe1a..b8307c1e54 100644
--- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
@@ -1,7 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/soelim/Makefile,v 1.1.2.2 2002/07/19 08:34:10 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/preproc/soelim/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/soelim/Makefile,v 1.3 2003/05/01 13:22:20 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/preproc/soelim/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 PROG_CXX=	soelim
+SRCS=		soelim.cpp
 DPADD=		${LIBGROFF}
 LDADD=		${LIBGROFF}
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
index 3f88e46d3f..61a4a93bc9 100644
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/tbl/Makefile,v 1.1.2.2 2002/07/19 08:34:10 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/preproc/tbl/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/tbl/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/preproc/tbl/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 PROG_CXX=	tbl
-SRCS=		main.cc table.cc
+SRCS=		main.cpp table.cpp
 DPADD=		${LIBGROFF} ${LIBM}
 LDADD=		${LIBGROFF} -lm
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/roff/Makefile b/gnu/usr.bin/groff/src/roff/Makefile
index 19388a0dab..46a69cebe2 100644
--- a/gnu/usr.bin/groff/src/roff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/roff/Makefile,v 1.1.2.1 2001/04/26 17:08:32 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/roff/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/Makefile,v 1.1 2001/04/17 12:37:12 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/roff/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 SUBDIR=		groff grog nroff psroff troff
 
diff --git a/gnu/usr.bin/groff/src/roff/Makefile.inc b/gnu/usr.bin/groff/src/roff/Makefile.inc
index 3c3eb1d42d..905bcbd98c 100644
--- a/gnu/usr.bin/groff/src/roff/Makefile.inc
+++ b/gnu/usr.bin/groff/src/roff/Makefile.inc
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/roff/Makefile.inc,v 1.1.2.1 2001/04/26 17:08:32 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/roff/Makefile.inc,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/Makefile.inc,v 1.1 2001/04/17 12:37:12 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/roff/Makefile.inc,v 1.3 2005/09/01 20:47:13 asmodai Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/roff/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile
index 9a26c8a036..47112316f4 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.1.2.2 2002/07/19 08:34:10 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.7 2003/05/01 13:22:20 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 PROG_CXX=	groff
-SRCS=		groff.cc pipeline.c
+SRCS=		groff.cpp pipeline.c
 DPADD=		${LIBGROFF} ${LIBM}
 LDADD=		${LIBGROFF} -lm
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/roff/grog/Makefile b/gnu/usr.bin/groff/src/roff/grog/Makefile
index 5ca3b90281..b4e04ede37 100644
--- a/gnu/usr.bin/groff/src/roff/grog/Makefile
+++ b/gnu/usr.bin/groff/src/roff/grog/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/roff/grog/Makefile,v 1.1.2.1 2001/04/26 17:08:33 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/roff/grog/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/grog/Makefile,v 1.1 2001/04/17 12:37:12 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/roff/grog/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 SCRIPTS=	grog
 MAN=		grog.1
diff --git a/gnu/usr.bin/groff/src/roff/nroff/Makefile b/gnu/usr.bin/groff/src/roff/nroff/Makefile
index 7957ddc3b8..398f85e669 100644
--- a/gnu/usr.bin/groff/src/roff/nroff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/nroff/Makefile
@@ -1,6 +1,10 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/roff/nroff/Makefile,v 1.1.2.1 2001/04/26 17:08:34 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/roff/nroff/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/nroff/Makefile,v 1.1 2001/04/17 12:37:13 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/roff/nroff/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
+PATCHES!=       echo ${.CURDIR}/patches/*.patch
+CONTRIBDIR=     ${DIST_DIR}
+
+SRCS=		${PATCHES}
 SCRIPTS=	nroff
 MAN=		nroff.1
 CLEANFILES=	${SCRIPTS} ${MAN}
diff --git a/gnu/usr.bin/groff/src/roff/nroff/patches/nroff.sh.no_obj.patch b/gnu/usr.bin/groff/src/roff/nroff/patches/nroff.sh.no_obj.patch
new file mode 100644
index 0000000000..ae392e3503
--- /dev/null
+++ b/gnu/usr.bin/groff/src/roff/nroff/patches/nroff.sh.no_obj.patch
@@ -0,0 +1,47 @@
+$DragonFly: src/gnu/usr.bin/groff/src/roff/nroff/patches/nroff.sh.no_obj.patch,v 1.1 2005/09/01 20:47:14 asmodai Exp $
+
+--- nroff.sh	2005-08-31 14:28:07.000000000 +0200
++++ nroff.sh	2005-08-31 15:39:06.000000000 +0200
+@@ -8,18 +8,22 @@
+ case "`exec 2>/dev/null ; locale charmap`" in
+   UTF-8)
+     T=-Tutf8 ;;
+-  ISO-8859-1)
++  ISO*8859-1 | ISO*8859-15)
+     T=-Tlatin1 ;;
+   IBM-1047)
+     T=-Tcp1047 ;;
++  KOI8-R)
++    T=-Tkoi8-r ;;
+   *)
+     case "${LC_ALL-${LC_CTYPE-${LANG}}}" in
+       *.UTF-8)
+         T=-Tutf8 ;;
+-      iso_8859_1 | *.ISO-8859-1)
++      iso_8859_1 | *.ISO*8859-1 | *.ISO*8859-15)
+         T=-Tlatin1 ;;
+       *.IBM-1047)
+         T=-Tcp1047 ;;
++      *.KOI8-R)
++        T=-Tkoi8-r ;;
+       *)
+         case "$LESSCHARSET" in
+           utf-8)
+@@ -28,6 +32,8 @@
+             T=-Tlatin1 ;;
+           cp1047)
+             T=-Tcp1047 ;;
++          koi8-r)
++            T=-Tkoi8-r ;;
+           *)
+             T=-Tascii ;;
+           esac ;;
+@@ -52,7 +58,7 @@
+       exit 1 ;;
+     -[iptSUC] | -[dmrno]*)
+       opts="$opts $1" ;;
+-    -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047)
++    -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047 | -Tkoi8-r)
+       T=$1 ;;
+     -T*)
+       # ignore other devices
diff --git a/gnu/usr.bin/groff/src/roff/psroff/Makefile b/gnu/usr.bin/groff/src/roff/psroff/Makefile
index 8c0c29e633..dd5719d9b7 100644
--- a/gnu/usr.bin/groff/src/roff/psroff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/psroff/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/roff/psroff/Makefile,v 1.1.2.1 2001/04/26 17:08:36 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/roff/psroff/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/psroff/Makefile,v 1.1 2001/04/17 12:37:13 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/roff/psroff/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 SCRIPTS=	psroff.sh
 MAN=		psroff.1
diff --git a/gnu/usr.bin/groff/src/roff/psroff/psroff.1 b/gnu/usr.bin/groff/src/roff/psroff/psroff.1
index ea008d21be..2ec2e77144 100644
--- a/gnu/usr.bin/groff/src/roff/psroff/psroff.1
+++ b/gnu/usr.bin/groff/src/roff/psroff/psroff.1
@@ -22,8 +22,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/src/roff/psroff/psroff.1,v 1.1.2.1 2001/04/26 17:08:36 ru Exp $
-.\" $DragonFly: src/gnu/usr.bin/groff/src/roff/psroff/psroff.1,v 1.2 2003/06/17 04:25:46 dillon Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/src/roff/psroff/psroff.1,v 1.1 2001/04/10 17:04:31 ru Exp $
+.\" $DragonFly: src/gnu/usr.bin/groff/src/roff/psroff/psroff.1,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 .Dd September 15, 1997
 .Dt PSROFF 1
 .Os
diff --git a/gnu/usr.bin/groff/src/roff/psroff/psroff.sh b/gnu/usr.bin/groff/src/roff/psroff/psroff.sh
index ee378e8b1d..cee4acf602 100644
--- a/gnu/usr.bin/groff/src/roff/psroff/psroff.sh
+++ b/gnu/usr.bin/groff/src/roff/psroff/psroff.sh
@@ -1,6 +1,6 @@
 #! /bin/sh -
 #
-# $FreeBSD: src/gnu/usr.bin/groff/src/roff/psroff/psroff.sh,v 1.1.10.1 2001/04/26 17:08:36 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/roff/psroff/psroff.sh,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/psroff/psroff.sh,v 1.2 2001/07/10 17:23:07 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/roff/psroff/psroff.sh,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 exec groff -Tps -l -C ${1+"$@"}
diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile
index 72461ce6fe..c4d3098caa 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile
@@ -1,16 +1,16 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.1.2.2 2002/07/19 08:34:11 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 PROG_CXX=	troff
-SRCS=		env.cc node.cc input.cc div.cc symbol.cc dictionary.cc reg.cc \
-		number.cc majorminor.cc
+SRCS=		column.cpp dictionary.cpp div.cpp env.cpp input.cpp node.cpp \
+		number.cpp reg.cpp majorminor.cpp
 DPADD=		${LIBGROFF} ${LIBM}
 LDADD=		${LIBGROFF} -lm
-CLEANFILES=	majorminor.cc ${MAN}
+CLEANFILES=	majorminor.cpp ${MAN}
 
 .include <bsd.prog.mk>
 
-majorminor.cc: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION
+majorminor.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION
 	@${ECHO} Making $@
 	@-rm -f $@
 	@echo const char \*major_version = \
diff --git a/gnu/usr.bin/groff/src/utils/Makefile b/gnu/usr.bin/groff/src/utils/Makefile
index 613f1e88df..8e98355d89 100644
--- a/gnu/usr.bin/groff/src/utils/Makefile
+++ b/gnu/usr.bin/groff/src/utils/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/utils/Makefile,v 1.1.2.1 2001/04/26 17:08:37 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/utils/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/Makefile,v 1.1 2001/04/17 12:37:15 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/utils/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 SUBDIR=		addftinfo afmtodit hpftodit indxbib lkbib lookbib pfbtops tfmtodit
 
diff --git a/gnu/usr.bin/groff/src/utils/Makefile.inc b/gnu/usr.bin/groff/src/utils/Makefile.inc
index 1a8be9b3f3..da0fe4928d 100644
--- a/gnu/usr.bin/groff/src/utils/Makefile.inc
+++ b/gnu/usr.bin/groff/src/utils/Makefile.inc
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/utils/Makefile.inc,v 1.1.2.1 2001/04/26 17:08:37 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/utils/Makefile.inc,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/Makefile.inc,v 1.1 2001/04/17 12:37:15 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/utils/Makefile.inc,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/utils/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
index 00b9d77876..d2cccd4132 100644
--- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
+++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile,v 1.1.2.2 2002/07/19 08:34:11 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 PROG_CXX=	addftinfo
-SRCS=		addftinfo.cc guess.cc
+SRCS=		addftinfo.cpp guess.cpp
 DPADD=		${LIBGROFF}
 LDADD=		${LIBGROFF}
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/utils/afmtodit/Makefile b/gnu/usr.bin/groff/src/utils/afmtodit/Makefile
index 1a63daab51..ece63f71fd 100644
--- a/gnu/usr.bin/groff/src/utils/afmtodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/afmtodit/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/utils/afmtodit/Makefile,v 1.1.2.1 2001/04/26 17:08:38 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/utils/afmtodit/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/afmtodit/Makefile,v 1.1 2001/04/17 12:37:15 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/utils/afmtodit/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 SCRIPTS=	afmtodit
 MAN=		afmtodit.1
diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
index 3bb1f7936c..ccf0b2ce64 100644
--- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile,v 1.1.2.2 2002/07/19 08:34:11 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 PROG_CXX=	hpftodit
-SRCS=		hpftodit.cc
+SRCS=		hpftodit.cpp hpuni.cpp
 DPADD=		${LIBGROFF} ${LIBM}
 LDADD=		${LIBGROFF} -lm
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
index e068ad4392..968db8ed24 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.1.2.5 2002/08/07 16:31:44 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.7 2003/05/01 13:22:21 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 PROG_CXX=	indxbib
-SRCS=		indxbib.cc signal.c
+SRCS=		indxbib.cpp signal.c
 DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBBIB} ${LIBGROFF} -lm
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
index 05ded1391a..7752abc45b 100644
--- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/utils/lkbib/Makefile,v 1.1.2.2 2002/07/19 08:34:12 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/utils/lkbib/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/lkbib/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/utils/lkbib/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 PROG_CXX=	lkbib
-SRCS=		lkbib.cc
+SRCS=		lkbib.cpp
 DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBBIB} ${LIBGROFF} -lm
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
index b7bbf53b16..899ccad182 100644
--- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/utils/lookbib/Makefile,v 1.1.2.2 2002/07/19 08:34:12 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/utils/lookbib/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/lookbib/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/utils/lookbib/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 PROG_CXX=	lookbib
-SRCS=		lookbib.cc
+SRCS=		lookbib.cpp
 DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBBIB} ${LIBGROFF} -lm
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
index 5bc6e0ca0c..7711762ca7 100644
--- a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
+++ b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile,v 1.1.2.1 2001/04/26 17:08:40 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile,v 1.1 2001/04/17 12:37:17 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 PROG=		pfbtops
 DPADD=		${LIBGROFF}
diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
index da99db7d39..5769cedcea 100644
--- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile,v 1.1.2.2 2002/07/19 08:34:13 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 
 PROG_CXX=	tfmtodit
-SRCS=		tfmtodit.cc
+SRCS=		tfmtodit.cpp
 DPADD=		${LIBGROFF} ${LIBM}
 LDADD=		${LIBGROFF} -lm
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 3a034d6cbb..f6dc837a59 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -1,5 +1,7 @@
-# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.21.2.8 2003/02/14 15:22:14 ru Exp $
-# $DragonFly: src/gnu/usr.bin/groff/tmac/Makefile,v 1.2 2003/06/17 04:25:46 dillon Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.42 2003/09/08 17:46:33 ru Exp $
+# $DragonFly: src/gnu/usr.bin/groff/tmac/Makefile,v 1.3 2005/09/01 20:47:14 asmodai Exp $
+
+.include "../Makefile.inc"
 
 TMACOWN?=	${BINOWN}
 TMACGRP?=	${BINGRP}
@@ -14,33 +16,40 @@ MLINKS+=	groff_man.7 man.7
 MLINKS+=	groff_me.7 me.7
 MLINKS+=	groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7
 
-CLEANFILES=	${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/}
+PATCHES!=       echo ${.CURDIR}/patches/*.patch
+CONTRIBDIR=     ${DIST_DIR}
+
+SRCS=		${PATCHES}
+CLEANFILES=	${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} ${NORMALFILES:S/$/-s/}
 
 NORMALFILES=	mandoc.tmac andoc.tmac an-old.tmac \
 		me.tmac \
 		mdoc.tmac \
 		pic.tmac \
 		a4.tmac \
+		papersize.tmac \
 		ec.tmac \
 		safer.tmac \
 		trace.tmac \
 		ps.tmac psold.tmac pspic.tmac psatk.tmac \
 		dvi.tmac \
 		tty.tmac tty-char.tmac \
-		latin1.tmac cp1047.tmac \
+		latin1.tmac latin2.tmac latin5.tmac latin9.tmac cp1047.tmac \
 		X.tmac Xps.tmac \
 		lj4.tmac \
 		lbp.tmac \
-		html.tmac www.tmac \
+		html.tmac html-end.tmac \
+		europs.tmac \
+		composite.tmac \
 		eqnrc \
 		troffrc troffrc-end \
-		hyphen.us
-SPECIALFILES=	an.tmac man.tmac s.tmac ms.tmac
+		hyphen.us hyphenex.us
+SPECIALFILES=	an.tmac man.tmac s.tmac ms.tmac www.tmac
 STRIPFILES=	e.tmac doc.tmac mdoc.local
 MDOCFILES=	doc-common doc-ditroff doc-nroff doc-syms \
-		ru.KOI8-R
+		fr.ISO8859-1 ru.KOI8-R
 
-all: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/}
+all: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} ${NORMALFILES:S/$/-s/}
 
 .for f in ${MDOCFILES} ${STRIPFILES}
 $f-s: $f
@@ -51,18 +60,21 @@ $f-s: $f
 $f-s: $f
 	sed -e "s;@TMAC_AN_PREFIX@;${tmac_an_prefix};g" \
 	    -e "s;@TMAC_S_PREFIX@;${tmac_s_prefix};g" \
+	    -e "s;@PNMTOPS_NOSETPAGE@;pnmtops;g" \
 		${.ALLSRC} > ${.TARGET}
 .endfor
 
+.for f in ${NORMALFILES}
+$f-s: $f
+	cp ${.ALLSRC} ${.TARGET}
+.endfor
+
 beforeinstall:
-	cd ${DIST_DIR}; \
-	    ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-	    ${NORMALFILES} ${DESTDIR}${TMACDIR}
 	cd ${.CURDIR}; \
 	    ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-	    hyphen.ru ${DESTDIR}${TMACDIR}
+	    koi8-r.tmac hyphen.ru ${DESTDIR}${TMACDIR}
 	cd ${.OBJDIR}
-.for f in ${STRIPFILES} ${SPECIALFILES}
+.for f in ${STRIPFILES} ${SPECIALFILES} ${NORMALFILES}
 	${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 	    $f-s ${DESTDIR}${TMACDIR}/$f
 .endfor
diff --git a/gnu/usr.bin/groff/tmac/patches/eqnrc.no_obj.patch b/gnu/usr.bin/groff/tmac/patches/eqnrc.no_obj.patch
new file mode 100644
index 0000000000..cfd714c9e4
--- /dev/null
+++ b/gnu/usr.bin/groff/tmac/patches/eqnrc.no_obj.patch
@@ -0,0 +1,12 @@
+$DragonFly: src/gnu/usr.bin/groff/tmac/patches/eqnrc.no_obj.patch,v 1.1 2005/09/01 20:47:14 asmodai Exp $
+
+--- eqnrc	2005-08-31 14:28:07.000000000 +0200
++++ eqnrc	2005-08-31 15:42:52.000000000 +0200
+@@ -53,6 +53,7 @@
+ ifdef latin1 ! define n %1% !
+ ifdef utf8 ! define n %1% !
+ ifdef cp1047 ! define n %1% !
++ifdef koi8-r ! define n %1% !
+ ifdef n !
+ set nroff 1
+ !
diff --git a/gnu/usr.bin/groff/tmac/patches/troffrc.no_obj.patch b/gnu/usr.bin/groff/tmac/patches/troffrc.no_obj.patch
new file mode 100644
index 0000000000..a5940cbf96
--- /dev/null
+++ b/gnu/usr.bin/groff/tmac/patches/troffrc.no_obj.patch
@@ -0,0 +1,43 @@
+$DragonFly: src/gnu/usr.bin/groff/tmac/patches/troffrc.no_obj.patch,v 1.1 2005/09/01 20:47:14 asmodai Exp $
+
+--- troffrc	2005-08-31 14:28:07.000000000 +0200
++++ troffrc	2005-08-31 15:56:52.000000000 +0200
+@@ -19,6 +19,7 @@
+ .do ds troffrc!latin1 tty.tmac
+ .do ds troffrc!utf8 tty.tmac
+ .do ds troffrc!cp1047 tty.tmac
++.do ds troffrc!koi8-r tty.tmac
+ .do ds troffrc!lj4 lj4.tmac
+ .do ds troffrc!lbp lbp.tmac
+ .do ds troffrc!html html.tmac
+@@ -29,7 +30,10 @@
+ .
+ .\" test whether we work under EBCDIC
+ .do ie '\[char97]'a' \
+-.	do tr \[char160]\~
++.      ie '\*[.T]'koi8-r' \
++.              do tr \[char154]\~
++.      el \
++.              do tr \[char160]\~
+ .el \
+ .	do tr \[char65]\~
+ .
+@@ -39,8 +43,18 @@
+ .\" Load hyphenation patterns and exceptions.
+ .do hpf hyphen.us
+ .do hpfa hyphenex.us
++.if '\*[.T]'koi8-r' \
++.      do hpfa hyphen.ru
+ .
+ .\" Handle paper formats
+ .do mso papersize.tmac
+ .
++.\" Disable SGR support in grotty(1).
++.if n \{\
++.  do nop \X'tty: sgr 0'
++.  sp -1
++.  nr nl 0-1
++.  nr % -1
++.\}
++.
+ .\" Don't let blank lines creep in here.
diff --git a/gnu/usr.bin/groff/tmac/patches/tty-char.tmac.no_obj.patch b/gnu/usr.bin/groff/tmac/patches/tty-char.tmac.no_obj.patch
new file mode 100644
index 0000000000..b79d4e1fc6
--- /dev/null
+++ b/gnu/usr.bin/groff/tmac/patches/tty-char.tmac.no_obj.patch
@@ -0,0 +1,12 @@
+$DragonFly: src/gnu/usr.bin/groff/tmac/patches/tty-char.tmac.no_obj.patch,v 1.1 2005/09/01 20:47:14 asmodai Exp $
+
+--- tty-char.tmac	2005-08-31 14:28:07.000000000 +0200
++++ tty-char.tmac	2005-08-31 15:49:48.000000000 +0200
+@@ -233,5 +233,7 @@
+ .
+ .ie '\*(.T'cp1047' \
+ .	do mso cp1047.tmac
++.el .ie '\*(.T'koi8-r' \
++.      do mso koi8-r.tmac
+ .el \
+ .	do mso latin1.tmac
diff --git a/gnu/usr.bin/groff/tmac/patches/tty.tmac.no_obj.patch b/gnu/usr.bin/groff/tmac/patches/tty.tmac.no_obj.patch
new file mode 100644
index 0000000000..78abda576e
--- /dev/null
+++ b/gnu/usr.bin/groff/tmac/patches/tty.tmac.no_obj.patch
@@ -0,0 +1,14 @@
+$DragonFly: src/gnu/usr.bin/groff/tmac/patches/tty.tmac.no_obj.patch,v 1.1 2005/09/01 20:47:14 asmodai Exp $
+
+--- tty.tmac	2005-08-31 14:28:07.000000000 +0200
++++ tty.tmac	2005-08-31 15:51:25.000000000 +0200
+@@ -80,6 +80,9 @@
+ .ie '\*(.T'cp1047' \
+ .  do mso cp1047.tmac
+ .el \
++.  ie '\*(.T'koi8-r' \
++.    do mso koi8-r.tmac
++.el \
+ .  if !'\*(.T'ascii' \
+ .    do mso latin1.tmac
+ .
diff --git a/gnu/usr.bin/groff/tmac/ru.KOI8-R b/gnu/usr.bin/groff/tmac/ru.KOI8-R
index 6afdce5fe3..388bf28425 100644
--- a/gnu/usr.bin/groff/tmac/ru.KOI8-R
+++ b/gnu/usr.bin/groff/tmac/ru.KOI8-R
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2001 Ruslan Ermilov <ru@FreeBSD.org>.
+.\" Copyright (c) 2001-2003 Ruslan Ermilov <ru@FreeBSD.org>.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -22,8 +22,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/ru.KOI8-R,v 1.9.4.1 2003/02/14 15:22:14 ru Exp $
-.\" $DragonFly: src/gnu/usr.bin/groff/tmac/ru.KOI8-R,v 1.2 2003/06/17 04:25:46 dillon Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/ru.KOI8-R,v 1.14 2003/09/20 21:30:33 ru Exp $
+.\" $DragonFly: src/gnu/usr.bin/groff/tmac/ru.KOI8-R,v 1.3 2005/09/01 20:47:14 asmodai Exp $
 .\"
 .\"     %beginstrip%
 .
@@ -63,6 +63,7 @@
 .\" ÌÏËÁÌÉÚÁÃÉÑ .Sh
 .ds doc-section-name        îáú÷áîéå
 .ds doc-section-synopsis    óéîôáëóéó
+.ds doc-section-library     âéâìéïôåëá
 .ds doc-section-description ïðéóáîéå
 .ds doc-section-see-also    óíïôòé
 .ds doc-section-files       æáêìù
@@ -71,33 +72,35 @@
 .\" ÌÏËÁÌÉÚÁÃÉÑ .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-libc_r      òÅÅÎÔÅÒÁÂÅÌØÎÁÑ ÂÉÂÌÉÏÔÅËÁ\~C (libc_r, \-lc_r)
 .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)
+.\" XXX ds doc-str-Lb-libcurses   Curses Library (libcurses, \-lcurses)
+.\" XXX ds doc-str-Lb-libdevinfo  Device and Resource Information Utility Library (libdevinfo, \-ldevinfo)
 .ds doc-str-Lb-libdevstat  âÉÂÌÉÏÔÅËÁ ÓÔÁÔÉÓÔÉËÉ ÕÓÔÒÏÊÓÔ× (libdevstat, \-ldevstat)
-.ds doc-str-Lb-libdisk     Interface to Slice and Partition Labels Library (libdisk, \-ldisk)
+.\" XXX 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-libgeom     ðÏÌØÚÏ×ÁÔÅÌØÓËÁÑ API ÂÉÂÌÉÏÔÅËÁ ÐÏÄÓÉÓÔÅÍÙ ÑÄÒÁ GEOM (libgeom, \-lgeom)
 .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)
+.\" XXX ds doc-str-Lb-libmd       Message Digest (MD4, MD5, É Ô.Ä.) Support Library (libmd, \-lmd)
+.\" XXX 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-libpam      âÉÂÌÉÏÔÅËÁ PAM (libpam, \-lpam)
 .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)
+.\" XXX 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-libufs      âÉÂÌÉÏÔÅËÁ ÄÏÓÔÕÐÁ Ë ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ UFS (libufs, \-lufs)
+.\" XXX ds doc-str-Lb-libugidfw   File System Firewall Interface Library (libugidfw, \-lugidfw)
 .ds doc-str-Lb-libusbhid   âÉÂÌÉÏÔÅËÁ ÆÕÎËÃÉÊ ÄÏÓÔÕÐÁ Ë USB HID (libusbhid, \-lusbhid)
 .ds doc-str-Lb-libutil     âÉÂÌÉÏÔÅËÁ ÓÉÓÔÅÍÎÙÈ ÕÔÉÌÉÔ (libutil, \-lutil)
 .ds doc-str-Lb-libvgl      âÉÂÌÉÏÔÅËÁ ×ÉÄÅÏ-ÇÒÁÆÉËÉ (libvgl, \-lvgl)