diff --git a/en/cgi/Makefile b/en/cgi/Makefile
index fc1fc63ad5..8b4420e192 100644
--- a/en/cgi/Makefile
+++ b/en/cgi/Makefile
@@ -1,45 +1,43 @@
-# $FreeBSD: www/en/cgi/Makefile,v 1.29 2005/12/04 16:18:40 ceri Exp $
+# $FreeBSD: www/en/cgi/Makefile,v 1.30 2006/07/23 23:47:34 simon Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
.if exists(../Makefile.inc)
.include "../Makefile.inc"
.endif
DATA=
DATA+= Gnats.pm
DATA+= cgi-lib.pl
DATA+= cgi-style.pl
DATA+= cvsweb.conf
DATA+= cvsweb.conf-freebsd
DATA+= cvsweb.conf-netbsd
DATA+= cvsweb.conf-openbsd
-DATA+= ftp.mirrors
DATA+= html.pl
CGI=
CGI+= confirm-code.cgi
CGI+= cvsweb.cgi
CGI+= dosendpr.cgi
-CGI+= ftp.cgi
CGI+= getmsg.cgi
CGI+= mailindex.cgi
CGI+= man.cgi
CGI+= mid.cgi
CGI+= mirror.cgi
CGI+= missing_handler.cgi
CGI+= monthly.cgi
CGI+= pds.cgi
CGI+= ports.cgi
CGI+= query-pr.cgi
CGI+= query-pr-summary.cgi
CGI+= search.cgi
CGI+= url.cgi
.SUFFIXES: .C .cgi
.C.cgi:
${CXX} ${CFLAGS} -o ${.TARGET} ${.IMPSRC}
.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/cgi/ftp.cgi b/en/cgi/ftp.cgi
deleted file mode 100755
index 2029535f9c..0000000000
--- a/en/cgi/ftp.cgi
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/perl -T
-#
-# $FreeBSD: www/en/cgi/ftp.cgi,v 1.3 2000/04/03 08:45:51 phantom Exp $
-
-require './cgi-lib.pl';
-require './cgi-style.pl';
-
-
-$newloc = "http://www.FreeBSD.org/";
-
-print &html_header("FTP Download");
-
-open (MIRRORS, "ftp.mirrors");
-
-print "
Download $ARGV[0] from one of the following mirror sites:
\n";
-
-$oldplace = "";
-
-while () {
- if (/.*:.*:/ && !/^#/) {
- ($place, $site, $root) = split(':',$_);
- chop $root; $root =~ s/ *$//;
- if ($place ne $oldplace) {
- if ($oldplace ne "") {
- print "\n";
- }
- print "$place\n\n";
- $oldplace = $place;
- }
- print "- $site
\n";
- }
-}
-
-close (MIRRORS);
-
-print "
\n";
-print &html_footer;
diff --git a/en/cgi/ftp.mirrors b/en/cgi/ftp.mirrors
deleted file mode 100644
index f009164862..0000000000
--- a/en/cgi/ftp.mirrors
+++ /dev/null
@@ -1,126 +0,0 @@
-# List of FreeBSD FTP mirrors. See ftp.cgi for more comments
-#
-# $FreeBSD: www/en/cgi/ftp.mirrors,v 1.13 2002/11/18 19:47:44 will Exp $
-
-Argentina:ftp.ar.FreeBSD.org:/pub/FreeBSD
-
-Australia:ftp.au.FreeBSD.org:/pub/FreeBSD
-Australia:ftp2.au.FreeBSD.org:/pub/FreeBSD
-Australia:ftp3.au.FreeBSD.org:/pub/FreeBSD
-Australia:ftp4.au.FreeBSD.org:/pub/FreeBSD
-
-Austria (IPv6):ftp2.at.FreeBSD.org:/pub/FreeBSD
-
-Austria:ftp.at.FreeBSD.org:/pub/FreeBSD
-Austria:ftp2.at.FreeBSD.org:/pub/FreeBSD
-
-Brazil:ftp.br.FreeBSD.org:/pub/FreeBSD
-Brazil:ftp2.br.FreeBSD.org:/pub/FreeBSD
-Brazil:ftp3.br.FreeBSD.org:/pub/FreeBSD
-Brazil:ftp4.br.FreeBSD.org:/pub/FreeBSD
-Brazil:ftp5.br.FreeBSD.org:/pub/FreeBSD
-Brazil:ftp6.br.FreeBSD.org:/pub/FreeBSD
-Brazil:ftp7.br.FreeBSD.org:/pub/FreeBSD
-
-Canada:ftp.ca.FreeBSD.org:/pub/FreeBSD
-
-China:ftp.cn.FreeBSD.org:/pub/FreeBSD
-
-Czech Republic:ftp.cz.FreeBSD.org:/pub/FreeBSD
-
-Denmark:ftp.dk.FreeBSD.org:/pub/FreeBSD
-
-Estonia:ftp.ee.FreeBSD.org:/pub/FreeBSD
-
-Finland:ftp.fi.FreeBSD.org:/pub/FreeBSD
-
-France:ftp.fr.FreeBSD.org:/pub/FreeBSD
-France:ftp2.fr.FreeBSD.org:/pub/FreeBSD
-France:ftp3.fr.FreeBSD.org:/pub/FreeBSD
-
-Germany:ftp.de.FreeBSD.org:/pub/FreeBSD
-Germany:ftp2.de.FreeBSD.org:/pub/FreeBSD
-Germany:ftp3.de.FreeBSD.org:/pub/FreeBSD
-Germany:ftp4.de.FreeBSD.org:/pub/FreeBSD
-Germany:ftp5.de.FreeBSD.org:/pub/FreeBSD
-Germany:ftp6.de.FreeBSD.org:/pub/FreeBSD
-Germany:ftp7.de.FreeBSD.org:/pub/FreeBSD
-
-Hong Kong:ftp.hk.super.net:/pub/FreeBSD
-
-Hungary:ftp.hu.FreeBSD.org:/pub/FreeBSD
-
-Ireland:ftp.ie.FreeBSD.org:/pub/FreeBSD
-
-Japan:ftp.jp.FreeBSD.org:/pub/FreeBSD
-Japan:ftp2.jp.FreeBSD.org:/pub/FreeBSD
-Japan:ftp3.jp.FreeBSD.org:/pub/FreeBSD
-Japan:ftp4.jp.FreeBSD.org:/pub/FreeBSD
-Japan:ftp5.jp.FreeBSD.org:/pub/FreeBSD
-Japan:ftp6.jp.FreeBSD.org:/pub/FreeBSD
-
-Korea:ftp.kr.FreeBSD.org:/pub/FreeBSD
-Korea:ftp2.kr.FreeBSD.org:/pub/FreeBSD
-Korea:ftp3.kr.FreeBSD.org:/pub/FreeBSD
-Korea:ftp4.kr.FreeBSD.org:/pub/FreeBSD
-Korea:ftp5.kr.FreeBSD.org:/pub/FreeBSD
-Korea:ftp6.kr.FreeBSD.org:/pub/FreeBSD
-
-Lithuania:ftp.lt.FreeBSD.org:/pub/FreeBSD
-
-Netherlands:ftp.nl.FreeBSD.org:/pub/FreeBSD
-
-New Zeland:ftp.nz.FreeBSD.org:/pub/FreeBSD
-
-Norway:ftp.no.FreeBSD.org:/pub/FreeBSD
-Norway:ftp3.no.FreeBSD.org:/pub/FreeBSD
-
-Poland:ftp.pl.FreeBSD.org:/pub/FreeBSD
-
-Portugal:ftp.pt.FreeBSD.org:/pub/FreeBSD
-Portugal:ftp2.pt.FreeBSD.org:/pub/FreeBSD
-
-Russia:ftp.ru.FreeBSD.org:/pub/FreeBSD
-Russia:ftp2.ru.FreeBSD.org:/pub/FreeBSD
-Russia:ftp3.ru.FreeBSD.org:/pub/FreeBSD
-Russia:ftp4.ru.FreeBSD.org:/pub/FreeBSD
-
-Saudi Arabia:ftp.isu.net/pub/mirrors/ftp.freebsd.org
-
-South Africa:ftp.za.FreeBSD.org:/pub/FreeBSD
-South Africa:ftp2.za.FreeBSD.org:/pub/FreeBSD
-South Africa:ftp3.za.FreeBSD.org:/pub/FreeBSD
-
-Slovak Republic:ftp.sk.FreeBSD.org:/pub/FreeBSD
-
-Slovenia:ftp.si.FreeBSD.org:/pub/FreeBSD
-
-Spain:ftp.es.FreeBSD.org:/pub/FreeBSD
-
-Sweden:ftp.se.FreeBSD.org:/pub/FreeBSD
-Sweden:ftp2.se.FreeBSD.org:/pub/FreeBSD
-Sweden:ftp3.se.FreeBSD.org:/pub/FreeBSD
-
-Taiwan:ftp.tw.FreeBSD.org:/pub/FreeBSD
-Taiwan:ftp2.tw.FreeBSD.org:/pub/FreeBSD
-Taiwan:ftp3.tw.FreeBSD.org:/pub/FreeBSD
-Taiwan:ftp4.tw.FreeBSD.org:/pub/FreeBSD
-
-Thailand:ftp.nectec.or.th:/pub/FreeBSD
-
-Ukraine:ftp.ua.FreeBSD.org:/pub/FreeBSD
-
-United Kingdom:ftp.uk.FreeBSD.org:/pub/FreeBSD
-United Kingdom:ftp2.uk.FreeBSD.org:/pub/FreeBSD
-United Kingdom:ftp3.uk.FreeBSD.org:/pub/FreeBSD
-United Kingdom:ftp4.uk.FreeBSD.org:/pub/FreeBSD
-
-United States:ftp.FreeBSD.org:/pub/FreeBSD
-United States:ftp2.FreeBSD.org:/pub/FreeBSD
-United States:ftp3.FreeBSD.org:/pub/FreeBSD
-United States:ftp4.FreeBSD.org:/pub/FreeBSD
-United States:ftp5.FreeBSD.org:/pub/FreeBSD
-United States:ftp6.FreeBSD.org:/pub/FreeBSD
-United States:ftp7.FreeBSD.org:/pub/FreeBSD
-United States:ftp8.FreeBSD.org:/pub/FreeBSD
-United States:ftp9.FreeBSD.org:/pub/os/FreeBSD