Update to 1.19.2. SunOS PLIST not updated, someone please merge

it into the normal PLIST.

VERSION 1.19.2
==============

Troff
-----

o Analogously to the .ft and \f pair, two new requests `gcolor' and
  `fcolor' (which pair with \m and \M, respectively) have been added to
  set the glyph and background colours.

o A new read-only, string-valued register `.sty' returns the name of the
  current style.

o Two new conditional operators `F <name>' and `S <name>' have been added.
  `F' is true if a font <name> exists.  `S' is true if a style <name> has
  been registered.

o Cyrillic characters have been added to the `utf8' and `html' output
  devices.

Pic
---

o The `by' argument in a `for' loop can now be negative if it is additive.
  For the multiplicative case, it must be greater than zero.

Eqn
---

o The following keywords aren't new but haven't been documented previously:

    undef NAME    (to undefine a macro)
    copy  "FILE"  (a synonym for `include')
    space n       (to modify the vertical spacing before and after
                   an equation)

o The following macros aren't new but haven't been documented previously:

    Alpha, ..., Omega   (the same as `ALPHA', ..., `OMEGA')
    ldots               (three dots on the base line)
    dollar              (a dollar glyph)

o The following keywords have been extended.  Again, this isn't new but
  hasn't been documented previously:

    col n { ... }
    lcol n { ... }
    rcol n { ... }
    ccol n { ... }
    pile n { ... }
    lpile n { ... }
    rpile n { ... }
    cpile n { ... }   (set vertical spacing between rows to N)

Grohtml
-------

o This device driver has been raised to beta stage; its set of tags should
  be stable now.

o New command line option `-s' to set the base point size.

o New command line option `-S' to set the split level while generating
  multiple files.

Grotty
------

o Experimental support for zero-width and double-width characters.

Gxditview
---------

o On platforms which have the X Window System this program is now built and
  installed automatically.

Xtotroff
--------

o This program to create font definition files for xditview isn't new but
  hasn't been installed previously.

Groffer
-------

o A security problem (reported as CAN-2004-0969) has been fixed.

Gdiffmk
-------

