3 files changed, 11 insertions, 9 deletions

diff --git a/website/content/en/cgi/cgi-style.pl b/website/content/en/cgi/cgi-style.pl
index 7a472103fc..2d02151496 100644
--- a/website/content/en/cgi/cgi-style.pl
+++ b/website/content/en/cgi/cgi-style.pl
@@ -151,7 +151,7 @@ $i_topbar = qq`
 	      <li><a href="$hsty_base/projects/index.html">Developers</a>
 		<ul>
 		  <li><a href="$hsty_base/projects/ideas/ideas.html">Project Ideas</a></li>
-		  <li><a href="//svnweb.FreeBSD.org">SVN Repository</a></li>
+		  <li><a href="//cgit.FreeBSD.org">GIT Repository</a></li>
 		</ul>
 	      </li>
 	    </ul>
diff --git a/website/content/en/cgi/man.cgi b/website/content/en/cgi/man.cgi
index 6f5acf4d5a..81bbe323d5 100755
--- a/website/content/en/cgi/man.cgi
+++ b/website/content/en/cgi/man.cgi
@@ -2002,7 +2002,7 @@ macros like `appeared in NetBSD version 1.2' are not supported.</li>
 <li>Some OSs provide only formatted manual pages (catpages), e.g., NetBSD
 and OpenBSD. In this case it is not possible to create Postscript
 and troff output.</li>
-<li>The <a href="https://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree?view=markup">
+<li>The <a href="https://cgit.freebsd.org/src/tree/share/misc/bsd-family-tree">
 Unix family tree, BSD part</a>.</li>
 <li>The <a href="https://www.freebsd.org/cgi/ports.cgi">
 FreeBSD Ports Changes</a> script.</li>
diff --git a/website/content/en/cgi/ports.cgi b/website/content/en/cgi/ports.cgi
index a927f2f46b..2162548251 100755
--- a/website/content/en/cgi/ports.cgi
+++ b/website/content/en/cgi/ports.cgi
@@ -110,7 +110,7 @@ sub init_variables {
     $remotePrefixHtml = "$hsty_base/ports";
 
     # Web interface for the Ports tree
-    $remotePrefixRepo = 'https://svnweb.FreeBSD.org/ports/head';
+    $remotePrefixRepo = 'https://cgit.FreeBSD.org/ports';
 
     # Ports documentation
     $portsDesc = "$hsty_base/ports/";
@@ -317,7 +317,7 @@ sub out {
         if ( !$out_sec || $1 ne $out_sec ) {
             print "</dl>\n" if $counter > 0;
             print qq{\n<h3>}
-              . qq{<a href="$remotePrefixHtml/$1.html">Category $1</a>}
+              . qq{<a href="$remotePrefixRepo/tree/$1">Category $1</a>}
               . "</h3>\n<dl>\n";
             $out_sec = $1;
         }
@@ -335,11 +335,13 @@ sub out {
     #$version =~ s/[\+,]/X/g;
 
     local ($l) = $path;
-    $l =~ s%^$remotePrefixFtp%$remotePrefixRepo%o;
-    $descfile =~ s%^$remotePrefixFtp%$remotePrefixRepo%o;
+    $l =~ s%^$remotePrefixFtp%$remotePrefixRepo/log%o;
+    local ($t) = $path;
+    $t =~ s%^$remotePrefixFtp%$remotePrefixRepo/tree%o;
+    $descfile =~ s%^$remotePrefixFtp%$remotePrefixRepo/plain%o;
 
     print
-      qq{<dt><b><a name="$version"></a><a href="$l">$version</a></b></dt>\n};
+      qq{<dt><b><a name="$version"></a><a href="$t">$version</a></b></dt>\n};
     print qq{<dd>}, &escapeHTML($comment), qq{<br />\n};
 
     print qq[<a href="$descfile?revision=HEAD">Description</a> <b>:</b>\n];
@@ -350,7 +352,7 @@ sub out {
 qq[<a href="$remotePrefixFtpPackages{$remotePrefixFtpPackagesDefault}/$version.$packageExt">Package</a> <b>:</b>\n];
     }
 
-    print qq[<a href="$l/?view=log">Changes</a> <br />\n];
+    print qq[<a href="$l">Changes</a> <br />\n];
 
     print qq{<i>Maintained by:</i> <a href="mailto:$email}
       . (
@@ -364,7 +366,7 @@ qq[<a href="$remotePrefixFtpPackages{$remotePrefixFtpPackagesDefault}/$version.$
     if ( $#s > 0 ) {
         print qq{<i>Also listed in:</i> };
         foreach (@s) {
-            print qq{<a href="$remotePrefixHtml/$_.html">$_</a> }
+            print qq{<a href="$remotePrefixRepo/tree/$_">$_</a> }
               if $_ ne $out_sec;
         }
         print "<br />\n";