diff --git a/en/ports/Makefile b/en/ports/Makefile
index 9ffa668913..3657b9c4a0 100644
--- a/en/ports/Makefile
+++ b/en/ports/Makefile
@@ -1,75 +1,67 @@
-# $FreeBSD: www/en/ports/Makefile,v 1.29 2000/10/06 15:49:00 phantom Exp $
+# $FreeBSD: www/en/ports/Makefile,v 1.30 2000/11/07 04:05:21 kuriyama Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 .if exists(Makefile.inc)
 .include "Makefile.inc"
 .endif
 
 CVS_READONLY?=	YES
 CVS_OPT+=	-Q
 .if !empty(CVS_READONLY)
 CVS_OPT+=	-R
 .endif
 
 #
 # This hack is allows to build www/ tree for case when ports/ located
 # in other repository, for example Repository of Translation Project
 #
 .if defined(PORTSCVSROOT) && !empty(PORTSCVSROOT)
 CVS_OPT+=	-d ${PORTSCVSROOT}
 .endif
 
 .if defined(NOPORTSCVS)
 ${INDEX}: $${PORTSBASE}/${PINDEX}
 	cp ${PORTSBASE}/${PINDEX} ${INDEX}
-
-${Y2K}: $${PORTSBASE}/${PY2K}
-	cp ${PORTSBASE}/${PY2K} ${Y2K}
-
 .else
 ${INDEX}: ${cvsindex}
 	cvs ${CVS_OPT} co -p ${PINDEX} > ${INDEX}
-
-${Y2K}: ${cvsy2k}
-	cvs ${CVS_OPT} co -p ${PY2K} > ${Y2K}
-
 .endif
 
 # build the list of available packages only on the 
 # main FreeBSD machines
 hostname!= hostname
 
 .if defined(NOPORTSCVS)
 packages.exists:
 .else
-packages.exists: ${cvsindex} ${cvsy2k}
+packages.exists: ${cvsindex}
 .endif
 .if ${hostname} == "hub.freebsd.org" || ${hostname} == "freefall.freebsd.org"
 	@if sh ${.CURDIR}/packages > ${.TARGET}.temp; then \
 		mv ${.TARGET}.temp ${.TARGET}; \
 	else \
 		rm ${.TARGET}.temp; touch ${.TARGET}; \
 	fi;
 .else
 	touch ${.TARGET}
 .endif
 
 Makefile.gen: index.sgml .NOTMAIN
 	echo DOCS= *.sgml > Makefile.gen
 
-index.sgml: ${INDEX} ${Y2K} categories packages.exists portindex ports.inc .NOTMAIN
+index.sgml: ${INDEX} categories packages.exists portindex ports.inc .NOTMAIN
 	rm -f *.sgml
-	${PORTINDEX} ${INDEX} ${Y2K} ${.CURDIR}
+	${PORTINDEX} ${INDEX} ${.CURDIR}
 
 install: all
 
 all install clean:
 	(cd ${.CURDIR} && ${MAKE}  ${MAKEFLAGS} -f Makefile.inc0 ${.TARGET})
 
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/ports/Makefile.inc b/en/ports/Makefile.inc
index 6e0e6dbd80..1d98fc2fb2 100644
--- a/en/ports/Makefile.inc
+++ b/en/ports/Makefile.inc
@@ -1,21 +1,17 @@
-# $FreeBSD: www/en/ports/Makefile.inc,v 1.2 2000/02/28 12:46:07 phantom Exp $
+# $FreeBSD: www/en/ports/Makefile.inc,v 1.3 2000/04/20 16:42:04 phantom Exp $
 
 PORTINDEX=	${PERL} ${.CURDIR}/portindex
 INDEX=		INDEX
 PINDEX=		ports/${INDEX}
-Y2K=		YEAR2000
-PY2K=		ports/${Y2K}
 
 COOKIE=		${INDEX} Makefile.gen
 
 CLEANFILES+=	${INDEX} 
-CLEANFILES+=	${Y2K}
 CLEANFILES+=	packages.exists.temp  packages.exists
 CLEANFILES+= 	${DOCS} 
 CLEANFILES+=	Makefile.gen
 
 cvsindex= $${CVSROOT}/${PINDEX},v
-cvsy2k= $${CVSROOT}/${PY2K},v
 
-_ALLINSTALL= packages.exists ${INDEX} ${Y2K}
+_ALLINSTALL= packages.exists ${INDEX}
 
