[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: SUBDIR in Makefile
NetBSD に iconv が入ったのは結構最近のことなので、
反対されるのではないかと思っておりましたが、
In message <20060329.103031.41647068.taca@back-street.net>
Takahiro Kambe <taca@back-street.net> writes:
>> 案 1:
>> pkgsrc/meta-pkg/netbsd-www を pkgsrc/converters/nkf に依存させる
> ...
>> 案 2:
>> list2html.pl を nkf でなく iconv を使うように変更する
> 私は案2が良いと思います。他のパッケージに依存させる必要がないに越した
> ことはありませんから。
ありがとうございます。
ほかに今日中にご意見がなければ、以下のとおり変更します。
あと、 Makefile の修正もれがありましたので、修正します
(gallery/in-Action/Makefile の all ターゲットから
screenshots.html を削除) 。
Index: Documentation/Hardware/Machines/DEC/vax/data2html.pl
===================================================================
RCS file: /cvsroot/htdocs/ja/Documentation/Hardware/Machines/DEC/vax/data2html.pl,v
retrieving revision 1.3
diff -u -r1.3 data2html.pl
--- Documentation/Hardware/Machines/DEC/vax/data2html.pl 4 Feb 2006 00:42:41 -0000 1.3
+++ Documentation/Hardware/Machines/DEC/vax/data2html.pl 29 Mar 2006 13:46:35 -0000
@@ -97,9 +97,9 @@
{
my($section,$loop,$elapsed);
- open(OUT_FULL,'| nkf -j >full.html') || &fail("Cannot write full.html: $!");
- open(OUT_INDEX,'| nkf -j >sections.html')||&fail("Cannot write sections.html: $!");
- open(OUT_INTRO,'| nkf -j >index.html')||&fail("Cannot write index.html: $!");
+ open(OUT_FULL,'| iconv -f euc-jp -t iso-2022-jp >full.html') || &fail("Cannot write full.html: $!");
+ open(OUT_INDEX,'| iconv -f euc-jp -t iso-2022-jp >sections.html')||&fail("Cannot write sections.html: $!");
+ open(OUT_INTRO,'| iconv -f euc-jp -t iso-2022-jp >index.html')||&fail("Cannot write index.html: $!");
@fhs=('OUT_FULL','OUT_INDEX','OUT_INTRO',@sections);
foreach $section ( @sections )
{
@@ -334,7 +334,7 @@
my($key,$value,$name,$last_key);
my(%sectioncount);
- open(DATA, "nkf -e $file|") || &fail("Unable to open '$file': $!");
+ open(DATA, "iconv -f iso-2022-jp -t euc-jp $file|") || &fail("Unable to open '$file': $!");
while( <DATA> )
{
s/#.*//;
@@ -396,7 +396,7 @@
my($data);
$data='';
- open(FILE,"nkf -e $file|") || &fail("Unable to read '$file': $!");
+ open(FILE,"iconv -f iso-2022-jp -t euc-jp $file|") || &fail("Unable to read '$file': $!");
read(FILE,$data,-s $file);
close(FILE);
$data =~ s/\$NetBSD[^\$]+\$/\$NetBSD\$/g;
Index: gallery/in-Action/Makefile
===================================================================
RCS file: /cvsroot/htdocs/ja/gallery/in-Action/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- gallery/in-Action/Makefile 27 Mar 2006 15:28:31 -0000 1.5
+++ gallery/in-Action/Makefile 29 Mar 2006 13:46:35 -0000
@@ -13,7 +13,7 @@
.SUFFIXES: .act-template .html
.act-template.html:
- nkf -e < $< | perl mkact.pl >$*.act
+ iconv -f iso-2022-jp -t euc-jp < $< | perl mkact.pl >$*.act
perl ./act2html.pl $*.act $@
rm $*.act
Index: gallery/in-Action/act2html.pl
===================================================================
RCS file: /cvsroot/htdocs/ja/gallery/in-Action/act2html.pl,v
retrieving revision 1.6
diff -u -r1.6 act2html.pl
--- gallery/in-Action/act2html.pl 4 Feb 2006 00:43:39 -0000 1.6
+++ gallery/in-Action/act2html.pl 29 Mar 2006 13:46:35 -0000
@@ -173,7 +173,7 @@
if ($data !~ s/(<head[^>]*>)/$1$_/i)
{ &fail("Unable to locate <head> tag"); }
- open(FILE,"|nkf -j >$outfile") || die("Unable to write '$outfile': $!");
+ open(FILE,"|iconv -f euc-jp -t iso-2022-jp >$outfile") || die("Unable to write '$outfile': $!");
print FILE &extras_process($data,%extras);
close(FILE);
if ($date_num)
Index: gallery/in-Action/mkact.pl
===================================================================
RCS file: /cvsroot/htdocs/ja/gallery/in-Action/mkact.pl,v
retrieving revision 1.4
diff -u -r1.4 mkact.pl
--- gallery/in-Action/mkact.pl 4 Feb 2006 00:43:40 -0000 1.4
+++ gallery/in-Action/mkact.pl 29 Mar 2006 13:46:35 -0000
@@ -14,7 +14,7 @@
sub printfile {
local($file)=@_;
- open(F, "nkf -e $file|") or die "Cannot open $file for reading: $!\n";
+ open(F, "iconv -f iso-2022-jp -t euc-jp $file|") or die "Cannot open $file for reading: $!\n";
while(<F>) {
s/<!--.*//g;
print "$_";
Index: list2html.pl
===================================================================
RCS file: /cvsroot/htdocs/ja/list2html.pl,v
retrieving revision 1.32
diff -u -r1.32 list2html.pl
--- list2html.pl 7 Feb 2006 11:12:40 -0000 1.32
+++ list2html.pl 29 Mar 2006 13:46:35 -0000
@@ -351,7 +351,7 @@
$data = $date_month = '';
$entry_num = $date_num = $date_num_used = 0;
- open(FILE, "nkf -e $infile|") || die("Unable to open '$infile': $!");
+ open(FILE, "iconv -f iso-2022-jp -t euc-jp $infile|") || die("Unable to open '$infile': $!");
foreach( <FILE> )
{
foreach $rcstag (%rcsmap)
@@ -584,7 +584,7 @@
if ($data !~ s/(<head[^>]*>)/$1$_/i)
{ &fail("Unable to locate <head> tag"); }
- open(FILE, "|nkf -j >$outfile") || die("Unable to write '$outfile': $!");
+ open(FILE, "|iconv -f euc-jp -t iso-2022-jp >$outfile") || die("Unable to write '$outfile': $!");
print FILE &extras_process($data, %extras);
close(FILE);
if ($date_num) {