Updated cvsweb to 2.0.6

* New config variable: annotate_options
* Make annotate work under mod_perl
* Output address only if it's set
* Fix annotate HTML output
* Escape file names in directory listings
* Mention cvs < 1.11 '-l' bug

4 files changed, 9 insertions, 30 deletions

diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index 38bdaf653be..a072decef7f 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,8 +1,8 @@
 #
-# $NetBSD: Makefile,v 1.14 2002/08/25 21:52:06 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/09/29 12:46:41 martti Exp $
 #
 
-DISTNAME=		cvsweb-2.0.5
+DISTNAME=		cvsweb-2.0.6
 CATEGORIES=		www
 MASTER_SITES=		ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/
 
diff --git a/www/cvsweb/distinfo b/www/cvsweb/distinfo
index 0312a61a64b..d54abd64fb2 100644
--- a/www/cvsweb/distinfo
+++ b/www/cvsweb/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2002/08/25 21:52:06 jlam Exp $
+$NetBSD: distinfo,v 1.9 2002/09/29 12:46:41 martti Exp $
 
-SHA1 (cvsweb-2.0.5.tar.gz) = 6fb2049eb8f9a79788b9f84523399d761dbc6205
-Size (cvsweb-2.0.5.tar.gz) = 51948 bytes
-SHA1 (patch-aa) = be834a845486db0f104ec0ae990a5452e4f03811
-SHA1 (patch-ab) = 8bb35592e5ba45783d2c1026d5036539fb808f24
+SHA1 (cvsweb-2.0.6.tar.gz) = ecfb465970966b832457e7bb04e1c3055e07b413
+Size (cvsweb-2.0.6.tar.gz) = 52659 bytes
+SHA1 (patch-aa) = 7306be52d771e18549af9cad421b8ca89c660428
diff --git a/www/cvsweb/patches/patch-aa b/www/cvsweb/patches/patch-aa
index 047560575bc..2e4e81deb11 100644
--- a/www/cvsweb/patches/patch-aa
+++ b/www/cvsweb/patches/patch-aa
@@ -1,18 +1,10 @@
-$NetBSD: patch-aa,v 1.6 2002/08/25 21:52:07 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2002/09/29 12:46:41 martti Exp $
 
---- cvsweb.cgi.orig	Tue Jul 23 15:58:32 2002
-+++ cvsweb.cgi	Wed Jul 24 11:01:53 2002
+--- cvsweb.cgi.orig	Thu Sep 26 20:56:05 2002
++++ cvsweb.cgi	Sun Sep 29 14:36:06 2002
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -wT
 +#!/usr/bin/perl -w
  #
  # cvsweb - a CGI interface to CVS trees.
  #
-@@ -3631,6 +3631,7 @@
- }
- 
- sub html_footer() {
-+	return if ($address eq "");
- 	print "<hr noshade>\n<address>$address</address>\n</body>\n</html>\n";
- }
- 
diff --git a/www/cvsweb/patches/patch-ab b/www/cvsweb/patches/patch-ab
deleted file mode 100644
index fb5ad4dce57..00000000000
--- a/www/cvsweb/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2002/08/25 21:52:07 jlam Exp $
-
---- cvsweb.conf.orig	Wed Jul 10 17:30:56 2002
-+++ cvsweb.conf	Wed Jul 24 11:02:29 2002
-@@ -495,6 +495,7 @@
- @cvs_options = qw(-lf);
- 
- push @cvs_options, '-R' if ($uname eq 'FreeBSD' || $uname eq 'OpenBSD');
-+push @cvs_options, '-u' if ($uname eq 'NetBSD');
- 
- #      Only FreeBSD's and OpenBSD's cvs(1) supports -R (read only access
- #      mode) option, which considerably speeds up checkouts over NFS.