From ddafefc762c6e39ec3d31873a41c5487dece06da Mon Sep 17 00:00:00 2001 From: John Marino Date: Fri, 7 Aug 2015 15:16:29 +0200 Subject: [PATCH] groff/mdoc: Disable ru-KOI8-R localization The template for the ru-KOI8-R localization for groff -mdoc option was not created in ASCII as it should have been. Neither was the French version, which I was able to fix. Since I can't fix the data that uses what I believe is an obsolete codeset, I'm disabling it from the build, effectively removing the locale. From what I can tell, neither Russian nor French is used on DragonFly anyway. It appears to be something inherited from FreeBSD. I am also unsure what is special about these two particular mdoc options as they are the only locales supported. With this commit, it is possible to buildworld with locale set (e.g. to en_US.UTF-8, which correctly failed after regex upgrade) --- Makefile_upgrade.inc | 1 + gnu/usr.bin/groff/tmac/Makefile | 6 +++++- gnu/usr.bin/groff/tmac/mdoc.local | 6 ++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 902931a2b8..eac0375c61 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -2166,6 +2166,7 @@ TO_REMOVE+=/usr/sbin/stlstats TO_REMOVE+=/usr/share/man/man8/i386/stlstats.8.gz TO_REMOVE+=/usr/share/man/man4/i386/stl.4.gz TO_REMOVE+=/boot/kernel/pst.ko +TO_REMOVE+=/usr/share/tmac/mdoc/ru.KOI8-R .if ${MACHINE_ARCH} == "x86_64" TO_REMOVE+=/usr/sbin/kgzip diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile index 0a445a71e0..9a6ec3f221 100644 --- a/gnu/usr.bin/groff/tmac/Makefile +++ b/gnu/usr.bin/groff/tmac/Makefile @@ -54,7 +54,11 @@ NORMALFILES= man.tmac mandoc.tmac andoc.tmac an-old.tmac an-ext.tmac \ SPECIALFILES= an.tmac s.tmac www.tmac STRIPFILES= e.tmac doc.tmac doc-old.tmac mdoc.local MDOCFILES= doc-common doc-ditroff doc-nroff doc-syms \ - fr.ISO8859-1 ru.KOI8-R + fr.ISO8859-1 +# Disable ru.KO18-R mdoc option. The man page template is not using valid +# ASCII characters and sed will break buildworld if a named locale is set +# via the LANG or LC_CTYPE environment variables. It's likely unused anyway. +#MDOCFILES+= ru.KOI8-R all: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} ${NORMALFILES:S/$/-s/} diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local index 7a72ea8979..c0c7cbc96c 100644 --- a/gnu/usr.bin/groff/tmac/mdoc.local +++ b/gnu/usr.bin/groff/tmac/mdoc.local @@ -120,8 +120,6 @@ . .\" Locale support .if d doc-locale \{\ -. ie "\*[doc-locale]"ru.KOI8-R" \ -. mso mdoc/ru.KOI8-R -. el \{ .if "\*[doc-locale]"fr.ISO8859-1" \ +. if "\*[doc-locale]"fr.ISO8859-1" \ . mso mdoc/fr.ISO8859-1 -.\}\} +.\} -- 2.41.0