svn commit: r192068 - in stable/7: etc etc/mtree etc/rc.d gnu/usr.bin/man gnu/usr.bin/man/man

[Dag-Erling Smorgrav]

Author: des
Date: Thu May 14 01:35:43 2009
New Revision: 192068
URL: http://svn.freebsd.org/changeset/base/192068

Log:
  MFC r183696, r183698: enable UTF-8 for man pages.

Modified:
  stable/7/etc/   (props changed)
  stable/7/etc/Makefile
  stable/7/etc/mtree/BSD.usr.dist
  stable/7/etc/rc.d/   (props changed)
  stable/7/gnu/usr.bin/man/   (props changed)
  stable/7/gnu/usr.bin/man/man/man.c

Modified: stable/7/etc/Makefile
==============================================================================
--- stable/7/etc/Makefile	Thu May 14 00:34:26 2009	(r192067)
+++ stable/7/etc/Makefile	Thu May 14 01:35:43 2009	(r192068)
@@ -261,6 +261,7 @@ distrib-dirs:
 .endif
 	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
 	cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* .
+	cd ${DESTDIR}/usr/share/man/en.UTF-8; ln -sf ../man* .
 	cd ${DESTDIR}/usr/share/man; \
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
 	while [ $$# -gt 0 ] ; \

Modified: stable/7/etc/mtree/BSD.usr.dist
==============================================================================
--- stable/7/etc/mtree/BSD.usr.dist	Thu May 14 00:34:26 2009	(r192067)
+++ stable/7/etc/mtree/BSD.usr.dist	Thu May 14 01:35:43 2009	(r192068)
@@ -752,6 +752,46 @@
                 cat9
                 ..
             ..
+            en.UTF-8        uname=root
+                cat1
+                ..
+                cat1aout
+                ..
+                cat2
+                ..
+                cat3
+                ..
+                cat4
+                    amd64
+                    ..
+                    arm
+                    ..
+                    i386
+                    ..
+                    powerpc
+                    ..
+                    sparc64
+                    ..
+                ..
+                cat5
+                ..
+                cat6
+                ..
+                cat7
+                ..
+                cat8
+                    amd64
+                    ..
+                    i386
+                    ..
+                    powerpc
+                    ..
+                    sparc64
+                    ..
+                ..
+                cat9
+                ..
+            ..
             ja              uname=root
                 cat1
                 ..

Modified: stable/7/gnu/usr.bin/man/man/man.c
==============================================================================
--- stable/7/gnu/usr.bin/man/man/man.c	Thu May 14 00:34:26 2009	(r192067)
+++ stable/7/gnu/usr.bin/man/man/man.c	Thu May 14 01:35:43 2009	(r192068)
@@ -105,6 +105,7 @@ static struct ltable ltable[] = {
 	{"KOI8-R", "koi8-r"},
 	{"ISO8859-1", "latin1"},
 	{"ISO8859-15", "latin1"},
+	{"UTF-8", "utf8"},
 	{NULL}
 };
 #endif