pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/checkbot *** empty log message ***
details: https://anonhg.NetBSD.org/pkgsrc/rev/6469f58cb390
branches: trunk
changeset: 483654:6469f58cb390
user: abs <abs%pkgsrc.org@localhost>
date: Tue Nov 16 19:44:45 2004 +0000
description:
*** empty log message ***
diffstat:
www/checkbot/Makefile | 5 +-
www/checkbot/distinfo | 7 +-
www/checkbot/patches/patch-aa | 120 ------------------------------------------
3 files changed, 5 insertions(+), 127 deletions(-)
diffs (150 lines):
diff -r 05d808b835a5 -r 6469f58cb390 www/checkbot/Makefile
--- a/www/checkbot/Makefile Tue Nov 16 19:01:15 2004 +0000
+++ b/www/checkbot/Makefile Tue Nov 16 19:44:45 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/03/26 02:27:56 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2004/11/16 19:44:45 abs Exp $
#
-DISTNAME= checkbot-1.67
-PKGREVISION= 1
+DISTNAME= checkbot-1.75
CATEGORIES= www net perl5
MASTER_SITES= http://degraaff.org/checkbot/
diff -r 05d808b835a5 -r 6469f58cb390 www/checkbot/distinfo
--- a/www/checkbot/distinfo Tue Nov 16 19:01:15 2004 +0000
+++ b/www/checkbot/distinfo Tue Nov 16 19:44:45 2004 +0000
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.6 2001/12/17 12:01:27 abs Exp $
+$NetBSD: distinfo,v 1.7 2004/11/16 19:44:46 abs Exp $
-SHA1 (checkbot-1.67.tar.gz) = 3f683a353c965e9c0cee2d87743299737bca7207
-Size (checkbot-1.67.tar.gz) = 28562 bytes
-SHA1 (patch-aa) = da27bbca199ac7dce028cac92d0780adcded9685
+SHA1 (checkbot-1.75.tar.gz) = b299c4adee83da4cc8caf15c7b9e3688bf9060a5
+Size (checkbot-1.75.tar.gz) = 34946 bytes
diff -r 05d808b835a5 -r 6469f58cb390 www/checkbot/patches/patch-aa
--- a/www/checkbot/patches/patch-aa Tue Nov 16 19:01:15 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2001/12/17 12:01:27 abs Exp $
-
---- checkbot.pl.orig Mon Dec 17 10:55:56 2001
-+++ checkbot.pl
-@@ -49,6 +49,7 @@
- [B<--match> match string] [B<--exclude> exclude string]
- [B<--proxy> proxy URL] [B<--internal-only>]
- [B<--ignore> ignore string] [B<--file> file name]
-+ [B<--skip> skip string] [B<--match-url-base>]
- [B<--style> style file URL]
- [B<--mailto> email address]
- [B<--note> note] [B<--sleep> seconds] [B<--timeout> timeout]
-@@ -95,6 +96,11 @@
- underneath it, but not the HTML pages in the subdirectories of the
- server, the I<match string> would be
- "www.someserver.xyz/($|[^/]+.html)".
-+
-+=item --match-url-base
-+
-+This option causes checkbot to use the site component of each url when
-+determining which pages are local.
-
- =item --exclude <exclude string>
-
-@@ -102,6 +108,12 @@
- even if they happen to match the I<match string> (See option C<--match>).
-
- The I<exclude string> can be a perl regular expression.
-+
-+=item --skip <skip string>
-+
-+URLs matching the I<skip string> are not processed.
-+
-+The I<skip string> can be a perl regular expression.
-
- =item --ignore <ignore string>
-
-@@ -276,7 +288,7 @@
-
- # Get command-line arguments
- use Getopt::Long;
-- my $result = GetOptions(qw(debug help verbose url=s match=s exclude|x=s file=s style=s ignore|z=s mailto|M=s note|N=s proxy=s internal-only sleep=i timeout=i interval=i dontwarn=s enable-virtual
language=s));
-+ my $result = GetOptions(qw(debug help verbose url=s match=s exclude|x=s file=s style=s ignore|z=s mailto|M=s note|N=s proxy=s internal-only sleep=i timeout=i interval=i dontwarn=s enable-virtual
language=s match-url-base skip|x=s));
-
- # Handle arguments, some are mandatory, some have defaults
- &print_help if (($main::opt_help && $main::opt_help)
-@@ -287,6 +299,7 @@
- $main::opt_interval = 10800 unless defined $main::opt_interval and length $main::opt_interval;
- $main::opt_dontwarn = "xxx" unless defined $main::opt_dontwarn and length $main::opt_dontwarn;
- $main::opt_enable_virtual = 0 unless defined $main::opt_enable_virtual;
-+ $main::opt_match_url_base = 0 unless defined $main::opt_match_url_base;
- # Set the default language and make sure it is a two letter, lowercase code
- $main::opt_language = 'en' unless defined $main::opt_language;
- $main::opt_language = lc(substr($main::opt_language, 0, 2));
-@@ -385,7 +398,11 @@
- my @matchurls;
- my $matchurl;
- foreach $matchurl (@starturls) {
-- push(@matchurls, quotemeta $matchurl);
-+ $_ = $matchurl;
-+ if ($main::opt_match_url_base && m#^(\w+://[^/]+/)#) {
-+ $_ = $1;
-+ }
-+ push(@matchurls, quotemeta $_);
- }
- $main::opt_match = '(' . join('|', @matchurls) . ')';
- print STDERR "--match defaults to $main::opt_match\n" if $main::opt_verbose;
-@@ -737,7 +754,9 @@
- print OUT "<tr><th align=left>--url</th><td>Start URL(s)</td><td>",
- join(',', @starturls), "</td></tr>\n";
- print OUT "<tr><th align=left>--match</th><td>Match regular expression</td><td>$main::opt_match</td></tr>\n";
-+ print OUT "<tr><th align=left>--match-url-base</th><td>Match base of each url</td><td>$main::opt_match_url_base</td></tr>\n" if defined $main::opt_match_url_base;
- print OUT "<tr><th align=left>--exclude</th><td>Exclude regular expression</td><td>$main::opt_exclude</td></tr>\n" if defined $main::opt_exclude;
-+ print OUT "<tr><th align=left>--skip</th><td>Skip regular expression</td><td>$main::opt_skip</td></tr>\n" if defined $main::opt_skip;
- print OUT "<tr><th align=left>--ignore</th><td>Ignore regular expression</td><td>$main::opt_ignore</td></tr>\n" if defined $main::opt_ignore;
- print OUT "<tr><th align=left>--dontwarn</th><td>Don't warn for these codes</td><td>$main::opt_dontwarn</td></tr>\n" if $main::opt_dontwarn ne 'xxx';
- print OUT "<tr><th align=left>--enable-virtual</th><td>Use virtual names only</td><td>yes</td></tr>\n" if $main::opt_enable_virtual;
-@@ -879,7 +898,7 @@
- add_to_queue($url, $response->base);
- $doc_new++;
- }
-- } else {
-+ } elsif (!defined $main::opt_skip || $url !~ /$main::opt_skip/o) {
- # Add this as an external link if we can check the protocol later
- if ($url =~ /^(http|ftp|gopher):/o) {
- print EXTERNAL $url . "|" . $response->base . "\n";
-@@ -1007,8 +1026,12 @@
- sub add_to_queue {
- my ($url, $parent) = @_;
-
-- print QUEUE $url . '|' . $parent . "\n";
-- $main::st_int[$main::TODO]++;
-+ if (defined $main::opt_skip && $url =~ /$main::opt_skip/o) {
-+ print STDERR "Skip $url\n" if $main::opt_verbose;
-+ } else {
-+ print QUEUE $url . '|' . $parent . "\n";
-+ $main::st_int[$main::TODO]++;
-+ }
- }
-
- sub print_server {
-@@ -1204,7 +1227,9 @@
- print " --url url Start URL\n";
- print " --match match Check pages only if URL matches `match'\n";
- print " If no match is given, the start URL is used as a match\n";
-+ print " --match-url-base Use the site part of the url in --match\n";
- print " --exclude exclude Exclude pages if the URL matches 'exclude'\n";
-+ print " --skip skip Do not process pages if the URL matches 'skip'\n";
- print " --ignore ignore Do not list error messages for pages that the\n";
- print " URL matches 'ignore'\n";
- print " --file file Write results to file, default is checkbot.html\n";
-@@ -1219,7 +1244,7 @@
- print " --enable-virtual Use only virtual names, not IP numbers for servers\n";
- print " --language Specify 2-letter language code for language negotiation\n";
- print "\n";
-- print "Options --match, --exclude, and --ignore can take a perl regular expression\nas their argument\n\n";
-+ print "Options --match, --exclude, --skip, and --ignore can take a perl regular\nexpression as their argument\n\n";
- print "Use 'perldoc checkbot' for more verbose documentation.\n\n";
- print "Checkbot WWW page : http://degraaff.org/checkbot/\n";;
- print "Mail bugs and problems: checkbot\@degraaff.org\n";
Home |
Main Index |
Thread Index |
Old Index