diff --git a/en/ports/portindex b/en/ports/portindex
index 905a780da5..ead29b2029 100755
--- a/en/ports/portindex
+++ b/en/ports/portindex
@@ -1,293 +1,274 @@
 #!/usr/bin/perl
 
 # convert a ports INDEX file to HTML
 #
 # by John Fieber <jfieber@freebsd.org>
 # Mon May 13 10:31:58 EST 1996
 
 ############################################################
 
 # Load local config file. You can override in portindex.conf
 # the variables for the default web and the ftp server. This
 # make it easy to maintain a local web mirror and let the
 # URL point to yourself and not to the standard FreeBSD FTP server.
 $config = $0 . '.' . 'conf';
 do $config if -f $config;
 
 # This is the base of where we ftp stuff from
 if ($ENV{'MASTER_FTP_SERVER'}) {
     $ftpserver = $ENV{'MASTER_FTP_SERVER'};
 } else {
     $ftpserver = 'ftp://ftp.freebsd.org' if !$ftpserver;
 }
 $base = "$ftpserver/pub/FreeBSD/branches/-current" if !$base;
 $baseHTTP = $base if !$baseHTTP;
 $urlcgi = 'http://www.freebsd.org/cgi/url.cgi' if !$urlcgi;
 $packagesURL = "$ftpserver/pub/FreeBSD/ports/i386/packages-stable/All/"
     if !$packagesURL;
 # support tar on the fly or gzip'ed tar on the fly
 $ftparchive = 'tar' if !$ftparchive;
 
 
 # ports download sources script
 $pds = 'http://www.freebsd.org/cgi/pds.cgi';
 
 # better layout and link to the sources
 if ($urlcgi) {
     $baseHTTP = $urlcgi . '?' . $baseHTTP;
 }
 
 $today = &getdate;
 
 &packages_exist('packages.exists', *packages);
 &category_description(($ARGV[2] || '.') . '/categories', *category_description);
-&y2k_statements;
 &main;
 
