Update to 1.63:

Changes since 1.62:

- Require LWP 5.50. A bug fix was introduced in LWP 5.49 which
  solves problems with relative Location: headers for Checkbot.
- Create a defaults --match argument based on all the start URLs,
  not just the first one.
- Remove .bak files when the new files are written correctly.
- Create correct URLs when --file argument also contains directories.
- Deal with redirects without a Location: header.
- Don't exclude checkbot's own pages automagically.
- Always ask server about file type for HTTP requests when uncertain.
- Make output well-formed HTML.
- Several typo's and other output fixes.

patch-aa incorporated into main dist.

4 files changed, 9 insertions, 84 deletions

diff --git a/www/checkbot/Makefile b/www/checkbot/Makefile
index 3e4fab491cd..07456bcac10 100644
--- a/www/checkbot/Makefile
+++ b/www/checkbot/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2000/12/28 13:33:10 abs Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/15 11:31:59 abs Exp $
 #
 
-DISTNAME=	checkbot-1.62
-PKGNAME=	checkbot-1.62nb1
+DISTNAME=	checkbot-1.63
 CATEGORIES=	www net perl5
 MASTER_SITES=	http://degraaff.org/checkbot/
 
diff --git a/www/checkbot/files/md5 b/www/checkbot/files/md5
index d61894a9183..30c220ba4f8 100644
--- a/www/checkbot/files/md5
+++ b/www/checkbot/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/11/23 12:59:33 abs Exp $
+$NetBSD: md5,v 1.4 2001/02/15 11:32:00 abs Exp $
 
-MD5 (checkbot-1.62.tar.gz) = 27b86b77ea7cef56dfa8228bf8c76a1f
+MD5 (checkbot-1.63.tar.gz) = 0f6debb01e7fd8ded7faab19aede4516
diff --git a/www/checkbot/files/patch-sum b/www/checkbot/files/patch-sum
index 5df3cc6d291..315f1b71744 100644
--- a/www/checkbot/files/patch-sum
+++ b/www/checkbot/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.1 2000/12/28 13:33:11 abs Exp $
+$NetBSD: patch-sum,v 1.2 2001/02/15 11:32:00 abs Exp $
 
-MD5 (patch-aa) = 5891b8cc1602b0c35aec9c41e536e2f3
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/www/checkbot/patches/patch-aa b/www/checkbot/patches/patch-aa
deleted file mode 100644
index 516c98546f0..00000000000
--- a/www/checkbot/patches/patch-aa
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2000/12/28 13:33:11 abs Exp $
-
---- checkbot.pl.orig	Sun Sep 24 14:51:46 2000
-+++ checkbot.pl
-@@ -51,7 +51,7 @@
-          [B<--mailto> email address]
-          [B<--note> note] [B<--sleep> seconds] [B<--timeout> timeout]
-          [B<--interval> seconds] [B<--dontwarn> HTTP responde codes]
--         [B<--enable-virtual>]
-+         [B<--enable-virtual>] [B<--no-bak>]
-          [start URLs]
- 
- =head1 DESCRIPTION
-@@ -180,6 +180,10 @@
- causes problems, which this feature work around by using the hostname
- to distinguish the server.
- 
-+=item --no-bak
-+
-+Do not save previous summary pages with .bak extensions.
-+
- =back
- 
- =head1 PREREQUISITES
-@@ -255,7 +259,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));
-+  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 no-bak));
- 
-   # Handle arguments, some are mandatory, some have defaults
-   &print_help if (($main::opt_help && $main::opt_help) 
-@@ -266,6 +270,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_no_bak = 0 unless defined $main::opt_no_bak;
-   # The default for opt_match will be set later, because we might want
-   # to muck with opt_url first.
- 
-@@ -698,7 +703,7 @@
-     print STDERR "*** Start writing results page\n" if $main::opt_verbose;
- 
-     open(OUT, ">$main::file.new") 
--	|| die "$0: Unable to open $main::file.bak for writing:\n";
-+	|| die "$0: Unable to open $main::file.new for writing:\n";
-     print OUT "<head>\n";
-     if (!$final_page) {
-       printf OUT "<META HTTP-EQUIV=\"Refresh\" CONTENT = %d>\n",
-@@ -762,6 +767,7 @@
-     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;
-+    print OUT "<tr><th align=left>--no-bak</th><td>Do not save previous summaries in .bak files</td><td>yes</td></tr>\n" if $main::opt_no_bak;
-     print OUT "<tr><th align=left>--internal-only</th><td>Check only internal links</td><td>yes</td></tr>\n" if defined $main::opt_internal_only;
-     
-     print OUT "</table>\n";
-@@ -772,7 +778,9 @@
- 
-     close(OUT);
- 
--    rename($main::file, $main::file . ".bak");
-+    unless ($main::opt_no_bak) {
-+	rename($main::file, $main::file . ".bak");
-+    }
-     rename($main::file . ".new", $main::file);
- 
-     print STDERR "*** Done writing result page\n" if $main::opt_verbose;
-@@ -1121,6 +1129,7 @@
-   print "  --interval seconds Maximum time interval between updates (default 10800)\n";
-   print "  --dontwarn codes   Do not write warnings for these HTTP response codes\n";
-   print "  --enable-virtual   Use only virtual names, not IP numbers for servers\n";
-+  print "  --no-bak           Do not save previous summaries in .bak files\n";
-   print "\n";
-   print "Options --match, --exclude, and --ignore can take a perl regular expression\nas their argument\n\n";
-   print "Use 'perldoc checkbot' for more verbose documentation.\n\n";