From 0b30b17d956e7fdc9a7a0fae9f92f4f80cf35ce8 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sat, 24 Aug 2013 20:52:02 +0200
Subject: [PATCH] groff: Commit our local patches.

---
 contrib/groff/tmac/doc.tmac                   |  6 +--
 contrib/groff/tmac/eqnrc                      |  1 +
 contrib/groff/tmac/troffrc                    | 16 ++++++-
 contrib/groff/tmac/tty-char.tmac              |  2 +
 contrib/groff/tmac/tty.tmac                   |  3 ++
 gnu/usr.bin/groff/tmac/Makefile               |  2 -
 gnu/usr.bin/groff/tmac/patches/doc.tmac.patch | 22 ---------
 .../groff/tmac/patches/eqnrc.no_obj.patch     | 12 -----
 .../groff/tmac/patches/troffrc.no_obj.patch   | 46 -------------------
 .../tmac/patches/tty-char.tmac.no_obj.patch   | 12 -----
 .../groff/tmac/patches/tty.tmac.no_obj.patch  | 14 ------
 11 files changed, 24 insertions(+), 112 deletions(-)
 delete mode 100644 gnu/usr.bin/groff/tmac/patches/doc.tmac.patch
 delete mode 100644 gnu/usr.bin/groff/tmac/patches/eqnrc.no_obj.patch
 delete mode 100644 gnu/usr.bin/groff/tmac/patches/troffrc.no_obj.patch
 delete mode 100644 gnu/usr.bin/groff/tmac/patches/tty-char.tmac.no_obj.patch
 delete mode 100644 gnu/usr.bin/groff/tmac/patches/tty.tmac.no_obj.patch

diff --git a/contrib/groff/tmac/doc.tmac b/contrib/groff/tmac/doc.tmac
index 3fde369a0b..2ad3989578 100644
--- a/contrib/groff/tmac/doc.tmac
+++ b/contrib/groff/tmac/doc.tmac
@@ -6425,6 +6425,9 @@
 .blm doc-empty-line
 .
 .
+.ec
+.
+.
 .\" For UTF-8, map some characters conservatively for the sake
 .\" of easy cut and paste.
 .
@@ -6438,9 +6441,6 @@
 .\}
 .
 .
-.ec
-.
-.
 .\" load local modifications
 .mso mdoc.local
 .
diff --git a/contrib/groff/tmac/eqnrc b/contrib/groff/tmac/eqnrc
index 5574e590ee..9441637c93 100644
--- a/contrib/groff/tmac/eqnrc
+++ b/contrib/groff/tmac/eqnrc
@@ -55,6 +55,7 @@ ifdef ascii ! define n %1% !
 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/contrib/groff/tmac/troffrc b/contrib/groff/tmac/troffrc
index 470f26279e..79155966e1 100644
--- a/contrib/groff/tmac/troffrc
+++ b/contrib/groff/tmac/troffrc
@@ -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
@@ -30,7 +31,10 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html
 .\" Test whether we work under EBCDIC and map the no-breakable space
 .\" character accordingly.
 .do ie '\[char97]'a' \
-.	do tr \[char160]\~
+.      ie '\*[.T]'koi8-r' \
+.              do tr \[char154]\~
+.      el \
+.              do tr \[char160]\~
 .el \
 .	do tr \[char65]\~
 .
@@ -40,6 +44,8 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html
 .\" 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
@@ -47,4 +53,12 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html
 .\" Handle PS images.
 .do mso pspic.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/contrib/groff/tmac/tty-char.tmac b/contrib/groff/tmac/tty-char.tmac
index eb0efc4bc6..de3687e9a4 100644
--- a/contrib/groff/tmac/tty-char.tmac
+++ b/contrib/groff/tmac/tty-char.tmac
@@ -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/contrib/groff/tmac/tty.tmac b/contrib/groff/tmac/tty.tmac
index 8d69253b17..f1f773c0ce 100644
--- a/contrib/groff/tmac/tty.tmac
+++ b/contrib/groff/tmac/tty.tmac
@@ -83,6 +83,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/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 004e5513b0..0a445a71e0 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -1,5 +1,4 @@
 # $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.4 2005/09/09 14:11:04 asmodai Exp $
 
 .include "../Makefile.inc"
 
@@ -16,7 +15,6 @@ MLINKS+=	groff_man.7 man.7
 MLINKS+=	groff_me.7 me.7
 MLINKS+=	groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7
 
-PATCHES!=       echo ${.CURDIR}/patches/*.patch
 CONTRIBDIR=     ${DIST_DIR}
 
 SRCS=		${PATCHES}
diff --git a/gnu/usr.bin/groff/tmac/patches/doc.tmac.patch b/gnu/usr.bin/groff/tmac/patches/doc.tmac.patch
deleted file mode 100644
index e9e97acb31..0000000000
--- a/gnu/usr.bin/groff/tmac/patches/doc.tmac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- doc.tmac	2010-01-26 10:24:32 +0100
-+++ doc.tmac	2010-01-26 14:46:23 +0100
-@@ -6425,6 +6494,9 @@
- .blm doc-empty-line
- .
- .
-+.ec
-+.
-+.
- .\" For UTF-8, map some characters conservatively for the sake
- .\" of easy cut and paste.
- .
-@@ -6438,9 +6510,6 @@
- .\}
- .
- .
--.ec
--.
--.
- .\" load local modifications
- .mso mdoc.local
- .
diff --git a/gnu/usr.bin/groff/tmac/patches/eqnrc.no_obj.patch b/gnu/usr.bin/groff/tmac/patches/eqnrc.no_obj.patch
deleted file mode 100644
index f284124722..0000000000
--- a/gnu/usr.bin/groff/tmac/patches/eqnrc.no_obj.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
-@@ -55,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
deleted file mode 100644
index 7f52234e49..0000000000
--- a/gnu/usr.bin/groff/tmac/patches/troffrc.no_obj.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-$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
-@@ -30,7 +30,10 @@
- .\" Test whether we work under EBCDIC and map the no-breakable space
- .\" character accordingly.
- .do ie '\[char97]'a' \
--.	do tr \[char160]\~
-+.      ie '\*[.T]'koi8-r' \
-+.              do tr \[char154]\~
-+.      el \
-+.              do tr \[char160]\~
- .el \
- .	do tr \[char65]\~
- .
-@@ -40,6 +40,8 @@
- .\" 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
-@@ -47,4 +49,12 @@
- .\" Handle PS images.
- .do mso pspic.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
deleted file mode 100644
index b79d4e1fc6..0000000000
--- a/gnu/usr.bin/groff/tmac/patches/tty-char.tmac.no_obj.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index 63c30be986..0000000000
--- a/gnu/usr.bin/groff/tmac/patches/tty.tmac.no_obj.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
-@@ -83,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
- .
-- 
2.41.0