From 5d392cddf671b6441b988e1214a5bf0a622f4048 Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Sun, 10 Jun 2001 16:36:09 +0000
Subject: [PATCH] Fix Latin1 man directories for new locale names

---
 etc/Makefile           | 10 +++++++++-
 etc/man.alias          |  5 +++++
 etc/mtree/BSD.usr.dist |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 etc/man.alias

diff --git a/etc/Makefile b/etc/Makefile
index dcd062e06c17..5d2d4d6253da 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -171,7 +171,15 @@ distrib-dirs:
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/libdata/perl/5.6.0/mach
 	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
-	cd ${DESTDIR}/usr/share/man/en.ISO_8859-1; ln -sf ../man* .
+	cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* .
+	cd ${DESTDIR}/usr/share/man; \
+	set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
+	while [ $$# -gt 0 ] ; \
+	do \
+		rm -rf "$$1"; \
+		ln -s "$$2" "$$1"; \
+		shift; shift; \
+	done
 	cd ${DESTDIR}/usr/share/locale; \
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/locale.alias`; \
 	while [ $$# -gt 0 ] ; \
diff --git a/etc/man.alias b/etc/man.alias
new file mode 100644
index 000000000000..cf3f41af89fd
--- /dev/null
+++ b/etc/man.alias
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+en.ISO_8859-1   en.ISO8859-1
+en.ISO8859-15   en.ISO8859-1
+en.ISO_8859-15  en.ISO8859-1
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index dac8b625f0a6..72a525e0782a 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -660,7 +660,7 @@
             ..
             catn
             ..
-            en.ISO_8859-1   uname=root
+            en.ISO8859-1        uname=root
                 cat1
                 ..
                 cat1aout