From owner-svn-src-stable-7@FreeBSD.ORG  Thu May 14 01:35:43 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC95C10656A4;
	Thu, 14 May 2009 01:35:43 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8EC4F8FC14;
	Thu, 14 May 2009 01:35:43 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4E1ZhVp072753;
	Thu, 14 May 2009 01:35:43 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4E1ZhQG072751;
	Thu, 14 May 2009 01:35:43 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200905140135.n4E1ZhQG072751@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Thu, 14 May 2009 01:35:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192068 - in stable/7: etc etc/mtree etc/rc.d
	gnu/usr.bin/man gnu/usr.bin/man/man
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 May 2009 01:35:45 -0000

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