From owner-p4-projects@FreeBSD.ORG  Tue Jun 24 09:33:28 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 05836106567A; Tue, 24 Jun 2008 09:33:28 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BA24F106566B
	for <perforce@freebsd.org>; Tue, 24 Jun 2008 09:33:27 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A70E58FC42
	for <perforce@freebsd.org>; Tue, 24 Jun 2008 09:33:27 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5O9XRlm039445
	for <perforce@freebsd.org>; Tue, 24 Jun 2008 09:33:27 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5O9XRXi039443
	for perforce@freebsd.org; Tue, 24 Jun 2008 09:33:27 GMT
	(envelope-from gabor@freebsd.org)
Date: Tue, 24 Jun 2008 09:33:27 GMT
Message-Id: <200806240933.m5O9XRXi039443@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 144017 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Jun 2008 09:33:28 -0000

http://perforce.freebsd.org/chv.cgi?CH=144017

Change 144017 by gabor@gabor_server on 2008/06/24 09:32:58

	- Complete NLS support:
		- Add Makefile glue
		- It can be disabled now with WITHOUT_NLS

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/Makefile#5 edit
.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#40 edit
.. //depot/projects/soc2008/gabor_textproc/grep/grep.h#22 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#5 (text+ko) ====

@@ -20,4 +20,14 @@
 LDADD=	-lz -lbz2
 DPADD=	${LIBZ} ${LIBBZ2}
 
+.if !defined(WITHOUT_NLS)
+NLS=	hu_HU.ISO8859-2
+NLSSRCFILES=	${NLS:S@$@.msg@}
+.for lang in ${NLS}
+NLSSRCDIR_${lang}=	${.CURDIR}/nls
+.endfor
+.else
+CFLAGS+=	-DWITHOUT_NLS
+.endif
+
 .include <bsd.prog.mk>

==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#40 (text+ko) ====

@@ -44,7 +44,6 @@
 #include <errno.h>
 #include <getopt.h>
 #include <locale.h>
-#include <nl_types.h>
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -54,6 +53,10 @@
 #include "grep.h"
 
 #ifndef WITHOUT_NLS
+#include <nl_types.h>
+nl_catd	 catalog;
+#endif
+
 char	*errstr[] = {
 	"",
 /* 1*/	"(standard input)",
@@ -71,9 +74,6 @@
 /*12*/	"Value out of range"
 };
 
-nl_catd	 catalog;
-#endif
-
 /* Flags passed to regcomp() and regexec() */
 int		 cflags;
 int		 eflags = REG_STARTEND;

==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#22 (text+ko) ====