Update to 1.19.1:

Groff
-----

o The argument of the command line option `-I' is now also passed to troff
  and grops, specifying a directory to search for files on the command line,
  files named in `so' and `psbb' requests, and files named in \X'ps: file'
  and \X'ps: import' escapes.

o If option `-V' is used more than once, the commands will be both printed
  on standard error and run.

Troff
-----

o Two new read-only, string-valued registers `.m' and `.M' return the
  name of the current drawing and background color, respectively.

o New read-only register `.U' which is set to 1 if in safer mode and set
  to 0 if in unsafe mode.

o An input encoding file for latin-5 (a.k.a. ISO 8859-9) has been added.
  Example use:

    groff -Tdvi -mlatin5 my_file > my_file.dvi

  Note that some output devices don't support all glyphs of this encoding.

o If the `return' request is called with an argument, it exits twice,
  namely the current macro and the macro one level higher.  This is
  used to define a wrapper macro for `return' in trace.tmac.

o For completeness, two new requests have been added: `dei1' and `ami1'.
  They are equivalent to `dei' and `ami', respectively, but the macros
  are executed with compatibility mode off (similar to `de1' and `am1').

o New command line option `-I' to specify a directory for files (both
  those on the command line and those named in `psbb' requests).  This is
  also handled by the groff wrapper program.

o Since version 1.19 you can say `.vs 0'.  Older versions emit a warning
  and convert this to `.vs \n[.V]'.

  This hasn't been documented properly.  Note that `.vs 0' isn't saved in a
  diversion since it doesn't result in vertical motion.

Pic
___

o Dashed and dotted ellipses have been implemented.

Tbl
---

o New key character `x' to make tbl call a user-defined macro on a table
  cell.  Patch by Heinz-Jürgen Oertel <hj.oertel@surfeu.de>.

Grap2graph
----------

o A new script contributed by Eric S. Raymond <esr@thyrsus.com>.  It
  converts a grap diagram into a cropped image.  Since it uses gs and the
  PNM library, virtually all graphics formats are available for output.
  [Note that the grap program itself isn't part of the groff package;
  see the file MORE.STUFF how to obtain grap.]

Grohtml
-------

o New option `-j' to emit output splitted into multiple files.

Grops
-----

o New command line option `-I' to specify a directory to search for files
  on the command line and files named in \X'ps: import' and \X'ps: file'
  escapes.  This is also handled by the groff wrapper program.

o The default value for the `broken' keyword in the DESC file is now 0.

Grolj4
------

o A new man page `lj4_font(5)' documents how fonts are accessed with
  grolj4.

o The built-in fonts for LJ4 and newer PCL 5 devices have been completely
  revised, mainly to access as much glyphs as possible.  The provided
  metric files should be compatible with recent PCL 5 printers also.
  Additionally, font description files have been added for the Arial and
  Times New Roman family, the MS symbol, and Wingdings fonts.

Afmtodit
--------

o New option `-x' to prevent use of built-in Adobe Glyph List.

Hpftodit
--------

o Completely revised to handle HP TrueType metric files also.  See the
  hpftodit manual page for more details.

Groffer
-------

o This version is a rewrite of groffer in many parts, but it is kept in
  the old single script style.

  New options: --text, --mode text, --tty-viewer, --X, --mode X,
  --X-viewer, --html, --mode html, --html-view, --apropos-data,
  --apropos-devel, --apropos-progs.

  New documentation file: README_SH.

  Enhancement of the configuration files and the `apropos' handling.

Macro Packages
--------------

o www.tmac: New macro `JOBNAME' to split output into multiple files.

o In mdoc, multiple calls to `.Lb' are now supported in the LIBRARY
  section.

9 files changed, 70 insertions, 167 deletions

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 9f8eb47c977..1c19b026bc0 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/04/30 15:11:28 reed Exp $
+# $NetBSD: Makefile,v 1.18 2004/07/11 13:40:05 wiz Exp $
 #
 
-DISTNAME=	groff-1.19
-PKGREVISION=	4
+DISTNAME=	groff-1.19.1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=groff/}
 
diff --git a/textproc/groff/PLIST b/textproc/groff/PLIST
index ce460a96026..91b9e28fbdb 100644
--- a/textproc/groff/PLIST
+++ b/textproc/groff/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2004/03/10 01:54:13 seb Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/07/11 13:40:05 wiz Exp $
 bin/addftinfo
 bin/afmtodit
 bin/eqn
 bin/eqn2graph
+bin/grap2graph
 bin/grn
 bin/grodvi
 bin/groff
@@ -33,6 +34,7 @@ man/man1/addftinfo.1
 man/man1/afmtodit.1
 man/man1/eqn.1
 man/man1/eqn2graph.1
+man/man1/grap2graph.1
 man/man1/grn.1
 man/man1/grodvi.1
 man/man1/groff.1
@@ -61,6 +63,7 @@ man/man1/troff.1
 man/man5/groff_font.5
 man/man5/groff_out.5
 man/man5/groff_tmac.5
+man/man5/lj4_font.5
 man/man7/ditroff.7
 man/man7/groff.7
 man/man7/groff_char.7
@@ -77,6 +80,7 @@ man/man7/groff_www.7
 man/man7/roff.7
 share/doc/groff/${PKGVERSION}/examples/README.mom
 share/doc/groff/${PKGVERSION}/examples/elvis_syntax
+share/doc/groff/${PKGVERSION}/examples/elvis_syntax.new
 share/doc/groff/${PKGVERSION}/examples/grnexmpl.g
 share/doc/groff/${PKGVERSION}/examples/grnexmpl.me
 share/doc/groff/${PKGVERSION}/examples/grnexmpl.ps
@@ -158,6 +162,29 @@ share/doc/groff/${PKGVERSION}/html/momdoc/toc.html
 share/doc/groff/${PKGVERSION}/html/momdoc/typemacdoc.html
 share/doc/groff/${PKGVERSION}/html/momdoc/typesetting.html
 share/doc/groff/${PKGVERSION}/html/momdoc/using.html
+share/doc/groff/${PKGVERSION}/html/pic-1.html
+share/doc/groff/${PKGVERSION}/html/pic-10.html
+share/doc/groff/${PKGVERSION}/html/pic-11.html
+share/doc/groff/${PKGVERSION}/html/pic-12.html
+share/doc/groff/${PKGVERSION}/html/pic-13.html
+share/doc/groff/${PKGVERSION}/html/pic-14.html
+share/doc/groff/${PKGVERSION}/html/pic-15.html
+share/doc/groff/${PKGVERSION}/html/pic-16.html
+share/doc/groff/${PKGVERSION}/html/pic-17.html
+share/doc/groff/${PKGVERSION}/html/pic-18.html
+share/doc/groff/${PKGVERSION}/html/pic-19.html
+share/doc/groff/${PKGVERSION}/html/pic-2.html
+share/doc/groff/${PKGVERSION}/html/pic-20.html
+share/doc/groff/${PKGVERSION}/html/pic-21.html
+share/doc/groff/${PKGVERSION}/html/pic-22.html
+share/doc/groff/${PKGVERSION}/html/pic-23.html
+share/doc/groff/${PKGVERSION}/html/pic-3.html
+share/doc/groff/${PKGVERSION}/html/pic-4.html
+share/doc/groff/${PKGVERSION}/html/pic-5.html
+share/doc/groff/${PKGVERSION}/html/pic-6.html
+share/doc/groff/${PKGVERSION}/html/pic-7.html
+share/doc/groff/${PKGVERSION}/html/pic-8.html
+share/doc/groff/${PKGVERSION}/html/pic-9.html
 share/doc/groff/${PKGVERSION}/html/pic.html
 share/doc/groff/${PKGVERSION}/meintro.me
 share/doc/groff/${PKGVERSION}/meintro.ps
@@ -328,11 +355,15 @@ share/groff/${PKGVERSION}/font/devlbp/TB
 share/groff/${PKGVERSION}/font/devlbp/TBI
 share/groff/${PKGVERSION}/font/devlbp/TI
 share/groff/${PKGVERSION}/font/devlbp/TR
+share/groff/${PKGVERSION}/font/devlj4/AB
+share/groff/${PKGVERSION}/font/devlj4/ABI
+share/groff/${PKGVERSION}/font/devlj4/AI
 share/groff/${PKGVERSION}/font/devlj4/ALBB
 share/groff/${PKGVERSION}/font/devlj4/ALBR
 share/groff/${PKGVERSION}/font/devlj4/AOB
 share/groff/${PKGVERSION}/font/devlj4/AOI
 share/groff/${PKGVERSION}/font/devlj4/AOR
+share/groff/${PKGVERSION}/font/devlj4/AR
 share/groff/${PKGVERSION}/font/devlj4/CB
 share/groff/${PKGVERSION}/font/devlj4/CBI
 share/groff/${PKGVERSION}/font/devlj4/CI
@@ -353,9 +384,14 @@ share/groff/${PKGVERSION}/font/devlj4/OBI
 share/groff/${PKGVERSION}/font/devlj4/OI
 share/groff/${PKGVERSION}/font/devlj4/OR
 share/groff/${PKGVERSION}/font/devlj4/S
+share/groff/${PKGVERSION}/font/devlj4/SYMBOL
 share/groff/${PKGVERSION}/font/devlj4/TB
 share/groff/${PKGVERSION}/font/devlj4/TBI
 share/groff/${PKGVERSION}/font/devlj4/TI
+share/groff/${PKGVERSION}/font/devlj4/TNRB
+share/groff/${PKGVERSION}/font/devlj4/TNRBI
+share/groff/${PKGVERSION}/font/devlj4/TNRI
+share/groff/${PKGVERSION}/font/devlj4/TNRR
 share/groff/${PKGVERSION}/font/devlj4/TR
 share/groff/${PKGVERSION}/font/devlj4/UB
 share/groff/${PKGVERSION}/font/devlj4/UBI
@@ -365,9 +401,13 @@ share/groff/${PKGVERSION}/font/devlj4/UCI
 share/groff/${PKGVERSION}/font/devlj4/UCR
 share/groff/${PKGVERSION}/font/devlj4/UI
 share/groff/${PKGVERSION}/font/devlj4/UR
+share/groff/${PKGVERSION}/font/devlj4/WINGDINGS
 share/groff/${PKGVERSION}/font/devlj4/generate/Makefile
+share/groff/${PKGVERSION}/font/devlj4/generate/special.awk
 share/groff/${PKGVERSION}/font/devlj4/generate/special.map
+share/groff/${PKGVERSION}/font/devlj4/generate/symbol.map
 share/groff/${PKGVERSION}/font/devlj4/generate/text.map
+share/groff/${PKGVERSION}/font/devlj4/generate/wingdings.map
 share/groff/${PKGVERSION}/font/devps/AB
 share/groff/${PKGVERSION}/font/devps/ABI
 share/groff/${PKGVERSION}/font/devps/AI
diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo
index f602beb819d..10c8856b079 100644
--- a/textproc/groff/distinfo
+++ b/textproc/groff/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.6 2004/05/08 03:21:57 jschauma Exp $
+$NetBSD: distinfo,v 1.7 2004/07/11 13:40:05 wiz Exp $
 
-SHA1 (groff-1.19.tar.gz) = b045c1e9f4aafec5e52c32e04eac537952f617ca
-Size (groff-1.19.tar.gz) = 2416140 bytes
-SHA1 (patch-aa) = bd1c45fe22612af86a9da54582afbfdf1d6737a9
-SHA1 (patch-ab) = 96e82cde53a6f945763e88f0b163581a71dc448b
-SHA1 (patch-ac) = 0bf974a050a762172cb3b43edd55159fe22c955d
-SHA1 (patch-ad) = 1ccb3038b60c9f3955c03dcdc5913c1541e41a87
+SHA1 (groff-1.19.1.tar.gz) = 82ba1b29b01c36bf41149ce8813cea712e3e6cbf
+Size (groff-1.19.1.tar.gz) = 2629152 bytes
+SHA1 (patch-aa) = d0d1f387fefbb376eeec8ba824365cab2c1667fd
+SHA1 (patch-ab) = 3c50a8b758cf3ad9d31e449864bf07c09b396b92
+SHA1 (patch-ac) = 38f75d8261ca39aff8a37771a283c99ad39142bd
 SHA1 (patch-ae) = 18d553fe99ca6915d42de5f6edf74fc56e2fc650
-SHA1 (patch-af) = 9b880e36e30c1206ff09f63f227c8621922310f9
diff --git a/textproc/groff/files/mdoc.local b/textproc/groff/files/mdoc.local
index a1c8ab63466..16d972b55ad 100644
--- a/textproc/groff/files/mdoc.local
+++ b/textproc/groff/files/mdoc.local
@@ -1,6 +1,6 @@
 .\" NetBSD: mdoc.local,v 1.3 2003/07/01 09:59:50 wiz Exp
 .\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
+.\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
@@ -38,89 +38,7 @@
 .
 .ds volume-operating-system @@VOLUME_OPERATING_SYSTEM@@
 .
-.\" NetBSD .Lb values
-.\".ds str-Lb-libarm32     ARM32 Architecture Library (libarm32, \-larm32)
-.ds str-Lb-libarm       ARM Architecture Library (libarm, \-larm)
-.\".ds str-Lb-libc         Standard C\~Library (libc, \-lc)
-.ds str-Lb-libcdk       Curses Development Kit Library (libcdk, \-lcdk)
-.\".ds str-Lb-libcompat    Compatibility Library (libcompat, \-lcompat)
-.\".ds str-Lb-libcrypt     Crypt Library (libcrypt, \-lcrypt)
-.\".ds str-Lb-libcurses    Curses Library (libcurses, \-lcurses)
-.\".ds str-Lb-libedit      Command Line Editor Library (libedit, \-ledit)
-.ds str-Lb-libform      Curses Form Library (libform, \-lform)
-.\".ds str-Lb-libi386      i386 Architecture Library (libi386, \-li386)
-.ds str-Lb-libintl      Internationalized Message Handling Library (libintl, \-lintl)
-.\".ds str-Lb-libipsec     IPsec Policy Control Library (libipsec, \-lipsec)
-.\".ds str-Lb-libkvm       Kernel Data Access Library (libkvm, \-lkvm)
-.\".ds str-Lb-libm         Math Library (libm, \-lm)
-.ds str-Lb-libm68k      m68k Architecture Library (libm68k, \-lm68k)
-.ds str-Lb-libmagic     Magic Number Recognition Library (libmagic, \-lmagic)
-.\".ds str-Lb-libmenu      Curses Menu Library (libmenu, \-lmenu)
-.\".ds str-Lb-libossaudio  OSS Audio Emulation Library (libossaudio, \-lossaudio)
-.ds str-Lb-libpcap      Packet Capture Library (libpcap, \-lpcap)
-.ds str-Lb-libpci       PCI Bus Access Library (libpci, \-lpci)
-.ds str-Lb-libpmc       Performance Counters Library (libpmc, \-lpmc)
-.\".ds str-Lb-libposix     POSIX Compatibility Library (libposix, \-lposix)
-.ds str-Lb-libpthread   POSIX Thread Library (libpthread, \-lpthread)
-.\".ds str-Lb-libresolv    DNS Resolver Library (libresolv, \-lresolv)
-.ds str-Lb-librt        POSIX Real-time Library (librt, \-lrt)
-.\".ds str-Lb-libtermcap   Termcap Access Library (libtermcap, \-ltermcap)
-.ds str-Lb-libusbhid    USB Human Interface Devices Library (libusbhid, \-lusbhid)
-.\".ds str-Lb-libutil      System Utilities Library (libutil, \-lutil)
-.ds str-Lb-libx86_64    x86_64 Architecture Library (libx86_64, \-lx86_64)
-.\".ds str-Lb-libz         Compression Library (libz, \-lz)
-.
-.\" architecture names where case diverges from groff
-.ds volume-as-alpha    alpha
-.ds volume-as-amiga    amiga
-.ds volume-as-arc      arc
-.\" next two are dead...
-.\".ds volume-as-arm26    arm26
-.\".ds volume-as-arm32    arm32
-.ds volume-as-atari    atari
-.ds volume-as-bebox    bebox
-.ds volume-as-cobalt   cobalt
-.ds volume-as-evbsh3   evbsh3
-.ds volume-as-hp300    hp300
-.ds volume-as-hpcmips  hpcmips
-.ds volume-as-mips     mips
-.ds volume-as-sparc    sparc
-.ds volume-as-vax      vax
-.\" not in groff
-.ds volume-as-acorn26  acorn26
-.ds volume-as-acorn32  acorn32
-.ds volume-as-algor    algor
-.ds volume-as-amd64    amd64
-.ds volume-as-cats     cats
-.ds volume-as-cesfic   cesfic
-.ds volume-as-dreamcast dreamcast
-.ds volume-as-evbarm   evbarm
-.ds volume-as-evbmips  evbmips
-.ds volume-as-evbppc   evbppc
-.ds volume-as-hp700    hp700
-.ds volume-as-hpcarm   hpcarm
-.ds volume-as-hpcsh    hpcsh
-.ds volume-as-mipsco   mipsco
-.ds volume-as-mvmeppc  mvmeppc
-.ds volume-as-netwinder netwinder
-.ds volume-as-playstation2 playstation2
-.ds volume-as-pmppc    pmppc
-.ds volume-as-sandpoint sandpoint
-.ds volume-as-sbmips   sbmips
-.ds volume-as-shark    shark
-.ds volume-as-sun2     sun2
-.ds volume-as-x86_64   x86_64
-.
-.\" standards names diverging from groff
-.ds doc-str-St--isoC       \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1990
-.as doc-str-St--isoC       " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St]\*[Rq])
-.ds str-St--xcurses4.2     \*[doc-Tn-font-size]X/Open\*[doc-str-St] Curses Issue\~4, Version\~2
-.as str-St--xcurses4.2     " (\*[Lq]\*[doc-Tn-font-size]XCURSES\*[doc-str-St]\^4.2\*[Rq])
-.ds str-St--xpg4.2         \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~4, Version\~2
-.as str-St--xpg4.2         " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^4.2\*[Rq])
-.
 .\" standards names not in groff
-.als str-St--isoC-90 str-St--isoC
 .ds str-St--isoC-amd1       \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/AMD1:1995
 .as str-St--isoC-amd1       " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Amendment 1\*[Rq])
 .ds str-St--isoC-tcor1      \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR1:1994
@@ -131,23 +49,8 @@
 .as str-St--xns5.2d2.0      " (\*[Lq]\*[doc-Tn-font-size]XNS\*[doc-str-St]\^5.2D2.0\*[Rq])
 .ds str-St--ieee1275-94     \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1275-1994
 .as str-St--ieee1275-94     " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq])
-.\" for a short time only -- use -isoC-90 or -isoC
-.als str-St--isoC90 str-St--isoC
-.\" for a short time only -- use -isoC-99
-.als str-St--isoC99 str-St--isoC-99
 .
 .\" Default .Os value
 .ds operating-system @@OPERATING_SYSTEM@@
 .\" Other known versions, not yet in groff distribution
-.ds operating-system-NetBSD-1.4.2  1.4.2
-.ds operating-system-NetBSD-1.4.3  1.4.3
-.ds operating-system-NetBSD-1.5.1  1.5.1
-.ds operating-system-NetBSD-1.5.2  1.5.2
-.ds operating-system-NetBSD-1.5.3  1.5.3
-.ds operating-system-NetBSD-1.6.1  1.6.1
-.ds operating-system-NetBSD-1.6.2  1.6.2
-.ds operating-system-NetBSD-2.0    2.0
-.ds str-At-V.3 \*[Tn-font-size]AT&T\*[str-At] System\~V.3
-.as str-At-V.3 " \*[Tn-font-size]UNIX\*[str-At]
-.\" For easier converting
-.nr hyphen-flags 1
+.ds operating-system-NetBSD-3.0    3.0
diff --git a/textproc/groff/patches/patch-aa b/textproc/groff/patches/patch-aa
index 0179b4e46ec..118e1cbb84a 100644
--- a/textproc/groff/patches/patch-aa
+++ b/textproc/groff/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/01/04 11:20:14 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2004/07/11 13:40:06 wiz Exp $
 
---- Makefile.in.orig	Mon Sep 16 18:51:00 2002
+--- Makefile.in.orig	2004-04-07 17:33:39.000000000 +0200
 +++ Makefile.in
-@@ -169,7 +169,7 @@ tmac_an_prefix=\
+@@ -186,7 +186,7 @@ tmac_an_prefix=\
  indexext=.i
  
  # Directory containing the default index for refer.
diff --git a/textproc/groff/patches/patch-ab b/textproc/groff/patches/patch-ab
index f200ba8d3ad..193fac6c162 100644
--- a/textproc/groff/patches/patch-ab
+++ b/textproc/groff/patches/patch-ab
@@ -1,16 +1,14 @@
-$NetBSD: patch-ab,v 1.3 2003/07/01 10:12:55 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2004/07/11 13:40:06 wiz Exp $
 
---- tmac/doc-common.orig	Thu Feb 27 15:51:49 2003
-+++ tmac/doc-common
-@@ -554,7 +554,10 @@
- .    as doc-header-string "\|.\|.\|.
- .  \}
- .  tl \*[doc-caption-font]\*[doc-header-string]\f[]\*[doc-caption-font2]\*[doc-volume]\f[]\*[doc-caption-font]\*[doc-header-string]\f[]
--.  sp \n[doc-header-space]u
-+.  ie !\n[cR] \
-+.    sp \n[doc-header-space]u
-+.  el \
-+.    sp 1v
- .  ev
- .  ns
- ..
+--- arch/misc/Makefile.sub.orig	2004-04-07 19:39:37.000000000 +0200
++++ arch/misc/Makefile.sub
+@@ -21,7 +21,7 @@ CLEANADD=shdeps.sed
+ 
+ all: shdeps.sed
+ 
+-shdeps.sed: shdeps.sh
+-	$(SHELL) $< "$(RT_SEP)" "$(SH_SEP)" "$(bindir)" > $@
++shdeps.sed: $(srcdir)/shdeps.sh
++	$(SHELL) $(srcdir)/shdeps.sh "$(RT_SEP)" "$(SH_SEP)" "$(bindir)" > $@
+ 
+ # eof
diff --git a/textproc/groff/patches/patch-ac b/textproc/groff/patches/patch-ac
index 94368d66047..dbf059b7062 100644
--- a/textproc/groff/patches/patch-ac
+++ b/textproc/groff/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2003/02/25 10:17:12 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2004/07/11 13:40:06 wiz Exp $
 
---- tmac/doc.tmac.orig	Fri Jul  5 16:37:21 2002
+--- tmac/doc.tmac.orig	2003-09-16 08:42:31.000000000 +0200
 +++ tmac/doc.tmac
-@@ -906,8 +906,16 @@
+@@ -952,8 +952,16 @@
  .de Nm
  .  if !\n[doc-arg-limit] \{\
  .    ds doc-macro-name Nm
diff --git a/textproc/groff/patches/patch-ad b/textproc/groff/patches/patch-ad
deleted file mode 100644
index 2c5ce047ab0..00000000000
--- a/textproc/groff/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/07/01 10:12:55 wiz Exp $
-
---- src/roff/nroff/nroff.sh.orig	Tue Jan 28 09:40:44 2003
-+++ src/roff/nroff/nroff.sh
-@@ -5,7 +5,7 @@ prog="$0"
- # Default device.
- # First try the "locale charmap" command, because it's most reliable.
- # On systems where it doesn't exist, look at the environment variables.
--case "`locale charmap 2>/dev/null`" in
-+case "`#locale charmap 2>/dev/null`" in
-   UTF-8)
-     T=-Tutf8 ;;
-   ISO-8859-1)
diff --git a/textproc/groff/patches/patch-af b/textproc/groff/patches/patch-af
deleted file mode 100644
index 94acfca62fd..00000000000
--- a/textproc/groff/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/05/08 03:21:57 jschauma Exp $
-
---- ./src/preproc/html/pre-html.cpp.orig	Fri May  7 17:51:50 2004
-+++ ./src/preproc/html/pre-html.cpp	Fri May  7 17:52:08 2004
-@@ -263,7 +263,7 @@
-     n = vsnprintf (p, size, fmt, ap);
-     va_end(ap);
-     /* If that worked, return the string. */
--    if (n > -1 && n < size) {
-+    if (n > -1 && n < size-1) {
-       if (size > n+1) {
- 	np = strsave(p);
- 	free(p);
-@@ -272,8 +272,6 @@
-       return p;
-     }
-     /* Else try again with more space. */
--    if (n > -1)    /* glibc 2.1 */
--      size = n+1; /* precisely what is needed */
-     else           /* glibc 2.0 */
-       size *= 2;  /* twice the old size */
-     if ((np = (char *)realloc (p, size)) == NULL) {