On 04/23/10 09:59, Alexander Hall wrote:
> Oh, forgot to bump. hold on.
New diff below.
I'd like to point out that I normally do not run this myself, but since
I use the one at openbsd.org, I'd like it to work properly :)
>
> On 04/23/10 09:55, Alexander Hall wrote:
>> This fixes tabs in cvsweb annotate; e.g.:
>>
>> PRE:
>>
>> 1.39 deraadt 7: mrouted_flags=NO # for normal use: "", if
>> activated
>> 1.35 niklas 8: # be sure to enable
>> multicast_router below.
>> 1.114 norby 9: dvmrpd_flags=NO # for normal use: ""
>> 1.105 henning 10: ospfd_flags=NO # for normal use: ""
>> 1.125 norby 11: ospf6d_flags=NO # for normal use: ""
>> 1.95 henning 12: bgpd_flags=NO # for normal use: ""
>>
>> POST:
>>
>> 1.39 deraadt 7: mrouted_flags=NO # for normal use: "", if
>> activated
>> 1.35 niklas 8: # be sure to enable
>> multicast_router below.
>> 1.114 norby 9: dvmrpd_flags=NO # for normal use: ""
>> 1.105 henning 10: ospfd_flags=NO # for normal use: ""
>> 1.125 norby 11: ospf6d_flags=NO # for normal use: ""
>> 1.95 henning 12: bgpd_flags=NO # for normal use: ""
>>
>>
>> Is there any active upstream to pass this on to?
>>
>> /Alexander
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cvsweb/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile 25 Nov 2009 19:54:19 -0000 1.38
+++ Makefile 23 Apr 2010 07:59:34 -0000
@@ -4,7 +4,7 @@
COMMENT= WWW CGI script to browse CVS repository trees
DISTNAME= cvsweb-2.0.6
-PKGNAME= ${DISTNAME}p7
+PKGNAME= ${DISTNAME}p8
CATEGORIES= devel www
HOMEPAGE= http://www.freebsd.org/projects/cvsweb.html
Index: patches/patch-cvsweb_cgi
===================================================================
RCS file: /cvs/ports/devel/cvsweb/patches/patch-cvsweb_cgi,v
retrieving revision 1.12
diff -u -p -r1.12 patch-cvsweb_cgi
--- patches/patch-cvsweb_cgi 4 Feb 2006 17:01:36 -0000 1.12
+++ patches/patch-cvsweb_cgi 23 Apr 2010 07:59:34 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-cvsweb_cgi,v 1.12 2006/02/04 17:01:36 naddy Exp $
--- cvsweb.cgi.orig Thu Sep 26 22:56:05 2002
-+++ cvsweb.cgi Sat Feb 4 17:33:35 2006
++++ cvsweb.cgi Fri Apr 23 09:42:23 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!/usr/bin/perl -w
@@ -12,11 +12,11 @@ $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/0
# == EDIT this ==
# Locations to search for user configuration, in order:
-for ("$mydir/cvsweb.conf", '/usr/local/etc/cvsweb/cvsweb.conf') {
-+for ("$mydir/cvsweb.conf", '%%CONFDIR%%/cvsweb/cvsweb.conf') {
++for ("$mydir/cvsweb.conf", '/var/www/conf/cvsweb/cvsweb.conf') {
if (defined($_) && -r $_) {
$config = $_;
last;
-@@ -193,7 +193,7 @@ $tmpdir = defined($ENV{TMPDIR}) ? $ENV{T
+@@ -193,7 +193,7 @@ $tmpdir = defined($ENV{TMPDIR}) ? $ENV{TMPDIR} : "/var
$LOG_FILESEPARATOR = q/^={77}$/;
$LOG_REVSEPARATOR = q/^-{28}$/;
@@ -37,6 +37,24 @@ $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/0
);
@LOGSORTKEYS = qw(cvs date rev);
+@@ -1723,7 +1718,7 @@ sub doAnnotate($$) {
+ $lineNr++;
+ (my $lrev = substr($_, 2, 13)) =~ y/ //d;
+ (my $lusr = substr($_, 16, 9)) =~ y/ //d;
+- my $line = substr($_, 36);
++ my $line = substr($_, 37);
+ my $isCurrentRev = ($rev eq $lrev);
+
+ # we should parse the date here ..
+@@ -1752,7 +1747,7 @@ sub doAnnotate($$) {
+
+ printf "%s%s %-8s %4d:", $revprint,
+ $isCurrentRev ? '!' : ' ', $usrprint, $lineNr;
+- print spacedHtmlText($line, $d{'tabstop'});
++ print " ", spacedHtmlText($line, $d{'tabstop'});
+
+ print "</b>" if ($isCurrentRev && $is_textbased);
+ } elsif ($words[0] eq "ok") {
@@ -2013,20 +2008,6 @@ sub doDiff($$$$$$) {
my @difftype = @{$difftype->{'opts'}};