o A new script contributed by Mike Bianchi.  It compares two groff, nroff,
  or troff documents and creates an output with added margin characters
  (using `.mc') to indicate the differences.

Pdfroff
-------

o A new wrapper script contributed by Keith Marshall to easily create PDF
  documents with groff.

Macro packages
--------------

o ms.tmac

  . Support for fractional point sizes: A value for the `PS', `VS', `FPS',
    and `VPS' register larger than or equal to 1000 is always divided by
    1000.  For example, `.nr PS 10250' sets the document's font size to
    10.25 points.

  . The `Ds' and `De' macros provided in ms since groff version 1.19 have
    been removed; the equivalent `DS' and `DE' macros should be used
    instead.  X11 documents which actually use `Ds' and `De' always load a
    specific macro file from the X11 distribution (`macros.t') which
    provides proper definitions for the two macros.

  . The following registers have been added for improving layout control:

    PORPHANS
      Defines number of lines following `LP', `PP', `QP', `IP' or `XP' which
      must be kept together, before any automatic page break.

    HORPHANS
      Sets number of lines of following paragraph which must be kept with a
      heading, defined by `NH' or `SH', before any automatic page break.

    GROWPS
      Sets the first level of heading (set with `NH') which will keep the
      same point size as body text.

    PSINCR
      Sets the point size increment for each level of heading (set with
      `NH'), below the threshold level set by `GROWPS'; e.g., if
      \n[PS] = 10, \n[GROWPS] = 3 and \n[PSINCR] = 2.0p, then `.NH 1' will
      produce 14pt headings, `.NH 2' will produce 12pt, and all other levels
      will remain at 10pt (because \n[PS] = 10).

  . The `SH' macro now accepts a numeric argument, to make heading size
    match that of `NH' with same argument value when the `GROWPS'/`PSINCR'
    feature is enabled.

  Please refer to the documentation of the ms package for other, minor
  improvements.

o me.tmac

  The section type set with the `++' request is available in the `_M'
  register.  This isn't new but hasn't been documented before.

o www.tmac

  The `HR' macro no longer causes an empty line for non-HTML devices.

  A new macro `HEAD' has been added to directly add data to the
  <head>...</head> block.

  New macros `OLS' and `OLE' to start and end an ordered list.

  New macros `DLS' and `DLE' to start and end a definition list.

Pdfmark
-------

o A new macro package contributed by Keith Marshall which implements PDF
  marks.  This is in alpha stage currently.

Miscellaneous
-------------

o Two new keywords to the DESC file have been added which are needed for
  grohtml: `image_generator' and `unscaled_charwidths'.  The former gives
  the name of the program which creates PNG images, and the latter makes
  troff always use unscaled character widths.

10 files changed, 61 insertions, 951 deletions

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 143de948036..f5dac5cd691 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2005/12/05 20:51:03 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/07 17:51:51 wiz Exp $
 #
 
-DISTNAME=	groff-1.19.1
-PKGREVISION=	3
+DISTNAME=	groff-1.19.2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=groff/}
 
diff --git a/textproc/groff/PLIST b/textproc/groff/PLIST
index 91b9e28fbdb..4cca419b1e3 100644
--- a/textproc/groff/PLIST
+++ b/textproc/groff/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2004/07/11 13:40:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/12/07 17:51:51 wiz Exp $
 bin/addftinfo
 bin/afmtodit
 bin/eqn
 bin/eqn2graph
+bin/gdiffmk
 bin/grap2graph
 bin/grn
 bin/grodvi
@@ -20,6 +21,7 @@ bin/lookbib
 bin/mmroff
 bin/neqn
 bin/nroff
+bin/pdfroff
 bin/pfbtops
 bin/pic
 bin/pic2graph
@@ -30,10 +32,12 @@ bin/soelim
 bin/tbl
 bin/tfmtodit
 bin/troff
+lib/groff/groffer/groffer2.sh
 man/man1/addftinfo.1
 man/man1/afmtodit.1
 man/man1/eqn.1
 man/man1/eqn2graph.1
+man/man1/gdiffmk.1
 man/man1/grap2graph.1
 man/man1/grn.1
 man/man1/grodvi.1
@@ -52,6 +56,7 @@ man/man1/lookbib.1
 man/man1/mmroff.1
 man/man1/neqn.1
 man/man1/nroff.1
+man/man1/pdfroff.1
 man/man1/pfbtops.1
 man/man1/pic.1
 man/man1/pic2graph.1
@@ -78,23 +83,22 @@ man/man7/groff_ms.7
 man/man7/groff_trace.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
+share/doc/groff/${PKGVERSION}/examples/groff.css
 share/doc/groff/${PKGVERSION}/examples/img/webpage1.png
 share/doc/groff/${PKGVERSION}/examples/img/webpage2.png
-share/doc/groff/${PKGVERSION}/examples/letter.mom
-share/doc/groff/${PKGVERSION}/examples/letter.ps
-share/doc/groff/${PKGVERSION}/examples/macros.mom
-share/doc/groff/${PKGVERSION}/examples/macros.ps
-share/doc/groff/${PKGVERSION}/examples/penguin.ps
-share/doc/groff/${PKGVERSION}/examples/typeset.mom
-share/doc/groff/${PKGVERSION}/examples/typeset.ps
-share/doc/groff/${PKGVERSION}/examples/typewrite.mom
-share/doc/groff/${PKGVERSION}/examples/typewrite.ps
+share/doc/groff/${PKGVERSION}/examples/mom/README.txt
+share/doc/groff/${PKGVERSION}/examples/mom/elvis_syntax
+share/doc/groff/${PKGVERSION}/examples/mom/elvis_syntax.new
+share/doc/groff/${PKGVERSION}/examples/mom/letter.mom
+share/doc/groff/${PKGVERSION}/examples/mom/letter.ps
+share/doc/groff/${PKGVERSION}/examples/mom/penguin.ps
+share/doc/groff/${PKGVERSION}/examples/mom/sample_docs.mom
+share/doc/groff/${PKGVERSION}/examples/mom/sample_docs.ps
+share/doc/groff/${PKGVERSION}/examples/mom/typesetting.mom
+share/doc/groff/${PKGVERSION}/examples/mom/typesetting.ps
 share/doc/groff/${PKGVERSION}/examples/webpage.html
 share/doc/groff/${PKGVERSION}/examples/webpage.ms
 share/doc/groff/${PKGVERSION}/examples/webpage.ps
@@ -146,22 +150,25 @@ share/doc/groff/${PKGVERSION}/html/img/pic6.png
 share/doc/groff/${PKGVERSION}/html/img/pic7.png
 share/doc/groff/${PKGVERSION}/html/img/pic8.png
 share/doc/groff/${PKGVERSION}/html/img/pic9.png
-share/doc/groff/${PKGVERSION}/html/momdoc/appendices.html
-share/doc/groff/${PKGVERSION}/html/momdoc/cover.html
-share/doc/groff/${PKGVERSION}/html/momdoc/definitions.html
-share/doc/groff/${PKGVERSION}/html/momdoc/docelement.html
-share/doc/groff/${PKGVERSION}/html/momdoc/docprocessing.html
-share/doc/groff/${PKGVERSION}/html/momdoc/goodies.html
-share/doc/groff/${PKGVERSION}/html/momdoc/headfootpage.html
-share/doc/groff/${PKGVERSION}/html/momdoc/inlines.html
-share/doc/groff/${PKGVERSION}/html/momdoc/intro.html
-share/doc/groff/${PKGVERSION}/html/momdoc/letters.html
-share/doc/groff/${PKGVERSION}/html/momdoc/rectoverso.html
-share/doc/groff/${PKGVERSION}/html/momdoc/reserved.html
-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/mom/appendices.html
+share/doc/groff/${PKGVERSION}/html/mom/color.html
+share/doc/groff/${PKGVERSION}/html/mom/cover.html
+share/doc/groff/${PKGVERSION}/html/mom/definitions.html
+share/doc/groff/${PKGVERSION}/html/mom/docelement.html
+share/doc/groff/${PKGVERSION}/html/mom/docprocessing.html
+share/doc/groff/${PKGVERSION}/html/mom/goodies.html
+share/doc/groff/${PKGVERSION}/html/mom/headfootpage.html
+share/doc/groff/${PKGVERSION}/html/mom/inlines.html
+share/doc/groff/${PKGVERSION}/html/mom/intro.html
+share/doc/groff/${PKGVERSION}/html/mom/letters.html
+share/doc/groff/${PKGVERSION}/html/mom/macrolist.html
+share/doc/groff/${PKGVERSION}/html/mom/rectoverso.html
+share/doc/groff/${PKGVERSION}/html/mom/refer.html
+share/doc/groff/${PKGVERSION}/html/mom/reserved.html
+share/doc/groff/${PKGVERSION}/html/mom/toc.html
+share/doc/groff/${PKGVERSION}/html/mom/typemacdoc.html
+share/doc/groff/${PKGVERSION}/html/mom/typesetting.html
+share/doc/groff/${PKGVERSION}/html/mom/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
@@ -190,81 +197,10 @@ share/doc/groff/${PKGVERSION}/meintro.me
 share/doc/groff/${PKGVERSION}/meintro.ps
 share/doc/groff/${PKGVERSION}/meref.me
 share/doc/groff/${PKGVERSION}/meref.ps
+share/doc/groff/${PKGVERSION}/pdf/pdfmark.pdf
 share/doc/groff/${PKGVERSION}/pic.ms
 share/doc/groff/${PKGVERSION}/pic.ps
 share/groff/${PKGVERSION}/eign
-share/groff/${PKGVERSION}/font/devX100-12/CB
-share/groff/${PKGVERSION}/font/devX100-12/CBI
-share/groff/${PKGVERSION}/font/devX100-12/CI
-share/groff/${PKGVERSION}/font/devX100-12/CR
-share/groff/${PKGVERSION}/font/devX100-12/DESC
-share/groff/${PKGVERSION}/font/devX100-12/HB
-share/groff/${PKGVERSION}/font/devX100-12/HBI
-share/groff/${PKGVERSION}/font/devX100-12/HI
-share/groff/${PKGVERSION}/font/devX100-12/HR
-share/groff/${PKGVERSION}/font/devX100-12/NB
-share/groff/${PKGVERSION}/font/devX100-12/NBI
-share/groff/${PKGVERSION}/font/devX100-12/NI
-share/groff/${PKGVERSION}/font/devX100-12/NR
-share/groff/${PKGVERSION}/font/devX100-12/S
-share/groff/${PKGVERSION}/font/devX100-12/TB
-share/groff/${PKGVERSION}/font/devX100-12/TBI
-share/groff/${PKGVERSION}/font/devX100-12/TI
-share/groff/${PKGVERSION}/font/devX100-12/TR
-share/groff/${PKGVERSION}/font/devX100/CB
-share/groff/${PKGVERSION}/font/devX100/CBI
-share/groff/${PKGVERSION}/font/devX100/CI
-share/groff/${PKGVERSION}/font/devX100/CR
-share/groff/${PKGVERSION}/font/devX100/DESC
-share/groff/${PKGVERSION}/font/devX100/HB
-share/groff/${PKGVERSION}/font/devX100/HBI
-share/groff/${PKGVERSION}/font/devX100/HI
-share/groff/${PKGVERSION}/font/devX100/HR
-share/groff/${PKGVERSION}/font/devX100/NB
-share/groff/${PKGVERSION}/font/devX100/NBI
-share/groff/${PKGVERSION}/font/devX100/NI
-share/groff/${PKGVERSION}/font/devX100/NR
-share/groff/${PKGVERSION}/font/devX100/S
-share/groff/${PKGVERSION}/font/devX100/TB
-share/groff/${PKGVERSION}/font/devX100/TBI
-share/groff/${PKGVERSION}/font/devX100/TI
-share/groff/${PKGVERSION}/font/devX100/TR
-share/groff/${PKGVERSION}/font/devX75-12/CB
-share/groff/${PKGVERSION}/font/devX75-12/CBI
-share/groff/${PKGVERSION}/font/devX75-12/CI
-share/groff/${PKGVERSION}/font/devX75-12/CR
-share/groff/${PKGVERSION}/font/devX75-12/DESC
-share/groff/${PKGVERSION}/font/devX75-12/HB
-share/groff/${PKGVERSION}/font/devX75-12/HBI
-share/groff/${PKGVERSION}/font/devX75-12/HI
-share/groff/${PKGVERSION}/font/devX75-12/HR
-share/groff/${PKGVERSION}/font/devX75-12/NB
-share/groff/${PKGVERSION}/font/devX75-12/NBI
-share/groff/${PKGVERSION}/font/devX75-12/NI
-share/groff/${PKGVERSION}/font/devX75-12/NR
-share/groff/${PKGVERSION}/font/devX75-12/S
-share/groff/${PKGVERSION}/font/devX75-12/TB
-share/groff/${PKGVERSION}/font/devX75-12/TBI
-share/groff/${PKGVERSION}/font/devX75-12/TI
-share/groff/${PKGVERSION}/font/devX75-12/TR
-share/groff/${PKGVERSION}/font/devX75/CB
-share/groff/${PKGVERSION}/font/devX75/CBI
-share/groff/${PKGVERSION}/font/devX75/CI
-share/groff/${PKGVERSION}/font/devX75/CR
-share/groff/${PKGVERSION}/font/devX75/DESC
-share/groff/${PKGVERSION}/font/devX75/HB
-share/groff/${PKGVERSION}/font/devX75/HBI
-share/groff/${PKGVERSION}/font/devX75/HI
-share/groff/${PKGVERSION}/font/devX75/HR
-share/groff/${PKGVERSION}/font/devX75/NB
-share/groff/${PKGVERSION}/font/devX75/NBI
-share/groff/${PKGVERSION}/font/devX75/NI
-share/groff/${PKGVERSION}/font/devX75/NR
-share/groff/${PKGVERSION}/font/devX75/S
-share/groff/${PKGVERSION}/font/devX75/TB
-share/groff/${PKGVERSION}/font/devX75/TBI
-share/groff/${PKGVERSION}/font/devX75/TI
-share/groff/${PKGVERSION}/font/devX75/TR
 share/groff/${PKGVERSION}/font/devascii/B
 share/groff/${PKGVERSION}/font/devascii/BI
 share/groff/${PKGVERSION}/font/devascii/DESC
@@ -475,6 +411,7 @@ share/groff/${PKGVERSION}/tmac/an.tmac
 share/groff/${PKGVERSION}/tmac/andoc.tmac
 share/groff/${PKGVERSION}/tmac/composite.tmac
 share/groff/${PKGVERSION}/tmac/cp1047.tmac
+share/groff/${PKGVERSION}/tmac/devtag.tmac
 share/groff/${PKGVERSION}/tmac/doc-old.tmac
 share/groff/${PKGVERSION}/tmac/doc.tmac
 share/groff/${PKGVERSION}/tmac/dvi.tmac
@@ -514,6 +451,7 @@ share/groff/${PKGVERSION}/tmac/ms.tmac
 share/groff/${PKGVERSION}/tmac/mse.tmac
 share/groff/${PKGVERSION}/tmac/om.tmac
 share/groff/${PKGVERSION}/tmac/papersize.tmac
+share/groff/${PKGVERSION}/tmac/pdfmark.tmac
 share/groff/${PKGVERSION}/tmac/pic.tmac
 share/groff/${PKGVERSION}/tmac/ps.tmac
 share/groff/${PKGVERSION}/tmac/psatk.tmac
@@ -521,15 +459,19 @@ share/groff/${PKGVERSION}/tmac/psold.tmac
 share/groff/${PKGVERSION}/tmac/pspic.tmac
 share/groff/${PKGVERSION}/tmac/s.tmac
 share/groff/${PKGVERSION}/tmac/safer.tmac
+share/groff/${PKGVERSION}/tmac/spdf.tmac
 share/groff/${PKGVERSION}/tmac/trace.tmac
 share/groff/${PKGVERSION}/tmac/troffrc
 share/groff/${PKGVERSION}/tmac/troffrc-end
 share/groff/${PKGVERSION}/tmac/tty-char.tmac
 share/groff/${PKGVERSION}/tmac/tty.tmac
+share/groff/${PKGVERSION}/tmac/unicode.tmac
 share/groff/${PKGVERSION}/tmac/www.tmac
 share/groff/site-tmac/man.local
 share/groff/site-tmac/mdoc.local
+@exec ${MKDIR} %D/share/groff/site-font
 @dirrm share/groff/site-tmac
+@dirrm share/groff/site-font
 @dirrm share/groff/${PKGVERSION}/tmac/mm
 @dirrm share/groff/${PKGVERSION}/tmac/mdoc
 @dirrm share/groff/${PKGVERSION}/tmac
@@ -544,20 +486,19 @@ share/groff/site-tmac/mdoc.local
 @dirrm share/groff/${PKGVERSION}/font/devdvi/generate
 @dirrm share/groff/${PKGVERSION}/font/devdvi
 @dirrm share/groff/${PKGVERSION}/font/devascii
-@dirrm share/groff/${PKGVERSION}/font/devX75-12
-@dirrm share/groff/${PKGVERSION}/font/devX75
-@dirrm share/groff/${PKGVERSION}/font/devX100-12
-@dirrm share/groff/${PKGVERSION}/font/devX100
 @dirrm share/groff/${PKGVERSION}/font
 @dirrm share/groff/${PKGVERSION}
 @dirrm share/groff
-@dirrm share/doc/groff/${PKGVERSION}/html/momdoc
+@dirrm share/doc/groff/${PKGVERSION}/pdf
+@dirrm share/doc/groff/${PKGVERSION}/html/mom
 @dirrm share/doc/groff/${PKGVERSION}/html/img
 @dirrm share/doc/groff/${PKGVERSION}/html
+@dirrm share/doc/groff/${PKGVERSION}/examples/mom
 @dirrm share/doc/groff/${PKGVERSION}/examples/img
 @dirrm share/doc/groff/${PKGVERSION}/examples
 @dirrm share/doc/groff/${PKGVERSION}
 @dirrm share/doc/groff
 @exec ${MKDIR} %D/lib/groff/site-tmac
 @dirrm lib/groff/site-tmac
+@dirrm lib/groff/groffer
 @dirrm lib/groff
diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo
index d76b328afea..e94f9a1a749 100644
--- a/textproc/groff/distinfo
+++ b/textproc/groff/distinfo
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.11 2005/03/14 04:36:53 tv Exp $
+$NetBSD: distinfo,v 1.12 2005/12/07 17:51:51 wiz Exp $
 
-SHA1 (groff-1.19.1.tar.gz) = 82ba1b29b01c36bf41149ce8813cea712e3e6cbf
-RMD160 (groff-1.19.1.tar.gz) = 6c0732088cbdce3fde2d31f0cd2b149ee5022210
-Size (groff-1.19.1.tar.gz) = 2629152 bytes
-SHA1 (patch-aa) = d0d1f387fefbb376eeec8ba824365cab2c1667fd
-SHA1 (patch-ab) = 3c50a8b758cf3ad9d31e449864bf07c09b396b92
-SHA1 (patch-ac) = 38f75d8261ca39aff8a37771a283c99ad39142bd
-SHA1 (patch-ad) = 3480c6ebf29aa986cffcf9bba705153e5335224d
+SHA1 (groff-1.19.2.tar.gz) = cfad99a5c52933a6a9180e394bd94fbaec0ac956
+RMD160 (groff-1.19.2.tar.gz) = d5e57fa1d71dbff2c59a40a5a68c7417ffe211c9
+Size (groff-1.19.2.tar.gz) = 2903263 bytes
+SHA1 (patch-aa) = 3c74f1b8e809da5359d4702f0f5f299593601209
+SHA1 (patch-ac) = 7c29e3ca0c0a2e5389ff436ff5c15c9a0a4d7581
 SHA1 (patch-ae) = 18d553fe99ca6915d42de5f6edf74fc56e2fc650
-SHA1 (patch-af) = b7329a5606c5979c3676685b0e3421eb500cf6b8
-SHA1 (patch-ba) = cdafeefbde9490d0ed599a118fd34c06afac0f96
-SHA1 (patch-bb) = ddd9ef807a09eaaf7b09a3c05be3443945c67379
diff --git a/textproc/groff/patches/patch-aa b/textproc/groff/patches/patch-aa
index 118e1cbb84a..7c2b2f7066e 100644
--- a/textproc/groff/patches/patch-aa
+++ b/textproc/groff/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2004/07/11 13:40:06 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2005/12/07 17:51:51 wiz Exp $
 
---- Makefile.in.orig	2004-04-07 17:33:39.000000000 +0200
+--- Makefile.in.orig	2005-08-07 10:03:33.000000000 +0200
 +++ Makefile.in
-@@ -186,7 +186,7 @@ tmac_an_prefix=\
+@@ -214,7 +214,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
deleted file mode 100644
index 193fac6c162..00000000000
--- a/textproc/groff/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2004/07/11 13:40:06 wiz Exp $
-
---- 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 dbf059b7062..c935eb4fa4f 100644
--- a/textproc/groff/patches/patch-ac
+++ b/textproc/groff/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2004/07/11 13:40:06 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2005/12/07 17:51:51 wiz Exp $
 
---- tmac/doc.tmac.orig	2003-09-16 08:42:31.000000000 +0200
+--- tmac/doc.tmac.orig	2005-02-04 01:06:10.000000000 +0100
 +++ tmac/doc.tmac
-@@ -952,8 +952,16 @@
+@@ -950,8 +950,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 ff30832dce3..00000000000
--- a/textproc/groff/patches/patch-ad
+++ /dev/null
@@ -1,723 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/12/17 18:53:55 wiz Exp $
-
---- contrib/groffer/groffer.sh.orig	2004-05-04 07:03:01.000000000 +0200
-+++ contrib/groffer/groffer.sh
-@@ -25,18 +25,21 @@
- # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
- _PROGRAM_NAME='groffer';
--_PROGRAM_VERSION='0.9.7';
--_LAST_UPDATE='30 Apr 2004';
-+_PROGRAM_VERSION='0.9.12';
-+_LAST_UPDATE='15 November 2004';
- 
- 
- ########################################################################
--# Determine the shell under which to run this script;
--# if `ash' is available restart the script using `ash';
--# otherwise just go on.
-+# Determine the shell under which to run this script from the command
-+# line arguments or $GROFF_OPT; if none is specified, just go on with
-+# the starting shell.
- 
--if test "${_groffer_run}" = ''; then
-+if test _"${_groffer_run}"_ = __; then
-   # only reached during the first run of the script
- 
-+  export _groffer_run;		# counter for the runs of groffer
-+  _groffer_run='first';
-+
-   export _PROGRAM_NAME;
-   export _PROGRAM_VERSION;
-   export _LAST_UPDATE;
-@@ -44,9 +47,9 @@ if test "${_groffer_run}" = ''; then
-   export GROFFER_OPT;		# option environment for groffer
-   export _GROFFER_SH;		# file name of this shell script
-   export _OUTPUT_FILE_NAME;	# output generated, see main_set_res..()
--  export _groffer_run;		# counter for the runs of groffer
- 
--  _groffer_run='first';
-+  export _CONFFILES;		# configuration files
-+  _CONFFILES="/etc/groff/groffer.conf ${HOME}/.groff/groffer.conf";
- 
-   case "$0" in
-   *${_PROGRAM_NAME}*)
-@@ -103,18 +106,33 @@ if test "${_groffer_run}" = ''; then
-   #
-   _test_on_shell()
-   {
--    if test "$#" -le 0 || test "$1" = ''; then
-+    if test "$#" -le 0 || test _"$1"_ = __; then
-       return 1;
-     fi;
-     # do not quote $1 to allow arguments
--    test "$($1 -c 's=ok; echo -n "$s"' 2>/dev/null)" = 'ok';
-+    test _"$($1 -c 's=ok; echo -n "$s"' 2>/dev/null)"_ = _ok_;
-   }
- 
--  # do the shell determination
-+  # do the shell determination from command line and $GROFFER_OPT
-   _shell="$(_get_opt_shell "$@")";
--  if test "${_shell}" = ''; then
--    _shell='ash';
-+
-+  if test _"${_shell}"_ = __; then
-+    # none found, so look at the `--shell' lines in configuration files
-+    export f;
-+    for f in ${_CONFFILES}; do
-+      if test -f $f; then
-+        _all="$(cat $f | sed -n -e '/^--shell[= ] *\([^ ]*\)$/s//\1/p')"
-+        for s in ${_all}; do
-+          _shell=$s;
-+        done;
-+      fi;
-+    done;
-+    unset f;
-+    unset s;
-+    unset _all;
-   fi;
-+
-+  # restart the script with the last found $_shell, if it is a shell
-   if _test_on_shell "${_shell}"; then
-     _groffer_run='second';
-     # do not quote $_shell to allow arguments
-@@ -122,26 +140,17 @@ if test "${_groffer_run}" = ''; then
-     exit;
-   fi;
- 
--  # clean-up of shell determination
-+  _groffer_run='second';
-   unset _shell;
--  unset _GROFFER_SH;
--  unset _groffer_run;
--  _get_opt_shell()
--  {
--    return 0;
--  }
--  _test_on_shell()
--  {
--    return 0;
--  }
- 
- fi; # end of first run
- 
--if test "${_groffer_run}" != 'second';
-+if test _"${_groffer_run}"_ != _second_;
- then
-   echo "$_groffer_run should be 'second' here." >&2
-   exit 1
- fi;
-+
- unset _groffer_run
- 
- 
-@@ -241,9 +250,6 @@ return_no="func_pop; return ${_NO}";
- return_error="func_pop; return ${_ERROR}";
- 
- 
--export _CONFFILES;
--_CONFFILES="/etc/groff/groffer.conf ${HOME}/.groff/groffer.conf";
--
- export _DEFAULT_MODES;
- _DEFAULT_MODES='x,ps,tty';
- export _DEFAULT_RESOLUTION;
-@@ -328,18 +334,18 @@ _OPTS_GROFFER_LONG_NA="'auto' 'debug' 'd
- 
- _OPTS_GROFFER_LONG_ARG="\
- 'apropos' 'apropos-data' 'apropos-devel' 'apropos-progs' \
--'default-modes' 'dvi-viewer' 'extension' 'fg' 'fn' 'font' \
-+'default-modes' 'device' 'dvi-viewer' 'extension' 'fg' 'fn' 'font' \
- 'foreground' 'html-viewer' 'mode' 'pdf-viewer' 'ps-viewer' 'shell' \
- 'tty-viewer' 'www-viewer' 'x-viewer' 'X-viewer'";
- 
- ##### groffer options inhereted from groff
- 
- _OPTS_GROFF_SHORT_NA="'a' 'b' 'c' 'C' 'e' 'E' 'g' 'G' 'i' 'l' 'N' 'p' \
--'R' 's' 'S' 't' 'U' 'V' 'z'";
-+'R' 's' 'S' 't' 'U' 'z'";
- _OPTS_GROFF_SHORT_ARG="'d' 'f' 'F' 'I' 'L' 'm' 'M' 'n' 'o' 'P' 'r' \
- 'w' 'W'";
--_OPTS_GROFF_LONG_NA="'source'";
--_OPTS_GROFF_LONG_ARG="'device' 'macro-file'";
-+_OPTS_GROFF_LONG_NA="";
-+_OPTS_GROFF_LONG_ARG="";
- 
- ##### groffer options inhereted from the X Window toolkit
- 
-@@ -467,8 +473,7 @@ export _OPT_WHATIS;		# print the one-lin
- export _OPT_XRM;		# specify X resource.
- export _OPT_Z;			# groff option -Z.
- # _TMP_* temporary files
--export _TMP_DIR;		# groff directory for temporary files
--export _TMP_DIR_SUB;		# groffer directory for temporary files
-+export _TMP_DIR;		# groffer directory for temporary files
- export _TMP_CAT;		# stores concatenation of everything
- export _TMP_STDIN;		# stores stdin, if any
- 
-@@ -490,7 +495,7 @@ test "a" = "a" || exit 1;
- # Test of `echo' and the `$()' construct.
- #
- echo -n '' >/dev/null || exit "${_ERROR}";
--if test "$(echo -n 'te' && echo -n '' && echo -n 'st')" != "test"; then
-+if test _"$(echo -n 'te' && echo -n '' && echo -n 'st')"_ != _test_; then
-   exit "${_ERROR}";
- fi;
- 
-@@ -527,7 +532,6 @@ _HAS_OPTS_POSIX='';
- 
- # _TMP_* temporary files
- _TMP_DIR='';
--_TMP_DIR_SUB='';
- _TMP_CAT='';
- _TMP_STDIN='';
- 
-@@ -631,7 +635,7 @@ reset;
- #
- landmark()
- {
--  if test "${_DEBUG_LM}" = 'yes'; then
-+  if test _"${_DEBUG_LM}"_ = _yes_; then
-     echo ">>> $*" >&2;
-   fi;
- }
-@@ -647,8 +651,7 @@ landmark "1: debugging functions";
- clean_up()
- {
-   if test -d "${_TMP_DIR}"; then
--    rm -f "${_TMP_DIR}"/*;
--    rmdir "${_TMP_DIR}";
-+    rm -f -r "${_TMP_DIR}";
-   fi;
- }
- 
-@@ -709,7 +712,7 @@ error()
-       ;;
-     *) echo2 'groffer error: wrong number of arguments in error().'; ;;
-   esac;
--  if test "${_DEBUG}" = 'yes'; then
-+  if test _"${_DEBUG}"_ = _yes_; then
-     func_stack_dump;
-   fi;
-   clean_up;
-@@ -803,7 +806,7 @@ func_check()
-     error \
-       "${_fname}"'() needs '"${_comp} ${_nargs}"' argument'"${_s}"'.';
-   fi;
--  if test "${_DEBUG}" = 'yes'; then
-+  if test _"${_DEBUG}"_ = _yes_; then
-     func_push "${_fname} $*";
-   fi;
- }
-@@ -822,7 +825,7 @@ func_check()
- #
- func_pop()
- {
--  if test "${_DEBUG}" = 'yes'; then
-+  if test _"${_DEBUG}"_ = _yes_; then
-     if test "$#" -ne 0; then
-       error 'func_pop() does not have arguments.';
-     fi;
-@@ -856,7 +859,7 @@ func_pop()
- func_push()
- {
-   local _element;
--  if test "${_DEBUG}" = 'yes'; then
-+  if test _"${_DEBUG}"_ = _yes_; then
-     if test "$#" -ne 1; then
-       error 'func_push() needs 1 argument.';
-     fi;
-@@ -869,7 +872,7 @@ func_push()
-         _element="$1";
-         ;;
-     esac;
--    if test "${_FUNC_STACK}" = ''; then
-+    if test _"${_FUNC_STACK}"_ = __; then
-       _FUNC_STACK="${_element}";
-     else
-       _FUNC_STACK="${_element}!${_FUNC_STACK}";
-@@ -889,7 +892,7 @@ func_stack_dump()
-   case "${_FUNC_STACK}" in
-     *!*)
-       _rest="${_FUNC_STACK}";
--      while test "${_rest}" != ''; do
-+      while test _"${_rest}"_ != __; do
-         # get part before the first bang `!'.
-         diag "$(echo -n "${_rest}" | sed -e 's/!.*$//')";
-         # delete part before and including the first bang `!'.
-@@ -934,7 +937,7 @@ fi;
- # Test of `unset'.
- #
- _test='test';
--if unset _test >/dev/null 2>&1 && test "${_test}" = ''; then
-+if unset _test >/dev/null 2>&1 && test _"${_test}"_ = __; then
-   true;
- else
-   unset()
-@@ -960,7 +963,7 @@ if _t_e_s_t_f_u_n_c_; then
- else
-   local()
-   {
--    if test "$1" != ''; then
-+    if test _"$1"_ != __; then
-       error "overriding global variable \`$1' with local value.";
-     fi;
-   }
-@@ -981,7 +984,7 @@ _t_e_s_t_f_u_n_c_()
- }
- 
- _t_e_s_t_f_u_n_c_;
--if test "${_global}" != 'inside' || test "${_clobber}" != 'outside';
-+if test _"${_global}"_ != _inside_ || test _"${_clobber}"_ != _outside_;
- then
-   error "Cannot assign to global variables from within functions.";
- fi;
-@@ -993,9 +996,10 @@ unset _clobber;
- ########################################################################
- # Test of function `sed'.
- #
--if test "$(echo xTesTx \
-+
-+if test _"$(echo xTesTx \
-            | sed -e 's/^.\([Tt]e*x*sTT*\).*$/\1/' \
--           | sed -e '\|T|s||t|g')" != 'test';
-+           | sed -e '\|T|s|T|t|g')"_ != _test_;
- then
-   error 'Test of "sed" command failed.';
- fi;
-@@ -1004,7 +1008,7 @@ fi;
- ########################################################################
- # Test of function `cat'.
- #
--if test "$(echo test | cat)" != "test"; then
-+if test _"$(echo test | cat)"_ != _test_; then
-   error 'Test of "cat" command failed.';
- fi;
- 
-@@ -1012,12 +1016,12 @@ fi;
- ########################################################################
- # Test for compression.
- #
--if test "$(echo 'test' | gzip -c -d -f - 2>/dev/null)" = 'test'; then
-+if test _"$(echo 'test' | gzip -c -d -f - 2>/dev/null)"_ = _test_; then
-   _HAS_COMPRESSION='yes';
-   if echo 'test' | bzip2 -c 2>/dev/null | bzip2 -t 2>/dev/null \
--     && test "$(echo 'test' | bzip2 -c 2>/dev/null \
--                            | bzip2 -d -c 2>/dev/null)" \
--             = 'test'; then
-+     && test _"$(echo 'test' | bzip2 -c 2>/dev/null \
-+                            | bzip2 -d -c 2>/dev/null)"_ \
-+             = _test_; then
-     _HAS_BZIP='yes';
-   else
-     _HAS_BZIP='no';
-@@ -1083,7 +1087,7 @@ base_name()
-   case "$f" in
-     */)
-       # delete all final slashes
--      f="$(echo -n "$f" | sed -e '\|//*$|s|||')";
-+      f="$(echo -n "$f" | sed -e '\|.*|s|//*$||')";
-       ;;
-   esac;
-   case "$f" in
-@@ -1092,7 +1096,7 @@ base_name()
-       ;;
-     */*)
-       # delete everything before and including the last slash `/'.
--      echo -n "$f" | sed -e '\|^.*//*\([^/]*\)$|s||\1|';
-+      echo -n "$f" | sed -e '\|.*|s|^.*//*\([^/]*\)$|\1|';
-       ;;
-     *)
-       echo -n "$f";
-@@ -1112,7 +1116,7 @@ base_name()
- # Arguments: 1, a file name.
- # Output: the content of <file>, possibly decompressed.
- #
--if test "${_HAS_COMPRESSION}" = 'yes'; then
-+if test _"${_HAS_COMPRESSION}"_ = _yes_; then
-   catz()
-   {
-     func_check catz = 1 "$@";
-@@ -1202,11 +1206,11 @@ dirname_chop()
-   local _res;
-   local _sep;
-   # replace all multiple slashes by a single slash `/'.
--  _res="$(echo -n "$1" | sed -e '\|///*|s||/|g')";
-+  _res="$(echo -n "$1" | sed -e '\|.*|s|///*|/|g')";
-   case "${_res}" in
-     ?*/)
-       # remove trailing slash '/';
--      echo -n "${_res}" | sed -e '\|/$|s|||';
-+      echo -n "${_res}" | sed -e '\|.*|s|/$||';
-       ;;
-     *) echo -n "${_res}"; ;;
-   esac;
-@@ -1426,7 +1430,7 @@ is_dir()
- is_empty()
- {
-   func_check is_empty = 1 "$@";
--  if test "$1" = ''; then
-+  if test _"$1"_ = __; then
-     eval "${return_yes}";
-   fi;
-   eval "${return_no}";
-@@ -1444,7 +1448,25 @@ is_empty()
- is_equal()
- {
-   func_check is_equal = 2 "$@";
--  if test "$1" = "$2"; then
-+  if test _"$1"_ = _"$2"_; then
-+    eval "${return_yes}";
-+  fi;
-+  eval "${return_no}";
-+}
-+
-+
-+########################################################################
-+# is_existing (<name>)
-+#
-+# Test whether `name' is an existing file or directory.
-+#
-+# Arguments : 1
-+# Return    : `0' if arg1 exists, `1' otherwise.
-+#
-+is_existing()
-+{
-+  func_check is_existing = 1 "$@";
-+  if test -e "$1"; then
-     eval "${return_yes}";
-   fi;
-   eval "${return_no}";
-@@ -1481,11 +1503,9 @@ is_file()
- #
- is_non_empty_file()
- {
--  func_check is_empty = 1 "$@";
--  if is_file "$1"; then
--    if is_not_empty "$(cat "$1" | sed -e '/./q')"; then
--      eval "${return_yes}";
--    fi;
-+  func_check is_non_empty_file = 1 "$@";
-+  if is_file "$1" && test -s "$1"; then
-+    eval "${return_yes}";
-   fi;
-   eval "${return_no}";
- }
-@@ -1754,7 +1774,7 @@ list_append()
- 
- 
- ########################################################################
--# list_from_cmdline (<s_n> <s_a> <l_n> <l_a> [<cmdline_arg>...])
-+# list_from_cmdline (<pre_name_of_opt_lists> [<cmdline_arg>...])
- #
- # Transform command line arguments into a normalized form.
- #
-@@ -1762,32 +1782,25 @@ list_append()
- # output each as a single-quoted argument of its own.  Options and
- # file parameters are separated by a '--' argument.
- #
--# Arguments: >=4
--#   <s_n>: space-separated list of short options without an arg.
--#   <s_a>: space-separated list of short options that have an arg.
--#   <l_n>: space-separated list of long options without an arg.
--#   <l_a>: space-separated list of long options that have an arg.
-+# Arguments: >=1
-+#   <pre_name>: common part of a set of 4 environment variable names:
-+#     $<pre_name>_SHORT_NA:  list of short options without an arg.
-+#     $<pre_name>_SHORT_ARG: list of short options that have an arg.
-+#     $<pre_name>_LONG_NA:   list of long options without an arg.
-+#     $<pre_name>_LONG_ARG:  list of long options that have an arg.
- #   <cmdline_arg>...: the arguments from a command line, such as "$@",
- #                     the content of a variable, or direct arguments.
- #
--# Globals: $POSIXLY_CORRECT (only kept for compatibility).
--#
- # Output: ['-[-]opt' ['optarg']]... '--' ['filename']...
- #
- # Example:
--#     list_normalize 'a b' 'c' '' 'long' -a f1 -bcarg --long=larg f2
--#   will result in printing:
-+#   list_from_cmdline PRE 'a b' 'c' '' 'long' -a f1 -bcarg --long=larg f2
-+# If $PRE_SHORT_NA, $PRE_SHORT_ARG, $PRE_LONG_NA, and $PRE_LONG_ARG are
-+# none-empty option lists, this will result in printing:
- #     '-a' '-b' '-c' 'arg' '--long' 'larg' '--' 'f1' 'f2'
--#   If $POSIXLY_CORRECT is not empty, the result will be:
--#     '-a' '--' 'f1' '-bcarg' '--long=larg' 'f2'
--#
--#   Rationale:
--#     In POSIX, the first non-option ends the option processing.
--#     In GNU mode, used by default, non-option arguments are sorted
--#     behind the options.
- #
--#   Use this function only in the following way:
--#     eval set -- "$(args_norm '...' '...' '...' '...' "$@")";
-+#   Use this function in the following way:
-+#     eval set -- "$(args_norm PRE_NAME "$@")";
- #     while test "$1" != '--'; do
- #       case "$1" in
- #       ...
-@@ -1799,19 +1812,31 @@ list_append()
- #
- list_from_cmdline()
- {
--  func_check list_from_cmdline '>=' 4 "$@";
-+  func_check list_from_cmdline '>=' 1 "$@";
-   local _fparams;
-   local _fn;
--  local _result;
--  local _long_a;
--  local _long_n;
-   local _short_a;
-   local _short_n;
--  _short_n="$(list_get "$1")"; # short options, no argument
--  _short_a="$(list_get "$2")"; # short options with argument
--  _long_n="$(list_get "$3")";	 # long options, no argument
--  _long_a="$(list_get "$4")";	 # long options with argument
--  shift 4;
-+  local _long_a;
-+  local _long_n;
-+  local _result;
-+  _short_n="$(obj_data "$1"_SHORT_NA)";  # short options, no argument
-+  _short_a="$(obj_data "$1"_SHORT_ARG)"; # short options, with argument
-+  _long_n="$(obj_data "$1"_LONG_NA)";    # long options, no argument
-+  _long_a="$(obj_data "$1"_LONG_ARG)";   # long options, with argument
-+  if obj _short_n is_empty; then
-+    error 'list_from_cmdline(): no $'"$1"'_SHORT_NA options.';
-+  fi;
-+  if obj _short_a is_empty; then
-+    error 'list_from_cmdline(): no $'"$1"'_SHORT_ARG options.';
-+  fi;
-+  if obj _long_n is_empty; then
-+    error 'list_from_cmdline(): no $'"$1"'_LONG_NA options.';
-+  fi;
-+  if obj _long_a is_empty; then
-+    error 'list_from_cmdline(): no $'"$1"'_LONG_ARG options.';
-+  fi;
-+  shift;
-   _fn='list_from_cmdline():';	 # for error messages
-   if is_equal "$#" 0; then
-     echo -n "'--'";
-@@ -1887,13 +1912,12 @@ list_from_cmdline()
-         ;;
-       *)
- 	# Here, $_arg is not an option, so a file parameter.
--        # When $POSIXLY_CORRECT is set this ends option parsing;
--        # otherwise, the argument is stored as a file parameter and
--        # option processing is continued.
-         list_append _fparams "${_arg}";
--	if obj POSIXLY_CORRECT is_not_empty; then
--          break;
--        fi;
-+
-+        # Ignore the strange option handling of $POSIXLY_CORRECT to
-+        # end option parsing after the first file name argument.  To
-+        # reuse it, do a `break' here if $POSIXLY_CORRECT is
-+        # non-empty.
-         ;;
-     esac;
-   done;
-@@ -1930,7 +1954,7 @@ list_from_split()
-   # replace split character of string by the list separator ` ' (space).
-   case "$2" in
-     /)				# cannot use normal `sed' separator
--      echo -n "${_s}" | sed -e '\|'"$2"'|s|| |g';
-+      echo -n "${_s}" | sed -e '\|.*|s|'"$2"'| |g';
-       ;;
-     ?)				# use normal `sed' separator
-       echo -n "${_s}" | sed -e 's/'"$2"'/ /g';
-@@ -1968,8 +1992,8 @@ list_get()
-   eval _list='"${'$1'}"';
-   # remove leading and final space characters
-   _list="$(echo -n "${_list}" | \
--           sed -e '/^['"${_SPACE}${_TAB}"']*/s///' | \
--           sed -e '/['"${_SPACE}${_TAB}"']*$/s///')";
-+           sed -e 's/^['"${_SPACE}${_TAB}"']*//' | \
-+           sed -e 's/['"${_SPACE}${_TAB}"']*$//')";
-   case "${_list}" in
-   '')
-     eval "${return_ok}";
-@@ -2483,7 +2507,7 @@ manpath_set_from_path()
-     eval set -- "$(path_split "${PATH}")";
-     for d in "$@"; do
-       # delete the final `/bin' part
--      _base="$(echo -n "$d" | sed -e '\|//*bin/*$|s|||')";
-+      _base="$(echo -n "$d" | sed -e '\|.*|s|//*bin/*$||')";
-       for e in /share/man /man; do
-         _mandir="${_base}$e";
-         if test -d "${_mandir}" && test -r "${_mandir}"; then
-@@ -3200,7 +3224,7 @@ where()
- #
- # set exit trap and create temporary files
- #
--# Globals: $_TMP_CAT, $_TMP_STDIN
-+# Globals: $_TMP_DIR, $_TMP_CAT, $_TMP_STDIN
- #
- landmark '13: main_init()';
- main_init()
-@@ -3209,32 +3233,52 @@ main_init()
-   # call clean_up() on any signal
-   trap_set clean_up;
- 
--  # determine temporary directory
--  umask 000;
-+  # create temporary directory
-+  umask 0022;
-   _TMP_DIR='';
-   for d in "${GROFF_TMPDIR}" "${TMPDIR}" "${TMP}" "${TEMP}" \
-            "${TEMPDIR}" "${HOME}"'/tmp' '/tmp' "${HOME}" '.';
-   do
--    if is_not_empty "$d"; then
--      if obj d is_dir && obj d is_writable; then
--        _TMP_DIR="${d}/${_PROGRAM_NAME}${_PROCESS_ID}";
--        if obj _TMP_DIR is_dir; then
--	  rm -f "${_TMP_DIR}"/*;
--          break;
--        else
--          mkdir "${_TMP_DIR}";
--          if obj _TMP_DIR is_not_dir; then
--            _TMP_DIR='';
--	    continue;
--          fi;
--          break;
--  	fi;
-+    if obj d is_empty || obj d is_not_dir || obj d is_not_writable; then
-+      continue;
-+    fi;
-+    case "$d" in
-+    */)
-+      _TMP_DIR="${d}";
-+      ;;
-+    *)
-+      _TMP_DIR="${d}"'/';
-+      ;;
-+    esac;
-+    _TMP_DIR="${_TMP_DIR}${_PROGRAM_NAME}${_PROCESS_ID}";
-+    while obj _TMP_DIR is_existing; do
-+      rm -f -r "${_TMP_DIR}" 2>/dev/null;
-+      if obj _TMP_DIR is_existing; then
-+        # $_TMP_DIR could not be removed
-+        _TMP_DIR="${_TMP_DIR}"'X';
-+        continue;
-+      else
-+        # $_TMP_DIR was removed
-+        break;
-       fi;
--      if obj _TMP_DIR is_not_writable; then
--	_TMP_DIR='';
--	continue;
-+    done;
-+    mkdir "${_TMP_DIR}";
-+    if is_not_equal "$?" 0; then
-+      if obj _TMP_DIR is_existing; then
-+        rm -f -r "${_TMP_DIR}" 2>/dev/null;
-       fi;
-+      _TMP_DIR='';
-+      continue;
-+    fi;
-+    if obj _TMP_DIR is_dir && obj _TMP_DIR is_writable; then
-+      # $_TMP_DIR can now be used as temporary directory
-+      break;
-+    fi;
-+    if obj _TMP_DIR is_existing; then
-+      rm -f -r "${_TMP_DIR}" 2>/dev/null;
-     fi;
-+    _TMP_DIR='';
-+    continue;
-   done;
-   unset d;
-   if obj _TMP_DIR is_empty; then
-@@ -3250,7 +3294,7 @@ main_init()
-       echo '_groffer_opt=""' >>${_TMP_CAT};
-       # collect the lines starting with a minus
-       cat "$f" | sed -e \
--        '/^[	 ]*\(-.*\)$/s//_groffer_opt="${_groffer_opt} \1"'/ \
-+        's/^[	 ]*\(-.*\)$/_groffer_opt="${_groffer_opt} \1"'/ \
-         >>${_TMP_CAT};
-       # prepend the collected information to $GROFFER_OPT
-       echo 'GROFFER_OPT="${_groffer_opt} ${GROFFER_OPT}"' >>${_TMP_CAT};
-@@ -3289,10 +3333,7 @@ main_parse_MANOPT()
-     eval "${return_ok}";
-   fi;
-   # add arguments in $MANOPT by mapping them to groffer options
--  eval set -- "$(list_from_cmdline \
--    _OPTS_MANOPT_SHORT_NA _OPTS_MANOPT_SHORT_ARG \
--    _OPTS_MANOPT_LONG_NA _OPTS_MANOPT_LONG_ARG \
--    "${MANOPT}")";
-+  eval set -- "$(list_from_cmdline _OPTS_MANOPT "${MANOPT}")";
-   until test "$#" -le 0 || is_equal "$1" '--'; do
-     _opt="$1";
-     shift;
-@@ -3424,10 +3465,7 @@ main_parse_args()
- 
-   eval set -- "${GROFFER_OPT}" '"$@"';
- 
--  eval set -- "$(list_from_cmdline \
--   _OPTS_CMDLINE_SHORT_NA _OPTS_CMDLINE_SHORT_ARG \
--   _OPTS_CMDLINE_LONG_NA _OPTS_CMDLINE_LONG_ARG \
--   "$@")";
-+  eval set -- "$(list_from_cmdline _OPTS_CMDLINE "$@")";
- 
- # By the call of `eval', unnecessary quoting was removed.  So the
- # positional shell parameters ($1, $2, ...) are now guaranteed to
-@@ -3484,12 +3522,6 @@ main_parse_args()
-       --all)
-           _OPT_ALL="yes";
-           ;;
--      --ascii)
--        list_append _ADDOPTS_GROFF '-mtty-char';
--        if obj _mode is_empty; then
--          _mode='text';
--        fi;
--        ;;
-       --apropos)		# run `apropos'
- 	apropos_run "$1";
-         _code="$?";
-@@ -3497,23 +3529,29 @@ main_parse_args()
-         exit "${_code}";
-         ;;
-       --apropos-data)		# run `apropos' for data sections
--	apropos_run "$1" | grep '^[^(]*([457])';
-+	apropos_run "$1" | grep '^[^(]*([457][^)]*)';
-         _code="$?";
-         clean_up;
-         exit "${_code}";
-         ;;
-       --apropos-devel)		# run `apropos' for development sections
--	apropos_run "$1" | grep '^[^(]*([239])';
-+	apropos_run "$1" | grep '^[^(]*([239][^)]*)';
-         _code="$?";
-         clean_up;
-         exit "${_code}";
-         ;;
-       --apropos-progs)		# run `apropos' for program sections
--	apropos_run "$1" | grep '^[^(]*([168])';
-+	apropos_run "$1" | grep '^[^(]*([168][^)]*)';
-         _code="$?";
-         clean_up;
-         exit "${_code}";
-         ;;
-+      --ascii)
-+        list_append _ADDOPTS_GROFF '-mtty-char';
-+        if obj _mode is_empty; then
-+          _mode='text';
-+        fi;
-+        ;;
-       --auto)			# the default automatic mode
-         _mode='';
-         ;;
-@@ -3691,6 +3729,7 @@ main_parse_args()
-         shift;
-         ;;
-       --shell)
-+        # already done during the first run; so ignore the argument
-         shift;
-         ;;
-       --systems)		# man pages for different OS's, arg
-@@ -4136,7 +4175,7 @@ main_set_resources()
-       continue;
-       ;;
-     ,*)
--      n="$(echo -n "$1" | sed -e '/^,,*/s///')";
-+      n="$(echo -n "$1" | sed -e 's/^,,*//')";
-       ;;
-     esac
-     if obj n is_empty; then
diff --git a/textproc/groff/patches/patch-af b/textproc/groff/patches/patch-af
deleted file mode 100644
index 3b71971cbd0..00000000000
--- a/textproc/groff/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.3 2005/03/14 04:36:53 tv Exp $
-
---- src/preproc/pic/object.cpp.orig	Wed Apr  7 11:27:56 2004
-+++ src/preproc/pic/object.cpp
-@@ -202,7 +202,15 @@ double operator*(const position &a, cons
- 
- double hypot(const position &a)
- {
--  return hypot(a.x, a.y);
-+  double result = hypot(a.x, a.y);
-+
-+#ifdef __INTERIX
-+  /* prevents an endless loop that pops up particularly on Interix */
-+  if (isnan(result) && !isnan(a.x) && !isnan(a.y))
-+    return 0.0;
-+#endif
-+
-+  return result;
- }
- 
- struct arrow_head_type {
diff --git a/textproc/groff/patches/patch-ba b/textproc/groff/patches/patch-ba
deleted file mode 100644
index 5e986260c18..00000000000
--- a/textproc/groff/patches/patch-ba
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2004/08/02 16:14:24 wiz Exp $
-
---- src/utils/hpftodit/hpftodit.cpp.orig	2004-04-07 18:25:21.000000000 +0200
-+++ src/utils/hpftodit/hpftodit.cpp
-@@ -548,7 +548,8 @@ output_font_name(File &f)
-       *p++ = f.get_byte();
-   }
-   else			// value contains the string
--    sprintf(font_name, "%.*s", count, (char*)(tag_info(font_name_tag).value));
-+    sprintf(font_name, "%.*s",
-+	    count, (char*)&(tag_info(font_name_tag).value));
- 
-   // remove any trailing space
-   p = font_name + count - 1;
-@@ -717,13 +718,17 @@ read_and_output_pcltypeface(File &f)
- {
-   printf("pcltypeface ");
-   require_tag(typeface_tag);
--  f.seek(tag_info(typeface_tag).value);
--  for (uint32 i = 0; i < tag_info(typeface_tag).count; i++) {
--    unsigned char c = f.get_byte();
--    if (c == '\0')
--      break;
--    putchar(c);
-+  if (tag_info(typeface_tag).count > 4) {
-+    f.seek(tag_info(typeface_tag).value);
-+    for (uint32 i = 0; i < tag_info(typeface_tag).count; i++) {
-+      unsigned char c = f.get_byte();
-+      if (c == '\0')
-+	break;
-+      putchar(c);
-+    }
-   }
-+  else
-+    printf("%.4s", (char *)&(tag_info(typeface_tag).value));
-   printf("\n");
- }
- 
-@@ -1168,7 +1173,7 @@ dump_ascii(File &f, tag_type t)
-       printf("%c", f.get_byte());
-   }
-   else
--    printf("%.4s", (char*)(tag_info(t).value));
-+    printf("%.4s", (char*)&(tag_info(t).value));
-   putchar('"');
- }
- 
diff --git a/textproc/groff/patches/patch-bb b/textproc/groff/patches/patch-bb
deleted file mode 100644
index 47c78d7595c..00000000000
--- a/textproc/groff/patches/patch-bb
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2004/08/02 16:14:24 wiz Exp $
-
---- tmac/s.tmac.orig	2004-04-16 06:34:21.000000000 +0200
-+++ tmac/s.tmac
-@@ -873,7 +873,6 @@ Foundation, 59 Temple Place - Suite 330,
- .ds*end!\\n[\\n[.ev]:ds-type]
- .nr \\n[.ev]:ds-type 0
- ..
--.als De DE
- .de ds@auto-end
- .if \\n[\\n[.ev]:ds-type] \{\
- .	@error automatically terminating display
-@@ -951,7 +950,6 @@ Foundation, 59 Temple Place - Suite 330,
- .	nr \\n[.ev]:ds-type 3
- .\}
- ..
--.als Ds DS
- .de ds@need
- .if '\\n(.z'' \{\
- .	while \\n[.t]<=(\\$1)&(\\n[nl]>\\n[pg@header-bottom]) \{\