From e81918b728a851fc871dbf226131a2a8895084a0 Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Wed, 11 Sep 1996 17:55:20 +0000
Subject: [PATCH] Fix latin1 guessing Add koi8-r guessing

---
 contrib/groff/nroff/nroff.sh          | 8 +++++++-
 contrib/groff/src/roff/nroff/nroff.sh | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/contrib/groff/nroff/nroff.sh b/contrib/groff/nroff/nroff.sh
index 5c6100e75f0f..05b953b54886 100755
--- a/contrib/groff/nroff/nroff.sh
+++ b/contrib/groff/nroff/nroff.sh
@@ -3,12 +3,18 @@
 
 prog="$0"
 # Default device.
-if test "X$LC_CTYPE" = "Xiso_8859_1" || test "X$LESSCHARSET" = "Xlatin1"
+if test `expr "$LC_CTYPE" : ".*\.ISO_8859-1"` -gt 0 || \
+   test `expr "$LANG" : ".*\.ISO_8859-1"` -gt 0
 then
 	T=-Tlatin1
+else
+if test "X$LC_CTYPE" = "Xru_SU.KOI8-R" || test "X$LANG" = "Xru_SU.KOI8-R"
+then
+	T=-Tkoi8-r
 else
 	T=-Tascii
 fi
+fi
 opts=
 
 for i
diff --git a/contrib/groff/src/roff/nroff/nroff.sh b/contrib/groff/src/roff/nroff/nroff.sh
index 5c6100e75f0f..05b953b54886 100755
--- a/contrib/groff/src/roff/nroff/nroff.sh
+++ b/contrib/groff/src/roff/nroff/nroff.sh
@@ -3,12 +3,18 @@
 
 prog="$0"
 # Default device.
-if test "X$LC_CTYPE" = "Xiso_8859_1" || test "X$LESSCHARSET" = "Xlatin1"
+if test `expr "$LC_CTYPE" : ".*\.ISO_8859-1"` -gt 0 || \
+   test `expr "$LANG" : ".*\.ISO_8859-1"` -gt 0
 then
 	T=-Tlatin1
+else
+if test "X$LC_CTYPE" = "Xru_SU.KOI8-R" || test "X$LANG" = "Xru_SU.KOI8-R"
+then
+	T=-Tkoi8-r
 else
 	T=-Tascii
 fi
+fi
 opts=
 
 for i