===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.23
retrieving revision 1.34
diff -u -p -r1.23 -r1.34
--- cvsweb/cvsweb.cgi	1998/08/15 09:59:11	1.23
+++ cvsweb/cvsweb.cgi	1999/09/08 13:04:09	1.34
@@ -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.22 1998/08/13 10:35:26 wosch Exp $
+# $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.33 1999/09/06 07:02:40 peter Exp $
 #
 
 
@@ -62,15 +62,20 @@ require 'cgi-style.pl';
 %CVSROOT = (
 	    'freebsd', '/home/ncvs',
 	    'learn', '/c/learncvs',
-	    'mozilla', '/a/mozilla-cvs',
 	    );
 
 %CVSROOTdescr = (
 	    'freebsd', 'FreeBSD',
 	    'learn', 'Learn',
-	    'mozilla', 'Mozilla FreeBSD',
 	    );
 
+%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',
+	   );
+
 $cvstreedefault = 'freebsd';
 $cvstree = $cvstreedefault;
 $cvsroot = $CVSROOT{"$cvstree"} || "/home/ncvs";
@@ -140,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);
@@ -150,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]} ? 
@@ -161,6 +170,20 @@ if (!-d $cvsroot) {
 }
 
 
+{
+    local(@mirrors) = sort keys %mirrors;;
+    if ($#mirrors >= 0) {
+	$intro .= "<p>\nThis script is mirrored in:\n";
+	local($m);
+	for($m = 0; $m <= $#mirrors; $m++) {
+	    $intro .= qq(<a href="$mirrors{$mirrors[$m]}">$mirrors[$m]</a>);
+	    $intro .= ',' if $m != $#mirrors;
+	    $intro .= "\n";
+	}
+    }
+}
+
+
 if (-d $fullname) {
 	opendir(DIR, $fullname) || &fatal("404 Not Found","$where: $!");
 	@dir = readdir(DIR);
@@ -310,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;
@@ -410,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",
@@ -704,7 +729,7 @@ sub dolog {
 		print " <i>(vendor branch)</i>";
 	    }
 	    print " <i>" . &ctime($date{$_}) . " UTC</i> by ";
-	    print "<i>" . $author{$_} . "</i>\n";
+	    print "<i><a href=\"mailto:" . $author{$_} . "\@FreeBSD.org\">" . $author{$_} . "</a></i>\n";
 	    if ($revsym{$_}) {
 		print "<BR>CVS Tags: <b>$revsym{$_}</b>";
 	    }