-sub y2k_statements {
-
-    open(Y2K, $ARGV[1]);
-    while(<Y2K>) {
-      chop();
-      ( $dir, $url ) = split(/\s+/);
-      $dir = $base . "/" . $dir;
-      $y2k{$dir} = $url;
-      
-    }
-    close(Y2K);
-
-}
-
 sub getdate {
     @months = ("January", "February", "March", "April", "May","June",
 	       "July", "August", "September", "October", "November", "December");
     ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
     $year += 1900;
     return "Last modified: $mday-$months[$mon]-$year";
 }
 
 sub header {
     local ($fh, $htext) = @_;
     print $fh "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 3.2//EN\" [\n";
     print $fh "<!ENTITY base CDATA '..'>";
     print $fh "<!ENTITY date  \"<em>$today</em>\">\n";
     print $fh "<!ENTITY title '$htext'>";
     print $fh "<!ENTITY blurb  SYSTEM \"ports.inc\">\n";
     print $fh "<!ENTITY % includes SYSTEM \"../includes.sgml\">\n";
     print $fh "<!ENTITY email 'ports'>";
     print $fh "%includes;\n";
     print $fh "]>\n";
     print $fh "<html>&header;\n";
 }
 
 sub footer {
     local ($fh, $ftext) = @_;
     print $fh "\n$ftext\n";
     print $fh "&footer;\n";
     print $fh "</BODY>\n</HTML>\n";
 }
 
 sub packages_exist {
     local($file, *p) = @_;
 
     open(P, $file) || do {
 	warn "open $file: $!\n";
 	warn "Cannot create packages links\n";
 	return 1;
     };
 
     while(<P>) {
 	chop;
 	$p{$_} = 1;
     }
     close P;
     return 0;
 }
 
 sub category_description {
     local($file, *p) = @_;
 
     open(P, $file) || do {
 	warn "open $file: $!\n";
 	warn "Cannot find category description\n";
 	return 1;
     };
 
     local($category, $description);
     while(<P>) {
 	# ignore comments
 	next if /^\s*#/;
 
        ($category, $description) = /^\s*"([^"]+)",\s*"([^"]+)/;
 	$p{$category} = $description;
     }
     close P;
     return 0;
 }
 
 sub main {
 
     $sep = "<B>:</B>";
 
     open(INDEX, $ARGV[0]);
     while (<INDEX>) {
 	chop;
 	s/&/&amp;/g;
     	s/</&lt;/g;
     	s/>/&gt;/g;
 
     	# Read a record
 	($name, $loc, $prefix, $desc, $ldesc, $owner, $cats, 
 	    $bdep, $rdep, $www) = split('\|');
 
 	# Check for double hyphens in the name (--).
 	$name =~ s/--/-/g;
 
     	# Split the categories into an array
 	@cat = split("[ \t]+", $cats);
 
     	$catkey{$name} = $cat[0];
 
 	local($sourcepath) = $loc;
 	$sourcepath =~ s%/usr/%%;
 	
 	foreach $i (@cat) {
 
 	    $stats{$i}++;
 
     	    # figure out the FTP url
 	    $loc =~ s/\/usr/$base/;
 	    $ldesc =~ s/\/usr/$baseHTTP/;
 
     	    # The name description and maintainer
 	    $data{$i} .= "<DT><B><A NAME=\"$name\"></A><A HREF=\"$loc.$ftparchive\">$name</A></B> ";
      
 
 	    $data{$i} .= "<DD>$desc<BR><A HREF=\"$ldesc\">Long description</A>";
 	    if ($packages{"$name.tgz"}) { 
 		$data{$i} .= qq{ | <a href="$packagesURL$name.tgz">Package</a>};
 	    }
 
 	    $data{$i} .= qq{ | <A HREF="$pds?$sourcepath">Sources</A>};
 
-            if ($y2k{"$loc"}) {
-		$data{$i} .= qq{ | <a href="$y2k{$loc}">Y2K</a>};
-            }
-
             if ($www ne "") {
 		$data{$i} .= qq{ | <a href="$www">Main Web Site</a>};
             }
 
     	    $ownerurl = $owner;
     	    $ownerurl =~ s/&lt;/</g;
     	    $owenrurl =~ s/&gt;/>/g;
 	    $data{$i} .= 
 		"<BR><I>Maintained by:</I> <A HREF=\"mailto:$ownerurl\">$owner</A>";
 
     	    # If there are any dependencies, list them
     	    if ($bdep ne "" || $rdep ne "") {
     	    	$data{$i} .= "<BR><I>Requires:</I> ";
     	    	@dep = split(/ /, "$bdep $rdep");
 		local($last) = '';
     	    	foreach $j (sort @dep) {
 		    next if $j eq $last;
 		    $last = $j;
     	    	    $data{$i} .= " <A HREF=\"##$j##.html#$j\">$j</A>,";
     	    	}
     	    	# remove the trailing comma
     	    	chop $data{$i};
     	    }
 
     	    # If the port is listed in more than one category, throw
     	    # in some cross references
     	    if ($#cat > 0) {
     	    	$data{$i} .= "<BR><EM>Also listed in:</EM> ";
     	    	foreach $j (@cat) {
     	    	    if ($j ne $i) {
 			if ($j eq $cat[0]) {
 			    $data{$i} .= " <STRONG><A HREF=\"$j.html#$name\">\u$j</A></STRONG>,";
 			}
 			else {
 			    $data{$i} .= " <A HREF=\"$j.html#$name\">\u$j</A>,";
 			}
     	    	    }
     	    	}
     	    	# remove the trailing comma
     	    	chop($data{$i});
     	    }
     	    $data{$i} .= "<P></P></DD>\n"
 	}
 
     	# Add an entry to the master index
 
 	# workaround for SGML bug, `--' is not allowed in comments
 	local ($sname) = $name; 
 	$sname =~ s/--/-=/g;
     	$master[$portnumber] = 
     	    "<!-- $sname --><STRONG><A HREF=\"$cat[0].html#$name\">$name</A></STRONG> " .
     	    " -- <EM>$desc</EM><BR>\n";
 	$portnumber++;
     }
 
     open(MOUTF, ">index.sgml");
 
     &header(MOUTF, "FreeBSD Ports");
 #    print MOUTF "<!--#include virtual=\"./ports.inc\" -->\n";
     print MOUTF "&blurb;";
     print MOUTF "<hr><P>There are currently $portnumber ports in the
 FreeBSD Ports Collection.<br> <A HREF=\"$base/ports.tar.gz\">Download
 a gzip'd tar file of all $portnumber ports</A> (about 10 megabytes) or
 browse the following categories:\n";
 
     print MOUTF "<UL>\n";
 
     @foos = sort(keys %stats);
     foreach $key  (@foos) {
 	# For the master file...
 	print MOUTF 
 	    "<LI><A HREF=\"$key.html\">\u$key</A> <em>($stats{$key})</em>";
 	if ($category_description{$key}) {
 	    print MOUTF " -- " . $category_description{$key};
 	}
 
 	# Someone forgot to add a category to the description file
 	# or there is a typo in the category field.
 	else {
 	    warn "No description found for category: ``$key''!\n";
 	    warn "Please fix me or send an E-Mail to doc\@FreeBSD.org\a\n";
 	    sleep(3);
 	}
 	print MOUTF "</LI>\n";
 
 	# Create the category file
 	open(OUTF, ">$key.sgml");
 	&header(OUTF, "FreeBSD Ports: \u$key");
 	if ($category_description{$key}) {
 	    print OUTF "<h3>", $category_description{$key}, "</h3>\n";
 	}
 	print OUTF "<DL>\n";
 	$d = join("\n", sort(split(/\n/, $data{$key})));
     	$d =~ s/##([^#]*)##/$catkey{$1}/g;
 	print OUTF $d;
 	print OUTF "</DL>\n";
 	&footer(OUTF, "<p></p><A HREF=\"index.html\">Port Categories</A>" .
 	    " -- <A HREF=\"master-index.html\">Index</A>");
 	close(OUTF);
 
     }
     print MOUTF "</UL>\n";
     print MOUTF 
     	"<UL><LI><A HREF=\"master-index.html\">Alphabetical list of all $portnumber ports</A></LI></UL>\n";
     &footer(MOUTF, "");
     close(MOUTF);
 
     # Create the master index file
     open(MINDEX, ">master-index.sgml");
     &header(MINDEX, "FreeBSD Ports Collection Index");
     print MINDEX "<P>\n";
     print MINDEX sort @master;
     print MINDEX "</P>";
     &footer(MINDEX, "<A HREF=\"index.html\">Port Categories</A>");
     close(MINDEX);
     close(INDEX);
 }