diff --git a/en/cgi/Makefile b/en/cgi/Makefile
index 8b4420e192..d52160f66a 100644
--- a/en/cgi/Makefile
+++ b/en/cgi/Makefile
@@ -1,43 +1,42 @@
-# $FreeBSD: www/en/cgi/Makefile,v 1.30 2006/07/23 23:47:34 simon Exp $
+# $FreeBSD: www/en/cgi/Makefile,v 1.31 2006/08/29 19:46:27 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+= html.pl
CGI=
CGI+= confirm-code.cgi
CGI+= cvsweb.cgi
CGI+= dosendpr.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/html.pl b/en/cgi/html.pl
deleted file mode 100755
index b61ab22447..0000000000
--- a/en/cgi/html.pl
+++ /dev/null
@@ -1,212 +0,0 @@
-# $NetBSD: html.pl,v 1.2 1996/06/14 19:52:38 thorpej Exp $
-#
-# perl routines to help generate html from cgi scripts in perl.
-#
-# written by Philip A. Nelson, 1995 and 1996.
-#
-# Copyright (c) 1995, 1996 Philip A. Nelson.
-#
-# Last modified: May 13, 1996.
-#
-# Copying and distribution permitted under the conditions of the
-# GNU General Public License Version 2.
-# (http://www.gnu.ai.mit.edu/copyleft/gpl.html)
-#
-# $FreeBSD$
-
-#
-# typical use is &www_content ("text","html");
-# Should be the first output from a cgi script.
-#
-sub www_content {
- print "Content-type: $_[0]/$_[1]\n\n";
-}
-
-#
-# &html_title ( title, other_head_html )
-# Starts the html with a head and title.
-#
-sub html_title {
- print "\n
\n$_[0]\n$_[1]\n\n";
-}
-
-#
-# &html_body (Body_tag_attributes);
-#
-sub html_body {
- print "\n";
-}
-
-#
-# Last call to end a complete html page.
-# &html_end();
-#
-sub html_end {
- print "\n\n";
-}
-
-#
-# &www_href (URL, link text, anchor_name)
-# link text and anchor name are optional.
-# If no link text, no is generated.
-#
-sub html_href {
- print ""; }
-}
-
-#
-# &cgi_form_in();
-#
-# Form support:
-# Defines:
-# $cgi_data{$key} the data indexed by the key.
-# keys repeated twice gets data collected in
-# $cgi_data{$key} separated by "|"s.
-#
-# @keys (sequential list of keys)
-# @vals (sequential list of values)
-# $cgi_method
-#
-sub cgi_form_in {
- local ($data);
- $cgi_method = $ENV{'REQUEST_METHOD'};
- if ($cgi_method eq 'GET') {
- $data = $ENV{'QUERY_STRING'};
- } else {
- read(STDIN,$data,$ENV{'CONTENT_LENGTH'});
- }
- @lines = split (/&/, $data);
- $nkeys = 0;
- foreach $line (@lines) {
- ($key,$val) = split (/=/, $line);
- $val =~ s/\+/ /g;
- $val =~ s/%([0-9A-Fa-f][0-9A-Fa-f])/pack("C",hex($1))/eg ;
- if ($cgi_data{$key}) {
- $cgi_data{$key} = $cgi_data{$key}."|".$val;
- } else {
- $cgi_data{$key} = $val;
- }
- push (@keys, "$key");
- push (@vals, "$val");
- $nkeys += 1;
- }
-}
-
-#
-# Form creation routines
-#
-
-#
-# &html_form (action) - form with post method
-#
-sub html_form {
- print "\n";
-}
-
-#
-# &html_input (type, name, value, size, maxlength, checked)
-#
-sub html_input {
- local ($type, $name, $value, $size, $maxlength, $checked) = @_;
- print "\n";
-}
-
-#
-# &html_radio (name, value_list)
-#
-sub html_radio {
- local ($name, @values) = @_;
- foreach $val (@values) {
- &html_input ("radio", $name, $val);
- }
-}
-
-#
-# &html_checkbox (name, values)
-# checked values include a : which is removed.
-#
-sub html_checkbox {
- local ($name, @values) = @_;
- foreach $val (@values) {
- $val1 = $val;
- $val1 =~ s/://;
- if ($val eq $val1)
- { &html_input ("checkbox", $name, $val); }
- else
- { &html_input ("checkbox", $name, $val1,"" ,"" ,"checked"); }
- print $val1;
- }
-}
-
-#
-# &htlm_select (name, options ...)
-#
-# options including : are selected and the : is removed.
-#
-sub html_select {
- local ($name, @options) = @_;
- print "\n";
-}
-
-#
-# &htlm_selectmult (name, options ...)
-#
-# allow multiple selections
-#
-sub html_selectmult {
- local ($name, @options) = @_;
- print "\n";
-}
-
-#
-# &html_textarea (name, rows, cols, value);
-#
-sub html_textarea {
- local ($name, $rows, $cols, $value) = @_;
- print "";
-}
-
-# return true!
-1;