From owner-ports-jp@jp.FreeBSD.org Sun Apr 21 03:35:18 2002
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) id g3KIZIT35940;
	Sun, 21 Apr 2002 03:35:18 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from torii.netmove.jp (torii.netmove.jp [202.231.213.26])
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) with ESMTP/inet id g3KIZI435935
	for <ports-jp@jp.FreeBSD.org>; Sun, 21 Apr 2002 03:35:18 +0900 (JST)
	(envelope-from nork@pelsia.netmove.co.jp)
Received: from pelsia.netmove.co.jp (localhost [127.0.0.1])
	by torii.netmove.jp (8.12.3/8.12.2) with ESMTP id g3KIZE8L051328
	for <ports-jp@jp.FreeBSD.org>; Sun, 21 Apr 2002 03:35:14 +0900 (JST)
	(envelope-from nork@pelsia.netmove.co.jp)
Received: (from nork@localhost)
	by pelsia.netmove.co.jp (8.12.3/8.12.3/Submit) id g3KIZD4O051327;
	Sun, 21 Apr 2002 03:35:13 +0900 (JST)
From: n-shigemura@ensure-tech.co.jp (=?ISO-2022-JP?B?GyRCPUVCPBsoQg==?=
	=?ISO-2022-JP?B?GyRCGyhC?= =?ISO-2022-JP?B?GyRCSyE5bhsoQg==?=)
To: ports-jp@jp.FreeBSD.org
X-Mailer: mnews [version 1.22PL5] 2001-02/07(Wed)
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-2022-JP
Date: Sun, 21 Apr 2002 03:35:13 +0900
Message-ID: <020421033513.M0150999@pelsia.netmove.co.jp>
Reply-To: ports-jp@jp.FreeBSD.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+020417
X-Sequence: ports-jp 12653
Subject: [ports-jp 12653] linux_locale's pkg-plist more clean
Errors-To: owner-ports-jp@jp.FreeBSD.org
Sender: owner-ports-jp@jp.FreeBSD.org
X-Originator: n-shigemura@ensure-tech.co.jp

$B=EB<K!9n$G$9!#(B

	japanese/linux_locale $B$N%"%s%$%s%9%H!<%k;~$K(B /compat/linux/
	usr/share/locale/locale.alias $B$,;D$C$F$7$^$$$^$9!#(Bpkg-plist
	$B$N8+D>$7$r9T$C$F$$$?$N$G$9$,(B, $B2<5-$N$h$&$J%Q%C%A$r:n@.$7$?$N(B
	$B$G8!>Z$7$F$$$?$@$1$l$P9,$$$G$9!#(B

	$B$3$N%Q%C%A<c435?Ld$,;D$k$H$3$m$,$"$j$^$7$F(B, %%LINUXBASE%%
	$B$D$^$j(B PLIST_SUB= LINUXBASE=${LINUXBASE} $B$7$F$$$k=j$H(B %D
	$B$,$4$C$A$c$K$J$C$F$?$j$7$^$9$,(B, $B2?$+0U?^$,$"$C$?$N$G$7$g$&(B
	$B$+(B? $B$J$s$H$J$/Nr;KE*;v>p$N$h$&$J5$$,$7$J$$$G$b$J$$$G$9$,!#!#(B

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/linux_locale/Makefile,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile
--- Makefile	26 Nov 2001 21:01:19 -0000	1.10
+++ Makefile	20 Apr 2002 18:18:40 -0000
@@ -57,6 +57,10 @@
 	${MKDIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/debian/* ${DOCDIR}
 .for locale in ${LOCALE_ADD}
+	if [ ! -f %D/usr/share/locale/locale.alias.orig ]; then \
+		${CP} -p ${LINUXBASE}/usr/share/locale/locale.alias \
+		         ${LINUXBASE}/usr/share/locale/locale.alias.orig \
+	fi
 	${GREP} -q -e ^${locale} ${LINUXBASE}/usr/share/locale/locale.alias \
 	 || ${ECHO} "${locale}	${LOCALE_DEF_${locale}}" \
 		>> ${LINUXBASE}/usr/share/locale/locale.alias
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/linux_locale/pkg-plist,v
retrieving revision 1.3
diff -u -u -r1.3 pkg-plist
--- pkg-plist	19 Nov 2001 14:01:41 -0000	1.3
+++ pkg-plist	20 Apr 2002 13:17:48 -0000
@@ -10,8 +10,10 @@
 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
+@exec [ ! -f %D/usr/share/locale/locale.alias.orig ] && cp -p %D/usr/share/locale/locale.alias %D/usr/share/locale/locale.alias.orig
+@exec echo %%LOCALE_GREP%% %D/usr/share/locale/locale.alias | sh || echo -n %%LOCALE_ALIASES%% | awk -F: 'BEGIN{RS=" "}{print $1"	"$2}' >> %D/usr/share/locale/locale.alias
 @unexec rm -f %D/usr/share/locale/ja_JP.EUC
+@unexec mv -f %D/usr/share/locale/locale.alias.orig %D/usr/share/locale/locale.alias
 @dirrm usr/share/locale/ja_JP/LC_MESSAGES
 @dirrm usr/share/locale/ja_JP
 @dirrm usr/doc/locale-ja-%%VER%%
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
