===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.26
retrieving revision 1.35
diff -u -p -r1.26 -r1.35
--- cvsweb/cvsweb.cgi	1998/11/10 19:26:16	1.26
+++ cvsweb/cvsweb.cgi	1999/09/17 18:56:44	1.35
@@ -28,7 +28,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $fId: cvsweb.cgi,v 1.25 1998/08/24 16:41:42 wosch Exp $
+# $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.34 1999/09/08 13:04:09 peter Exp $
 #
 
 
@@ -71,6 +71,8 @@ require 'cgi-style.pl';
 
 %mirrors = (
 	    'Germany', 'http://www.de.freebsd.org/cgi/cvsweb.cgi',
+	    'Spain', 'http://www.es.freebsd.org/cgi/cvsweb.cgi',
+	    'California', 'http://www.freebsd.org/cgi/cvsweb.cgi',
 	    'Japan', 'http://www.jp.freebsd.org/cgi/cvsweb.cgi',
 	   );
 
@@ -143,6 +145,10 @@ if (!-d $cvsroot) {
 	&fatal("500 Internal Error",'$CVSROOT not found!<P>The server on which the CVS tree lives is probably down.  Please try again in a few minutes.');
 }
 
+# Set up for FreeBSD repo options.
+$ENV{'RCSLOCALID'} = 'FreeBSD=CVSHeader';
+$ENV{'RCSINCEXC'}  = 'iFreeBSD';
+$ENV{'CVSROOT'}    = $cvsroot;
 
 {
     local(@foo, $i);
@@ -153,7 +159,7 @@ if (!-d $cvsroot) {
 	}
     }
     if ($#foo > 1) {
-	$intro .= "<p>\nThis script support the following CVS trees:\n";
+	$intro .= "<p>\nThis script supports the following CVS trees:\n";
 	for($i = 0; $i <= $#foo; $i++) {
 	    $intro .= qq{<a href="$scriptname?cvsroot=$foo[$i]">} .
 		($CVSROOTdescr{$foo[$i]} ? 
@@ -327,7 +333,7 @@ sub htmlify {
 	$string =~ s/>/&gt;/g;
 
 	if ($pr) {
-		$string =~ s|\bpr(\W+[a-z]+/\W*)(\d+)|<A HREF=/cgi/query-pr.cgi?pr=$2>$&</A>|ig;
+		$string =~ s!\b((pr[:#]?\s*#?)|((bin|conf|docs|gnu|i386|kern|misc|ports)\/))(\d+)\b!<A HREF=http://www.freebsd.org/cgi/query-pr.cgi?pr=\5>$&</A>!ig;
 	}
 
 	$string;
@@ -427,7 +433,9 @@ sub checkout {
 		"Unexpected output from co: $_");
 	}
 	$_ = <RCS>;
-	if (/^revision\s+$rev\s*$/) {
+	if ($rev eq ".") {
+	    # latest rev requested, don't check
+	} elsif (/^revision\s+$rev\s*$/) {
 	    # As expected
 	} else {
 	    &fatal("500 Internal Error",