Remove some patches that are not needed and add comments to the others.

5 files changed, 9 insertions, 96 deletions

diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo
index 91c00b906d1..c8bb3f974f9 100644
--- a/textproc/groff/distinfo
+++ b/textproc/groff/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.20 2015/01/08 09:02:27 wiz Exp $
+$NetBSD: distinfo,v 1.21 2015/01/08 09:14:58 wiz Exp $
 
 SHA1 (groff-1.22.3.tar.gz) = 61a6808ea1ef715df9fa8e9b424e1f6b9fa8c091
 RMD160 (groff-1.22.3.tar.gz) = 8f6d364f759e559c12c497091118f6d68f3a3b85
 Size (groff-1.22.3.tar.gz) = 4188772 bytes
-SHA1 (patch-aa) = 3c74f1b8e809da5359d4702f0f5f299593601209
-SHA1 (patch-ab) = 64ba9805a0798bfce543a258cd66347caa1bf860
-SHA1 (patch-ac) = 7c29e3ca0c0a2e5389ff436ff5c15c9a0a4d7581
-SHA1 (patch-ae) = 777b9b4d5f39da5acf8d79616ae9d42025772fc5
-SHA1 (patch-src_libs_libgroff_tmpfile.cpp) = 6fe0b56ad05a39beac37823b7a7fb5951e36ceb8
+SHA1 (patch-aa) = b9ca249a89b1e658d5629863aef38eb5fcb359af
+SHA1 (patch-src_libs_libgroff_tmpfile.cpp) = 3794a028dc7c569e5adea6b7b876c3ac085376ba
diff --git a/textproc/groff/patches/patch-aa b/textproc/groff/patches/patch-aa
index 7c2b2f7066e..d48d0b7ea92 100644
--- a/textproc/groff/patches/patch-aa
+++ b/textproc/groff/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2005/12/07 17:51:51 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2015/01/08 09:14:58 wiz Exp $
+
+Fix path to papers directory on NetBSD.
 
 --- Makefile.in.orig	2005-08-07 10:03:33.000000000 +0200
 +++ Makefile.in
diff --git a/textproc/groff/patches/patch-ac b/textproc/groff/patches/patch-ac
deleted file mode 100644
index c935eb4fa4f..00000000000
--- a/textproc/groff/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/12/07 17:51:51 wiz Exp $
-
---- tmac/doc.tmac.orig	2005-02-04 01:06:10.000000000 +0100
-+++ tmac/doc.tmac
-@@ -950,8 +950,16 @@
- .de Nm
- .  if !\n[doc-arg-limit] \{\
- .    ds doc-macro-name Nm
--.    ie \n[.$] \
-+.    ie \n[.$] \{\
- .      doc-parse-args \$@
-+.      nr doc-arg-ptr +1
-+.      if "\*[doc-arg\n[doc-arg-ptr]]"" \
-+.        ie "\*[doc-command-name]"" \
-+.          tm Usage: .Nm name ... (#\n[.c])
-+.        el \
-+.          ds doc-arg\n[doc-arg-ptr] \*[doc-command-name]
-+.      nr doc-arg-ptr -1
-+.    \}
- .    el \{\
- .      ie "\*[doc-command-name]"" \
- .        tm Usage: .Nm name ... (#\n[.c])
diff --git a/textproc/groff/patches/patch-ae b/textproc/groff/patches/patch-ae
deleted file mode 100644
index 50b91c065c8..00000000000
--- a/textproc/groff/patches/patch-ae
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2009/02/24 20:41:46 wiz Exp $
-
---- tmac/troffrc.orig	2009-01-09 14:25:52.000000000 +0000
-+++ tmac/troffrc
-@@ -44,6 +44,61 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4
- .\" Handle paper formats.
- .do mso papersize.tmac
- .
-+.if n \{\
-+.  nr _C \n(.C
-+.  cp 0
-+.
-+.  \" The following code sets a top-of-page trap to disable grotty's TTY
-+.  \" mode.  Since neither \X nor .output can be used before the first
-+.  \" page has started, we must use a trap.  To make it work with troff's
-+.  \" -o option, we wait until the first printed page.
-+.
-+.  de sgr@dummy
-+.  .
-+.
-+.  rn wh wh@old
-+.
-+.  \" The stand-alone version.  If no other trap is set, we can safely
-+.  \" insert the truncated vertical space caused by the trap (if any).
-+.  \" Otherwise we assume that the document's main macro package takes
-+.  \" care of that.  As soon as the trap has been executed, it is removed.
-+.  de1 no@sgr
-+.    if \\n[.P] \{\
-+.      if (\\n[.t] == \\n[.p]) \{\
-+.        rn wh@old wh
-+.        rm no@sgr
-+.        wh 0
-+.        sp \\n[.trunc]
-+.        nop \X'tty: sgr 0'
-+.        sp -1
-+.    \}\}
-+.  .
-+.
-+.  wh@old 0 no@sgr
-+.
-+.  \" The piggyback version to be appended to macros planted with the
-+.  \" modified `wh' request.
-+.  de1 no@sgr1
-+.    if \\n[.P] \{\
-+.      rn wh@old wh
-+.      ds no@sgr1
-+.      nop \X'tty: sgr 0'
-+.      sp -1
-+.    \}
-+.  .
-+.
-+.  \" We redefine the `wh' request so that `no@sgr1' is appended to
-+.  \" the trap macro.
-+.  de1 wh
-+.    am1 \\$2 sgr@dummy
-+.      no@sgr1
-+.    sgr@dummy
-+.    wh@old \\$1 \\$2
-+.  .
-+.
-+.  cp \n[_C]
-+.\}
-+.
- .\" Handle PS images.
- .do mso pspic.tmac
- .
diff --git a/textproc/groff/patches/patch-src_libs_libgroff_tmpfile.cpp b/textproc/groff/patches/patch-src_libs_libgroff_tmpfile.cpp
index af759672938..150d6385e48 100644
--- a/textproc/groff/patches/patch-src_libs_libgroff_tmpfile.cpp
+++ b/textproc/groff/patches/patch-src_libs_libgroff_tmpfile.cpp
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_libs_libgroff_tmpfile.cpp,v 1.1 2014/07/18 10:11:35 ryoon Exp $
+$NetBSD: patch-src_libs_libgroff_tmpfile.cpp,v 1.2 2015/01/08 09:14:58 wiz Exp $
+
+Fix SCO OpenServer 5.0.7/3.2 build.
 
 --- src/libs/libgroff/tmpfile.cpp.orig	2009-01-09 14:25:52.000000000 +0000
 +++ src/libs/libgroff/tmpfile.cpp