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

gallery/in-Action/act2html.pl: 1.5 -> 1.7



以下のページの更新をしました。ツッコミをお願いします。

gallery/in-Action/act2html.pl: 1.5 -> 1.7

火曜日までに異議がなければ、 commit します。

> revision 1.7
> date: 2003/09/27 21:07:19;  author: dent;  state: Exp;  lines: +4 -4
> pull over last list2html change.
> ----------------------------
> revision 1.6
> date: 2003/07/17 07:15:28;  author: keihan;  state: Exp;  lines: +5 -5
> First part of s/netbsd.org/NetBSD.org/g
> 
> Please report problems.

s/netbsd.org/NetBSD.org/g はすでに訳に反映ずみなので、
訳の差分には出てきません。

以下、訳と原文の差分です。

--- gallery/in-Action/act2html.pl.orig	2006-04-10 02:42:52.000000000 +0900
+++ gallery/in-Action/act2html.pl	2006-04-10 02:42:52.000000000 +0900
@@ -1,8 +1,8 @@
 #!/usr/bin/env perl
 #
-# $NetBSD: act2html.pl,v 1.5 2002/10/22 15:04:17 wiz Exp $
+# $NetBSD: act2html.pl,v 1.7 2003/09/27 21:07:19 dent Exp $
 # <!-- Based on english version: -->
-# <!-- NetBSD: act2html.pl,v 1.5 2002/10/22 15:04:17 wiz Exp   -->
+# <!-- NetBSD: act2html.pl,v 1.7 2003/09/27 21:07:19 dent Exp   -->
 # Process index.act file into index.html for the in-Action
 # gallery.  Customized version of DKBrownlee's list2html.pl.
 #
@@ -35,7 +35,7 @@
 
 $months_previous=9;	# previous months to display for DATE entries
 
-$version='$Revision: 1.5 $';
+$version='$Revision: 1.7 $';
 $version =~ /([\d.]+)/ && ($version=$1);
 
 if (!&getopts('a:c:m:hV',\%opt) || $opt{'h'} || ( !$opt{'V'} && @ARGV != 2) )
@@ -245,12 +245,12 @@
 
     # Expand <PKGSRC>category/name entries
     #
-    while ( $text =~ m#<PKGSRC>((\w+/|)([^\s<>]+\w))#)
+    while ( $text =~ m#<PKGSRC>(([-\w.]+/|)([^\s<>]+\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.]+/|)([^\s<>]+\w))#<a href="ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/$1/README.html">$n</a>#;
 	}
 
     # Expand <PORTPAGE>portname entries
Index: gallery/in-Action/act2html.pl
===================================================================
RCS file: /cvsroot/htdocs/gallery/in-Action/act2html.pl,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -r1.5 -r1.7
--- gallery/in-Action/act2html.pl	22 Oct 2002 15:04:17 -0000	1.5
+++ gallery/in-Action/act2html.pl	27 Sep 2003 21:07:19 -0000	1.7
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# $NetBSD: act2html.pl,v 1.5 2002/10/22 15:04:17 wiz Exp $
+# $NetBSD: act2html.pl,v 1.7 2003/09/27 21:07:19 dent 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.5 $';
+$version='$Revision: 1.7 $';
 $version =~ /([\d.]+)/ && ($version=$1);
 
 if (!&getopts('a:c:m:hV',\%opt) || $opt{'h'} || ( !$opt{'V'} && @ARGV != 2) )
@@ -199,7 +199,7 @@
         my($page, $section, $arch, $collection) = ($1, $2, $4, $6);
         my($link);
 
-        $link = 'http://man.netbsd.org/man/';
+        $link = 'http://man.NetBSD.org/man/';
 
         $link .= "$page+$section";
 
@@ -234,17 +234,17 @@
 	    { $path = $1."src/$path"; }
 	elsif ($path !~ m#^(doc|xsrc)#)
 	    { $path = "basesrc/$path"; }
-	$text =~ s#<CURRENTSRC>([^\s<>]+\w)#<a href="http://cvsweb.netbsd.org/bsdweb.cgi/$path?rev=HEAD&content-type=text/x-cvsweb-markup">$1</a>#;
+	$text =~ s#<CURRENTSRC>([^\s<>]+\w)#<a href="http://cvsweb.NetBSD.org/bsdweb.cgi/$path?rev=HEAD&content-type=text/x-cvsweb-markup">$1</a>#;
 	}
 
     # Expand <PKGSRC>category/name entries
     #
-    while ( $text =~ m#<PKGSRC>((\w+/|)([^\s<>]+\w))#)
+    while ( $text =~ m#<PKGSRC>(([-\w.]+/|)([^\s<>]+\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.]+/|)([^\s<>]+\w))#<a href="ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/$1/README.html">$n</a>#;
 	}
 
     # Expand <PORTPAGE>portname entries