From owner-ports-jp@jp.freebsd.org  Sat Nov 17 18:50:17 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id SAA48980;
	Sat, 17 Nov 2001 18:50:17 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from hm3.aitai.ne.jp (hm3.aitai.ne.jp [211.1.192.70])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id SAA48974
	for <ports-jp@jp.freebsd.org>; Sat, 17 Nov 2001 18:50:16 +0900 (JST)
	(envelope-from sada@bsdclub.org)
Received: from bsdclub.org ([172.28.136.39])
	by hm3.aitai.ne.jp (8.9.3/3.7W) with SMTP id SAA13243;
	Sat, 17 Nov 2001 18:50:10 +0900 (JST)
Date: Sat, 17 Nov 2001 18:51:36 +0900
From: SADA Kenji <sada@bsdclub.org>
To: ports-jp@jp.freebsd.org
Cc: HIRAOKA Shinji <hiraoka@pc.mycom.co.jp>, Daichi GOTO <daichi@ongs.gr.jp>
Message-Id: <20011117185136.352bcfb2.sada@bsdclub.org>
In-Reply-To: <20011113.223750.88525799.hiraoka@pc.mycom.co.jp>
References: <20011113.212124.102523876.hiraoka@pc.mycom.co.jp>
	<-736033820.1005654536329.JavaMail.daichi@brave.vnet>
	<20011113.223750.88525799.hiraoka@pc.mycom.co.jp>
X-Mailer: Sylpheed version 0.4.66 (GTK+ 1.2.10; i386--freebsd4.3)
Organization: Private
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-2022-JP
Content-Transfer-Encoding: 7bit
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+010328
X-Sequence: ports-jp 11819
Subject: [ports-jp 11819] ja-linux_base locale.alias
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: sada@bsdclub.org

CC: $BJ?2,JT=8D9$HBgCO$5$s!#(B
press-writers $B$N(B TOPIC $B$G$9!#(B

On Tue, 13 Nov 2001 22:37:50 +0900 (JST)
HIRAOKA Shinji <hiraoka@pc.mycom.co.jp> wrote:

> $BJ?2,$G$9!#(B
> 
> From: Daichi GOTO <daichi@ongs.gr.jp> 
> > > linux_base-6.1 $B$NJ}$O!"(BStarSuite $B$NE83+$G<:GT$9$k%U%!%$%k$,$"$C$?$N$G!"(B
> > > $B$=$l0J8e%F%9%H$7$F$J$+$C$?$s$G$9$,!"$3$A$i$bF1MM$NJ}K!$GF~NO$G$-$k$h$&(B
> > > $B$K$J$j$^$7$?!#(B
> > 
> > ?
> > $B0JA0(B /usr/ports/japanese/linux_locale $B$K(B alias $B$K(B ja_JP.EUC $B$N%j%9%H$r(B
> > $BDI2C$9$k=hM}$r2C$($^$7$?$N$G!"(B6.1 $B$N>l9g$3$N(Blinux_locale$B$r%$%s%9%H!<%k(B
> > $B$7$F$$$?$@$1$l$P<+F0E*$K(B ja_JP.EUC $B$G;H$($k$h$&$K$J$k$H;W$&$N$G$9$1$I$b!"(B
> > $B<jF0$G$d$kJ}$,ET9g$,NI$$$3$H$C$F$"$j$^$7$?$G$7$g$&$+(B?
> 
> $B$J$s$H!#3N$+$K(B ports $B$N(B Makefile $B$K$=$N=hM}$,!#$7$+$7!"(Bpackages $B$GF~$l(B
> $B$k$H(B locale.alias $B$O99?7$5$l$J$$(B (^^; $B$3$3$,$O$^$j$I$3$m$G$9$M!#(B
> 
> users-jp $B$N%9%l%C%I$d(B google $B$G$b(B FreeBSD $B$G$O(B kinput2 $B$G$OF~NO$G$-$J(B
> $B$$$H$$$&OC$,$G$F$k$h$&$J$N$G!"$3$l$bF1$8LdBj$+$b$7$l$^$;$s$M!#(B

patch $B$r:n$j$^$7$?$N$G!"$I$J$?$+8!>Z$7$F$$$?$@$1$^$;$s$+!#(B
$B$D$$$G$K!"(Bdelete -> install $B$r7+$jJV$7$?$H$-$KB?=E$KDI2C$7$J$$$h$&$K$7$F$"$j$^$9!#(B

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/linux_locale/Makefile,v
retrieving revision 1.8
diff -B -b -u -w -r1.8 Makefile
--- Makefile	23 Jun 2001 17:01:46 -0000	1.8
+++ Makefile	17 Nov 2001 09:40:00 -0000
@@ -18,7 +18,7 @@
 
 USE_LINUX_PREFIX=	yes
 WRKSRC=		${WRKDIR}/locale-ja-${VERSION}
-PLIST_SUB=	VER=${VERSION}
+PLIST_SUB=	VER=${VERSION} LINUXBASE=${LINUXBASE}
 
 VERSION=	18
 SRCDEF=		${WRKSRC}/ja_JP
@@ -34,6 +34,13 @@
 LOCALE_ADD=	ja_JP.EUC
 LOCALE_DEF_ja_JP.EUC=	ja_JP.eucJP
 
+LOCALE_GREP=	grep -q
+.for locale in ${LOCALE_ADD}
+LOCALE_ALIASES!=	${ECHO} ${LOCALE_ALIASES} ${locale}:${LOCALE_DEF_${locale}}
+LOCALE_GREP!=	${ECHO} "${LOCALE_GREP} -e '^${locale}'"
+.endfor
+PLIST_SUB+=	LOCALE_ALIASES="${LOCALE_ALIASES}" LOCALE_GREP="${LOCALE_GREP}"
+
 do-build:
 	${MKDIR} ${WRKDIR}/LC_MESSAGES
 	${LCDEF_CMD} ${LCDEF_ARGS} ${WRKDIR}
@@ -48,7 +55,8 @@
 	${MKDIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/debian/* ${DOCDIR}
 .for locale in ${LOCALE_ADD}
-	@${ECHO} "${locale}	${LOCALE_DEF_${locale}}" \
+	@${GREP} -q -e ^${locale} ${LINUXBASE}/usr/share/locale/locale.alias \
+	 || ${ECHO} "${locale}	${LOCALE_DEF_${locale}}" \
 		>> ${LINUXBASE}/usr/share/locale/locale.alias
 .endfor
 
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/linux_locale/pkg-plist,v
retrieving revision 1.2
diff -B -b -u -w -r1.2 pkg-plist
--- pkg-plist	29 Mar 2000 15:41:14 -0000	1.2
+++ pkg-plist	17 Nov 2001 09:40:00 -0000
@@ -10,6 +10,7 @@
 usr/share/locale/ja_JP/LC_NUMERIC
 usr/share/locale/ja_JP/LC_TIME
 @exec ln -sf ja_JP %D/usr/share/locale/ja_JP.EUC
+@exec echo %%LOCALE_GREP%% %%LINUXBASE%%/usr/share/locale/locale.alias | sh || echo -n %%LOCALE_ALIASES%% | awk -F: 'BEGIN{RS=" "}{print $1"	"$2}' >> %%LINUXBASE%%/usr/share/locale/locale.alias
 @unexec rm -f %D/usr/share/locale/ja_JP.EUC
 @dirrm usr/share/locale/ja_JP/LC_MESSAGES
 @dirrm usr/share/locale/ja_JP
