[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

list2html.pl: 1.97 -> 1.98 ほか



以下のページの更新をしました。

list2html.pl: 1.97 -> 1.98
gallery/in-Action/act2html.pl: 1.7 -> 1.8

原文の変更をそのまま適用しています。
すぐに commit します。

以下、訳と原文それぞれの新旧の差分です。

--- list2html.pl.orig	2006-10-22 01:33:15.000000000 +0900
+++ list2html.pl	2006-10-22 01:33:15.000000000 +0900
@@ -1,8 +1,8 @@
 #!/usr/bin/env perl
 #
-# $NetBSD: list2html.pl,v 1.97 2006/05/31 11:52:09 kano Exp $
+# $NetBSD: list2html.pl,v 1.98 2006/10/21 16:30:48 kano Exp $
 # <!-- Based on english version: -->
-# <!-- NetBSD: list2html.pl,v 1.97 2006/05/31 11:52:09 kano Exp   -->
+# <!-- NetBSD: list2html.pl,v 1.98 2006/10/21 16:30:48 kano Exp   -->
 # Process *.list files into indexed *.html files. (abs)
 #  $Id$
 #  Japanese support (sakamoto)
@@ -72,7 +72,7 @@
 $months_previous = 13;	# Previous months to display for DATE entries
 $list_date_links = 8;	# List the first N date entries on stdout
 
-$version = '$Revision: 1.97 $';
+$version = '$Revision: 1.98 $';
 $version =~ /([\d.]+)/ && ($version = $1);
 
 if (!&getopts('a:c:dm:qhV', \%opt) || $opt{'h'} || ( !$opt{'V'} && @ARGV != 2) )
@@ -667,12 +667,12 @@
 
     # Expand <PKGSRC>category/name entries
     #
-    while ($text =~ m#<PKGSRC>(([-\w.]+/|)([^\s<>]+\w))#)
+    while ($text =~ m#<PKGSRC>(([-\w.]+/|)([-\w_.+]+[\w+]))#)
 	{
         my($n) = $3;
 	if (defined($pkgname{$n}))
 	    { $n = $pkgname{$n}; }
-        $text =~ s#<PKGSRC>(([-\w.]+/|)([^\s<>]+\w))#<a href="ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/$1/README.html">$n</a>#;
+        $text =~ s#<PKGSRC>(([-\w.]+/|)([-\w_.+]+[\w+]))#<a href="ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/$1/README.html">$n</a>#;
 	}
 
     # Expand <RFC>RFCxxxx entries
--- gallery/in-Action/act2html.pl.orig	2006-10-22 01:33:17.000000000 +0900
+++ gallery/in-Action/act2html.pl	2006-10-22 01:33:17.000000000 +0900
@@ -1,8 +1,8 @@
 #!/usr/bin/env perl
 #
-# $NetBSD: act2html.pl,v 1.7 2003/09/27 21:07:19 dent Exp $
+# $NetBSD: act2html.pl,v 1.8 2006/10/21 16:30:48 kano Exp $
 # <!-- Based on english version: -->
-# <!-- NetBSD: act2html.pl,v 1.7 2003/09/27 21:07:19 dent Exp   -->
+# <!-- NetBSD: act2html.pl,v 1.8 2006/10/21 16:30:48 kano Exp   -->
 # Process index.act file into index.html for the in-Action
 # gallery.  Customized version of DKBrownlee's list2html.pl.
 #
@@ -31,7 +31,7 @@
 
 $months_previous=9;	# previous months to display for DATE entries
 
-$version='$Revision: 1.7 $';
+$version='$Revision: 1.8 $';
 $version =~ /([\d.]+)/ && ($version=$1);
 
 if (!&getopts('a:c:m:hV',\%opt) || $opt{'h'} || ( !$opt{'V'} && @ARGV != 2) )
@@ -241,12 +241,12 @@
 
     # Expand <PKGSRC>category/name entries
     #
-    while ( $text =~ m#<PKGSRC>(([-\w.]+/|)([^\s<>]+\w))#)
+    while ( $text =~ m#<PKGSRC>(([-\w.]+/|)([-\w_.+]+[\w+]))#)
 	{
         my($n) = $3;
 	if (defined($pkgname{$n}))
 	    { $n = $pkgname{$n}; }
-        $text =~ s#<PKGSRC>(([-\w.]+/|)([^\s<>]+\w))#<a href="ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/$1/README.html">$n</a>#;
+        $text =~ s#<PKGSRC>(([-\w.]+/|)([-\w_.+]+[\w+]))#<a href="ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/$1/README.html">$n</a>#;
 	}
 
     # Expand <PORTPAGE>portname entries
Index: list2html.pl
===================================================================
RCS file: /cvsroot/htdocs/list2html.pl,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- list2html.pl	31 May 2006 11:52:09 -0000	1.97
+++ list2html.pl	21 Oct 2006 16:30:48 -0000	1.98
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# $NetBSD: list2html.pl,v 1.97 2006/05/31 11:52:09 kano Exp $
+# $NetBSD: list2html.pl,v 1.98 2006/10/21 16:30:48 kano Exp $
 # Process *.list files into indexed *.html files. (abs)
 # Looks for these compulsary tags:
 #	<LIST>			Include generated list of entries here.
@@ -68,7 +68,7 @@
 $months_previous = 13;	# Previous months to display for DATE entries
 $list_date_links = 8;	# List the first N date entries on stdout
 
-$version = '$Revision: 1.97 $';
+$version = '$Revision: 1.98 $';
 $version =~ /([\d.]+)/ && ($version = $1);
 
 if (!&getopts('a:c:dm:qhV', \%opt) || $opt{'h'} || ( !$opt{'V'} && @ARGV != 2) )
@@ -659,12 +659,12 @@
 
     # Expand <PKGSRC>category/name entries
     #
-    while ($text =~ m#<PKGSRC>(([-\w.]+/|)([^\s<>]+\w))#)
+    while ($text =~ m#<PKGSRC>(([-\w.]+/|)([-\w_.+]+[\w+]))#)
 	{
         my($n) = $3;
 	if (defined($pkgname{$n}))
 	    { $n = $pkgname{$n}; }
-        $text =~ s#<PKGSRC>(([-\w.]+/|)([^\s<>]+\w))#<a href="ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/$1/README.html">$n</a>#;
+        $text =~ s#<PKGSRC>(([-\w.]+/|)([-\w_.+]+[\w+]))#<a href="ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/$1/README.html">$n</a>#;
 	}
 
     # Expand <RFC>RFCxxxx entries
Index: gallery/in-Action/act2html.pl
===================================================================
RCS file: /cvsroot/htdocs/gallery/in-Action/act2html.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gallery/in-Action/act2html.pl	27 Sep 2003 21:07:19 -0000	1.7
+++ gallery/in-Action/act2html.pl	21 Oct 2006 16:30:48 -0000	1.8
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# $NetBSD: act2html.pl,v 1.7 2003/09/27 21:07:19 dent Exp $
+# $NetBSD: act2html.pl,v 1.8 2006/10/21 16:30:48 kano Exp $
 # Process index.act file into index.html for the in-Action
 # gallery.  Customized version of DKBrownlee's list2html.pl.
 #
@@ -29,7 +29,7 @@
 
 $months_previous=9;	# previous months to display for DATE entries
 
-$version='$Revision: 1.7 $';
+$version='$Revision: 1.8 $';
 $version =~ /([\d.]+)/ && ($version=$1);
 
 if (!&getopts('a:c:m:hV',\%opt) || $opt{'h'} || ( !$opt{'V'} && @ARGV != 2) )
@@ -239,12 +239,12 @@
 
     # Expand <PKGSRC>category/name entries
     #
-    while ( $text =~ m#<PKGSRC>(([-\w.]+/|)([^\s<>]+\w))#)
+    while ( $text =~ m#<PKGSRC>(([-\w.]+/|)([-\w_.+]+[\w+]))#)
 	{
         my($n) = $3;
 	if (defined($pkgname{$n}))
 	    { $n = $pkgname{$n}; }
-        $text =~ s#<PKGSRC>(([-\w.]+/|)([^\s<>]+\w))#<a href="ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/$1/README.html">$n</a>#;
+        $text =~ s#<PKGSRC>(([-\w.]+/|)([-\w_.+]+[\w+]))#<a href="ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/$1/README.html">$n</a>#;
 	}
 
     # Expand <PORTPAGE>portname entries