From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (fantadrom.bsd.lv [local])
	by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 0f1217ab
	for <source@mandoc.bsd.lv>;
	Thu, 21 Mar 2019 10:53:39 -0500 (EST)
Date: Thu, 21 Mar 2019 10:53:39 -0500 (EST)
X-Mailinglist: mandoc-source
Reply-To: source@mandoc.bsd.lv
MIME-Version: 1.0
From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: cvsweb: merge patch-cvsweb_cgi rev.
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8
Message-ID: <e3fc833ecf351f3c@fantadrom.bsd.lv>

Log Message:
-----------
merge patch-cvsweb_cgi rev. 1.10 from the OpenBSD port, tweaked by me

original commit message:
date: 2003/08/16 18:12:10;  author: naddy;
excise functions that require GNU diff; prodding by jolan@

Tags:
----
FreeBSD-cvsweb-2_0-branch

Modified Files:
--------------
    cvsweb:
        cvsweb.cgi
        cvsweb.conf

Revision Data
-------------
Index: cvsweb.conf
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.conf,v
retrieving revision 3.36.2.4
retrieving revision 3.36.2.5
diff -Lcvsweb.conf -Lcvsweb.conf -u -p -r3.36.2.4 -r3.36.2.5
--- cvsweb.conf
+++ cvsweb.conf
@@ -290,13 +290,6 @@ $hr_breakable = 1;
 # ( '-p' option to diff)
 $showfunc = 1;
 
-# For each pair of regexps, files that match the first regexp will be diff'ed
-# with an '-F' option with the second regexp.
-%funcline_regexp = (
-	"\\.(4th|fr)\$" => "\\(^\\|[ \t]\\): ",
-	"\\.rb\$"       => "^[\t ]*\\(class\\|module\\|def\\) ",
-);
-
 # ignore whitespaces for human readable diffs
 # (indendation and stuff ..)
 # ( '-w' option to diff)
Index: cvsweb.cgi
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v
retrieving revision 3.119.2.9
retrieving revision 3.119.2.10
diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r3.119.2.9 -r3.119.2.10
--- cvsweb.cgi
+++ cvsweb.cgi
@@ -68,7 +68,7 @@ use vars qw (
     $checkoutMagic $doCheckout $scriptname $scriptwhere
     $where $pathinfo $Browser $nofilelinks $maycompress
     @stickyvars @unsafevars
-    %funcline_regexp $is_mod_perl
+    $is_mod_perl
     $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
     %input $query $barequery $sortby $bydate $byrev $byauthor
     $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
@@ -193,7 +193,7 @@ $tmpdir = defined($ENV{TMPDIR}) ? $ENV{T
 $LOG_FILESEPARATOR = q/^={77}$/;
 $LOG_REVSEPARATOR  = q/^-{28}$/;
 
-@DIFFTYPES = qw(h H u c s);
+@DIFFTYPES = qw(h H u c);
 @DIFFTYPES{@DIFFTYPES} = (
 	{
 		'descr'   => 'colored',
@@ -215,11 +215,6 @@ $LOG_REVSEPARATOR  = q/^-{28}$/;
 		'opts'    => ['-c'],
 		'colored' => 0,
 	},
-	{
-		'descr'   => 'side by side',
-		'opts'    => ['--side-by-side', '--width=164'],
-		'colored' => 0,
-	},
 );
 
 @LOGSORTKEYS = qw(cvs date rev);
@@ -2020,16 +2015,7 @@ sub doDiff($$$$$$) {
 
 	# apply special options
 	if ($showfunc) {
-		push @difftype, '-p' if $f ne 's';
-
-		my ($re1, $re2);
-
-		while (($re1, $re2) = each %funcline_regexp) {
-			if ($fullname =~ /$re1/) {
-				push @difftype, '-F', $re2;
-				last;
-			}
-		}
+		push @difftype, '-p';
 	}
 
 	if ($human_readable) {
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv