svn commit: r39346 - in projects/sgml2xml: de_DE.ISO8859-1/htdocs/ports en_US.ISO8859-1/htdocs/ports ja_JP.eucJP/htdocs/ports ru_RU.KOI8-R/htdocs/ports

Gabor Kovesdan gabor at FreeBSD.org
Thu Aug 9 21:23:45 UTC 2012


Author: gabor
Date: Thu Aug  9 21:23:44 2012
New Revision: 39346
URL: http://svn.freebsd.org/changeset/doc/39346

Log:
  - XMLify the ports/ section of the webpages.  With this change the whole
    set of webpages should be now buildable in XML, however the build
    mechanism of the multimedia/ and ports/ sections do not really fit our
    infrastructure so these should probably be redesigned later to use
    XSLT.
  
  Approved by:	doceng (implicit)

Deleted:
  projects/sgml2xml/de_DE.ISO8859-1/htdocs/ports/portindex
Modified:
  projects/sgml2xml/de_DE.ISO8859-1/htdocs/ports/Makefile
  projects/sgml2xml/de_DE.ISO8859-1/htdocs/ports/Makefile.inc
  projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/Makefile
  projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/index.sgml
  projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/installing.sgml
  projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/portindex
  projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/ports.ent
  projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/references.sgml
  projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/searching.sgml
  projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/updating.sgml
  projects/sgml2xml/ja_JP.eucJP/htdocs/ports/Makefile
  projects/sgml2xml/ja_JP.eucJP/htdocs/ports/index.sgml
  projects/sgml2xml/ja_JP.eucJP/htdocs/ports/installing.sgml
  projects/sgml2xml/ja_JP.eucJP/htdocs/ports/portindex
  projects/sgml2xml/ja_JP.eucJP/htdocs/ports/ports.ent
  projects/sgml2xml/ja_JP.eucJP/htdocs/ports/references.sgml
  projects/sgml2xml/ja_JP.eucJP/htdocs/ports/searching.sgml
  projects/sgml2xml/ja_JP.eucJP/htdocs/ports/updating.sgml
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/ports/Makefile
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/ports/portindex
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/ports/ports.inc

Modified: projects/sgml2xml/de_DE.ISO8859-1/htdocs/ports/Makefile
==============================================================================
--- projects/sgml2xml/de_DE.ISO8859-1/htdocs/ports/Makefile	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/de_DE.ISO8859-1/htdocs/ports/Makefile	Thu Aug  9 21:23:44 2012	(r39346)
@@ -78,7 +78,7 @@ ports.size:
 # master-index.sgml, statistics.ent, <category>.sgml
 CATEGORYLIST=`grep "^[a-z]" categories | sed -e s"/,.*//"`
 categories-alpha.sgml: ${INDEX} categories categories.descriptions \
-	packages.exists portindex ports.ent ports.size .NOTMAIN
+	packages.exists ports.ent ports.size .NOTMAIN
 	${RM} -f categories-alpha.sgml categories-grouped.sgml \
 		master-index.sgml statistics.ent
 	for categoryfile in ${CATEGORYLIST}; do \

Modified: projects/sgml2xml/de_DE.ISO8859-1/htdocs/ports/Makefile.inc
==============================================================================
--- projects/sgml2xml/de_DE.ISO8859-1/htdocs/ports/Makefile.inc	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/de_DE.ISO8859-1/htdocs/ports/Makefile.inc	Thu Aug  9 21:23:44 2012	(r39346)
@@ -2,7 +2,7 @@
 # $FreeBSDde: de-www/ports/Makefile.inc,v 1.1 2007/03/31 14:27:06 jkois Exp $
 # basiert auf: 1.10
 
-PORTINDEX=	${PERL} ${.CURDIR}/portindex
+PORTINDEX=	${PERL} ${.CURDIR}/../../../en_US.ISO8859-1/htdocs/ports/portindex
 INDEX=		INDEX
 PINDEX=		ports/${INDEX}
 

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/Makefile
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/Makefile	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/Makefile	Thu Aug  9 21:23:44 2012	(r39346)
@@ -57,7 +57,6 @@ Makefile.gen: categories-alpha.sgml cate
 		${ECHO_CMD} -n " $$categoryfile.sgml" >> Makefile.gen; \
 	done
 	${ECHO_CMD} >> Makefile.gen
-.endif
 
 .if defined(CLUSTER_MACHINE)
 PORTS_TARGZ_URL?= ftp://ftp-master.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/index.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/index.sgml	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/index.sgml	Thu Aug  9 21:23:44 2012	(r39346)
@@ -3,6 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
 <!ENTITY base '..'>
 <!ENTITY title 'About FreeBSD Ports'>
+<!ENTITY % ports.ent SYSTEM "ports.ent">
 %ports.ent;
 <!ENTITY email 'ports'>
 %statistics.ent;
@@ -17,7 +18,7 @@
 
 &searchform;
 
-<HR>
+<hr/>
 
 <p>The FreeBSD Ports and Packages Collection offers a simple way for
 users and administrators to install applications.  There are currently
@@ -42,7 +43,7 @@ be committed.
 contains any patches necessary to make the original application source
 code compile and run on FreeBSD.  Installing an application is as
 simple as downloading the port, unpacking it and typing
-<a href="http://www.freebsd.org/cgi/man.cgi?query="make""><TT>make</TT></a>
+<a href="http://www.freebsd.org/cgi/man.cgi?query=make"><tt>make</tt></a>
 in the port directory.  However, the most convenient (and common) method
 is to download the framework for the entire list of ports by installing the
 <!--<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz">-->
@@ -52,21 +53,21 @@ thousands of applications right at your 
 </p>
 
 <p>
-Each port's <TT>Makefile</TT> automatically fetches the
+Each port's <tt>Makefile</tt> automatically fetches the
 application source code, either from a local disk, CD-ROM or via
-<a href="http://www.freebsd.org/cgi/man.cgi?query="ftp""><TT>ftp</TT></a>,
+<a href="http://www.freebsd.org/cgi/man.cgi?query=ftp"><tt>ftp</tt></a>,
 unpacks it on your system, applies the patches, and compiles.  If
-all went well, a simple <TT>make install</TT> will install the
+all went well, a simple <tt>make install</tt> will install the
 application and register it with the package system.</p>
 
-<p>For most ports, a precompiled <TT>package</TT> also exists, saving
+<p>For most ports, a precompiled <tt>package</tt> also exists, saving
 the user the work of having to compile anything at all.  Each port
 contains a link to its corresponding package and you may either simply
 download that file and then run the
-<a href="http://www.freebsd.org/cgi/man.cgi?query="pkg"_add"><TT>pkg_add</TT></a>
+<a href="http://www.freebsd.org/cgi/man.cgi?query=pkg_add"><tt>pkg_add</tt></a>
 command
 on it or you can simply grab the link location and hand it straight
-to <TT>pkg_add</TT> since it is capable of accepting FTP URLs as
+to <tt>pkg_add</tt> since it is capable of accepting FTP URLs as
 well as filenames.</p>
 
 </body>

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/installing.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/installing.sgml	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/installing.sgml	Thu Aug  9 21:23:44 2012	(r39346)
@@ -3,6 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
 <!ENTITY base '..'>
 <!ENTITY title 'Installing the FreeBSD Ports Collection'>
+<!ENTITY % ports.ent SYSTEM "ports.ent">
 %ports.ent;
 <!ENTITY email 'ports'>
 %statistics.ent;
@@ -17,10 +18,10 @@
 
 &searchform;
 
-<HR>
+<hr/>
 
 <p>If you are installing FreeBSD from CD-ROM or an ftp site, the
-  <a href="&base;/cgi/man.cgi?query="sysinstall""><TT>sysinstall</TT></a>
+  <a href="&base;/cgi/man.cgi?query=sysinstall"><tt>sysinstall</tt></a>
   application will allow you to install the Ports Collection directly.</p>
 
 <p>However, if you are not installing using that method, you may

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/portindex
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/portindex	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/portindex	Thu Aug  9 21:23:44 2012	(r39346)
@@ -5,6 +5,7 @@
 # by John Fieber <jfieber at FreeBSD.org>
 # Mon May 13 10:31:58 EST 1996
 # $FreeBSD$
+# basiert auf: 1.57
 
 ############################################################
 
@@ -63,7 +64,7 @@ category_groups(($ARGV[1] || '.') . '/ca
 main();
 
 sub getdate {
-    return POSIX::strftime("Last modified: %d-%B-%Y",localtime);
+    return POSIX::strftime("%d-%B-%Y", localtime);
 }
 
 sub header {
@@ -71,21 +72,28 @@ sub header {
     my $htext = shift;
     #local($fh, $htext) = @_;
     print $fh <<EOF;
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY base CDATA '..'>
-<!ENTITY date  "<em>$today</em>">
-<!ENTITY title '$htext'>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
+<!ENTITY base '..'>
 <!ENTITY % navinclude.ports "INCLUDE">
 <!ENTITY % ports.ent SYSTEM "ports.ent">
 %ports.ent;
 <!ENTITY email 'ports'>
 %statistics.ent;
 ]>
-<html>&header;
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>$htext</title>
+
+    <cvs:keyword xmlns:cvs=\"http://www.FreeBSD.org/XML/CVS\">x x x $today x x x</cvs:keyword>
+  </head>
+
+  <body class="navinclude.port">
 
 &searchform;
 
-<hr>
+<hr/>
 
 EOF
 }
@@ -97,9 +105,8 @@ sub footer {
 print $fh <<EOF;
 
 $ftext
-&footer;
-</BODY>
-</HTML>
+</body>
+</html>
 EOF
 }
 
@@ -206,17 +213,19 @@ sub main {
 	    $ldesc =~ s/\/usr\//$baseHTTP/;
 
 	    # The name description and maintainer
-	    $data{$i} .= "<DT><B><A NAME=\"$name\"></A><A HREF=\"$loc$ftparchive\">$name</A></B> ";
+	    $name =~ s/,.*//g;
+	    $name =~ s/\++//g;
+	    $data{$i} .= "<dt><b><a name=\"$name\"></a><a href=\"$loc$ftparchive\">$name</a></b></dt>";
      
 
-	    $data{$i} .= "<DD>$desc<BR><A HREF=\"$ldesc\">Long description</A>";
+	    $data{$i} .= "<dd>$desc<br/><a href=\"$ldesc\">Long description</a>";
 	    if ($packages{"$name.tbz"}) { 
 		$data{$i} .= qq{ | <a href="$packagesURL$name.tbz">Package</a>};
 	    } elsif ($packages{"$name.tgz"}) { 
 		$data{$i} .= qq{ | <a href="$packagesURL$name.tgz">Package</a>};
 	    }
 
-	    $data{$i} .= qq{ | <A HREF="$pds?$sourcepath">Sources</A>};
+	    $data{$i} .= qq{ | <a href="$pds?$sourcepath">Sources</a>};
 
 	    if ($www ne "") {
 		$data{$i} .= qq{ | <a href="$www">Main Web Site</a>};
@@ -226,17 +235,17 @@ sub main {
 	    $ownerurl =~ s/&lt;/</g;
 	    $ownerurl =~ s/&gt;/>/g;
 	    $data{$i} .= 
-		"<BR><I>Maintained by:</I> <A HREF=\"mailto:$ownerurl\">$owner</A>";
+		"<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> ";
+		$data{$i} .= "<br/><i>Requires:</i> ";
 		my @dep = split(/ /, "$bdep $rdep");
 		my $last = '';
 		foreach my $j (sort @dep) {
 		    next if $j eq $last;
 		    $last = $j;
-		    $data{$i} .= " <A HREF=\"##$j##.html#$j\">$j</A>,";
+		    $data{$i} .= " <a href=\"##$j##.html#$j\">$j</a>,";
 		}
 		# remove the trailing comma
 		chop $data{$i};
@@ -245,21 +254,21 @@ sub main {
 	    # 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> ";
+		$data{$i} .= "<br/><em>Also listed in:</em> ";
 		foreach my $j (@cat) {
 		    if ($j ne $i) {
 			if ($j eq $cat[0]) {
-			    $data{$i} .= " <STRONG><A HREF=\"$j.html#$name\">\u$j</A></STRONG>,";
+			    $data{$i} .= " <strong><a href=\"$j.html#$name\">\u$j</a></strong>,";
 			}
 			else {
-			    $data{$i} .= " <A HREF=\"$j.html#$name\">\u$j</A>,";
+			    $data{$i} .= " <a href=\"$j.html#$name\">\u$j</a>,";
 			}
 		    }
 		}
 		# remove the trailing comma
 		chop($data{$i});
 	    }
-	    $data{$i} .= "<P></P></DD>\n"
+	    $data{$i} .= "<p></p></dd>\n"
 	}
 
     	# Add an entry to the master index
@@ -268,8 +277,8 @@ sub main {
 	my $sname = $name; 
 	$sname =~ s/--/-=/g;
     	$master[$portnumber] = 
-    	    "<!-- $sname --><STRONG><A HREF=\"$cat[0].html#$name\">$name</A></STRONG> " .
-    	    " -- <EM>$desc</EM><BR>\n";
+    	    "<!-- $sname --><strong><a href=\"$cat[0].html#$name\">$name</a></strong> " .
+    	    " -- <em>$desc</em><br/>\n";
 	$portnumber++;
     }
 
@@ -279,20 +288,20 @@ sub main {
     header($moutf, "FreeBSD Ports Categories Listed By Groups");
 
     print $moutf <<EOF;
-<A NAME=\"top\"></A>
+<a name=\"top\"></a>
 EOF
 
     if ($portnumber eq '0') {
-      print $moutf "<P>none found</P>\n";
+      print $moutf "<p>none found</p>\n";
     } else {
     foreach my $cg (@category_groups) {
-	print $moutf "<H3>",$category_groups{$cg},"</H3>\n";
-	print $moutf "<UL>\n";
+	print $moutf "<h3>",$category_groups{$cg},"</h3>\n";
+	print $moutf "<ul>\n";
 	foreach my $key (sort(keys(%stats))) {
 	    next if ($category_description{$key}{group} ne $cg);
 	    # For the master file...
 	    print $moutf 
-		"<LI><A HREF=\"$key.html\">\u$key</A> <em>($stats{$key})</em>";
+		"<li><a href=\"$key.html\">\u$key</a> <em>($stats{$key})</em>";
 	    if ($category_description{$key}{desc}) {
 		print $moutf " -- " . $category_description{$key}{desc};
 	    }
@@ -304,7 +313,7 @@ EOF
 		warn "Please fix me or send an E-Mail to doc\@FreeBSD.org\a\n";
 		sleep(3);
 	    }
-	    print $moutf "</LI>\n";
+	    print $moutf "</li>\n";
 
 	    # Create the category file
 	    $outf->open(">$key.sgml");
@@ -312,16 +321,16 @@ EOF
 	    if ($category_description{$key}{desc}) {
 		print $outf "<h3>", $category_description{$key}{desc}, "</h3>\n";
 	    }
-	    print $outf "<DL>\n";
+	    print $outf "<dl>\n";
 	    my $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=\"#top\">top</A>" .
-		" -- <A HREF=\"master-index.html\">Index</A>");
+	    print $outf "</dl>\n";
+	    footer($outf, "<p></p><a href=\"#top\">top</a>" .
+		" -- <a href=\"master-index.html\">Index</a>");
 	    $outf->close;
 	}
-	print $moutf "</UL>\n";
+	print $moutf "</ul>\n";
     }
     }
 
@@ -334,22 +343,22 @@ EOF
     header($moutf, "FreeBSD Ports Categories Listed Alphabetically");
 
     print $moutf <<EOF;
-<A NAME=\"top\"></A>
+<a name=\"top\"></a>
 EOF
 
     if ($portnumber eq '0') {
-      print $moutf "<P>none found</P>\n";
+      print $moutf "<p>none found</p>\n";
     } else {
-      print $moutf "<UL>\n";
+      print $moutf "<ul>\n";
       foreach my $key (sort(keys(%stats))) {
 	print $moutf
-	  "<LI><A HREF=\"$key.html\">\u$key</A> <em>($stats{$key})</em>";
+	  "<li><a href=\"$key.html\">\u$key</a> <em>($stats{$key})</em>";
 	if ($category_description{$key}{desc}) {
 	  print $moutf " -- " . $category_description{$key}{desc};
-	print $moutf "</LI>\n";
+	print $moutf "</li>\n";
 	}
       }
-      print $moutf "</UL>\n";
+      print $moutf "</ul>\n";
     }
 
     footer($moutf, "");
@@ -359,19 +368,16 @@ EOF
 
     $mindex->open(">master-index.sgml");
     header($mindex, "FreeBSD Ports Collection Index");
-    print $mindex "<P>\n";
+    print $mindex "<p>\n";
     print $mindex sort @master;
-    print $mindex "</P>";
-    footer($mindex, "<A HREF=\"#top\">top</A>");
+    print $mindex "</p>";
+    footer($mindex, "<a href=\"#top\">top</a>");
     $mindex->close;
 
     # Create statistics.ent
 
     $statistics->open(">statistics.ent");
 
-    # doesn't seem to work:
-    # print $statistics "<!ENTITY date '<em>$today</em>'>\n";
-
     my $ptgzsize = `cat ports.size 2>/dev/null` || "";
     if ($ptgzsize =~ /^\d+$/) {
        $ptgzsize = sprintf("%.0f", $ptgzsize/(1024*1024));

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/ports.ent
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/ports.ent	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/ports.ent	Thu Aug  9 21:23:44 2012	(r39346)
@@ -1,17 +1,17 @@
 <!-- $FreeBSD$ -->
 
-<!ENTITY searchform '<FORM METHOD="GET" ACTION="http://www.FreeBSD.org/cgi/ports.cgi">
+<!ENTITY searchform '<form xmlns="http://www.w3.org/1999/xhtml" method="get" action="http://www.FreeBSD.org/cgi/ports.cgi">
 Search ports for:
-<INPUT NAME="query" VALUE="">
-<SELECT NAME="stype">
-<OPTION VALUE="all">All</OPTION>
-<OPTION VALUE="name">Package Name</OPTION>
-<OPTION VALUE="text">Description</OPTION>
-<OPTION VALUE="pkgdescr">Long description</OPTION>
-<OPTION VALUE="maintainer">Maintainer</OPTION>
-<OPTION VALUE="requires">Requires</OPTION>
-</SELECT>
-<INPUT TYPE="submit" VALUE="Submit">
-</FORM>'>
+<input name="query" value=""/>
+<select name="stype">
+<option value="all">All</option>
+<option value="name">Package Name</option>
+<option value="text">Description</option>
+<option value="pkgdescr">Long description</option>
+<option value="maintainer">Maintainer</option>
+<option value="requires">Requires</option>
+</select>
+<input type="submit" value="Submit"/>
+</form>'>
 
 <!ENTITY % statistics.ent SYSTEM "statistics.ent">

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/references.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/references.sgml	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/references.sgml	Thu Aug  9 21:23:44 2012	(r39346)
@@ -3,6 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
 <!ENTITY base '..'>
 <!ENTITY title 'FreeBSD Ports -- References'>
+<!ENTITY % ports.ent SYSTEM "ports.ent">
 %ports.ent;
 <!ENTITY email 'ports'>
 %statistics.ent;
@@ -17,7 +18,7 @@
 
 &searchform;
 
-<HR>
+<hr/>
 
 <p>To start learning more about ports and packages, see
   <a href="&base;/doc/en_US.ISO8859-1/books/handbook/ports.html">
@@ -62,9 +63,9 @@
 -->
 
   <li>The manual pages for
-    <a href="&base;/cgi/man.cgi?query="ftp""><TT>ftp</TT></a>,
-    <a href="&base;/cgi/man.cgi?query="pkg"_add"><TT>pkg_add</TT></a>, and
-    <a href="&base;/cgi/man.cgi?query="ports""><TT>ports</TT></a>.
+    <a href="&base;/cgi/man.cgi?query=ftp"><tt>ftp</tt></a>,
+    <a href="&base;/cgi/man.cgi?query=pkg_add"><tt>pkg_add</tt></a>, and
+    <a href="&base;/cgi/man.cgi?query=ports"><tt>ports</tt></a>.
   </li>
 
   <li>The

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/searching.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/searching.sgml	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/searching.sgml	Thu Aug  9 21:23:44 2012	(r39346)
@@ -3,6 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
 <!ENTITY base '..'>
 <!ENTITY title 'Searching FreeBSD Ports'>
+<!ENTITY % ports.ent SYSTEM "ports.ent">
 %ports.ent;
 %statistics.ent;
 <!ENTITY email 'ports'>
@@ -17,7 +18,7 @@
 
 &searchform;
 
-<HR>
+<hr/>
 
 <p>
 The form above will allow you to search for ports on this site.
@@ -26,8 +27,8 @@ A completed search will take you to a
 </p>
 
 <p>However, if you already have the Ports Collection installed on
-your machine, you may also search by changing to the <TT>/usr/ports</TT>
-directory and performing <TT>make search name=</TT><em>string</em>.
+your machine, you may also search by changing to the <tt>/usr/ports</tt>
+directory and performing <tt>make search name=</tt><em>string</em>.
 See <a href="http://cvsweb.FreeBSD.org/ports/Mk/bsd.port.subdir.mk">
 bsd.port.subdir.mk</a> for all the options.
 </p>

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/updating.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/updating.sgml	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/updating.sgml	Thu Aug  9 21:23:44 2012	(r39346)
@@ -3,6 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
 <!ENTITY base '..'>
 <!ENTITY title 'Updating FreeBSD Ports'>
+<!ENTITY % ports.ent SYSTEM "ports.ent">
 %ports.ent;
 <!ENTITY email 'ports'>
 %statistics.ent;
@@ -17,13 +18,13 @@
 
 &searchform;
 
-<HR>
+<hr/>
 
 <p>
 The ports listed on these web pages are continually being updated.
 It is strongly recommended that you refresh the entire collection
 together, as many ports depend on other parts of the tree, even
-where that might seem counterintuitive (e.g. <TT>japanese/</TT>.)
+where that might seem counterintuitive (e.g. <tt>japanese/</tt>.)
 </p>
 
 <p>Changes that affect the entire port system are now documented in the
@@ -47,7 +48,7 @@ Installing Applications: Packages and Po
 FreeBSD Handbook</a>; the section of the Porter's Handbook called
 <a href="&base;/doc/en_US.ISO8859-1/books/porters-handbook/keeping-up.html">
 Keeping Up</a>; and the
-<a href="&base;/cgi/man.cgi?query="ports""><TT>ports manual page</TT></a>.
+<a href="&base;/cgi/man.cgi?query=ports"><tt>ports manual page</tt></a>.
 </p>
 
 </body>

Modified: projects/sgml2xml/ja_JP.eucJP/htdocs/ports/Makefile
==============================================================================
--- projects/sgml2xml/ja_JP.eucJP/htdocs/ports/Makefile	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/ja_JP.eucJP/htdocs/ports/Makefile	Thu Aug  9 21:23:44 2012	(r39346)
@@ -63,7 +63,6 @@ Makefile.gen: categories-alpha.sgml cate
 		${ECHO_CMD} -n " $$categoryfile.sgml" >> Makefile.gen; \
 	done
 	${ECHO_CMD} >> Makefile.gen
-.endif
 
 .if defined(CLUSTER_MACHINE)
 PORTS_TARGZ_URL?= ftp://ftp-master.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz

Modified: projects/sgml2xml/ja_JP.eucJP/htdocs/ports/index.sgml
==============================================================================
--- projects/sgml2xml/ja_JP.eucJP/htdocs/ports/index.sgml	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/ja_JP.eucJP/htdocs/ports/index.sgml	Thu Aug  9 21:23:44 2012	(r39346)
@@ -3,6 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
 <!ENTITY base '..'>
 <!ENTITY title 'FreeBSD Ports ¤Ë¤Ä¤¤¤Æ'>
+<!ENTITY % ports.ent SYSTEM "ports.ent">
 %ports.ent;
 <!ENTITY email 'ports'>
 %statistics.ent;

Modified: projects/sgml2xml/ja_JP.eucJP/htdocs/ports/installing.sgml
==============================================================================
--- projects/sgml2xml/ja_JP.eucJP/htdocs/ports/installing.sgml	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/ja_JP.eucJP/htdocs/ports/installing.sgml	Thu Aug  9 21:23:44 2012	(r39346)
@@ -3,6 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
 <!ENTITY base '..'>
 <!ENTITY title 'FreeBSD Ports Collection ¤Î¥¤¥ó¥¹¥È¡¼¥ë'>
+<!ENTITY % ports.ent SYSTEM "ports.ent">
 %ports.ent;
 <!ENTITY email 'ports'>
 %statistics.ent;

Modified: projects/sgml2xml/ja_JP.eucJP/htdocs/ports/portindex
==============================================================================
--- projects/sgml2xml/ja_JP.eucJP/htdocs/ports/portindex	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/ja_JP.eucJP/htdocs/ports/portindex	Thu Aug  9 21:23:44 2012	(r39346)
@@ -65,7 +65,7 @@ main();
 
 sub getdate {
 #    return ": $year ǯ $mon ·î $mday Æü";
-    return POSIX::strftime("ºÇ½ª¹¹¿·Æü: %d-%B-%Y",localtime);
+    return POSIX::strftime("%d-%B-%Y", localtime);
 }
 
 sub header {
@@ -73,21 +73,29 @@ sub header {
     my $htext = shift;
     #local($fh, $htext) = @_;
     print $fh <<EOF;
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY base CDATA '..'>
-<!ENTITY date  "<em>$today</em>">
-<!ENTITY title '$htext'>
+<?xml version="1.0" encoding="eucJP"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
+<!ENTITY base '..'>
 <!ENTITY % navinclude.ports "INCLUDE">
 <!ENTITY % ports.ent SYSTEM "ports.ent">
 %ports.ent;
 <!ENTITY email 'ports'>
 %statistics.ent;
 ]>
-<html>&header;
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>$htext</title>
+
+    <cvs:keyword xmlns:cvs=\"http://www.FreeBSD.org/XML/CVS\">x x x $today x x x</cvs:keyword>
+  </head>
+
+  <body class="navinclude.port">
 
 &searchform;
 
-<hr>
+<hr/>
 
 EOF
 }
@@ -99,9 +107,8 @@ sub footer {
 print $fh <<EOF;
 
 $ftext
-&footer;
-</BODY>
-</HTML>
+</body>
+</html>
 EOF
 }
 
@@ -171,7 +178,7 @@ sub main {
     my %descLANG;
     my $portnumber = 0;
 
-    my $sep = "<B>:</B>";
+    my $sep = "<b>:</b>";
 
     my $moutf = new IO::File;
     my $outf = new IO::File;
@@ -228,16 +235,18 @@ sub main {
 	    $ldesc =~ s/\/usr\//$baseHTTP/;
 
 	    # The name description and maintainer
-	    $data{$i} .= "<DT><B><A NAME=\"$name\"></A><A HREF=\"${loc}${ftparchive}\">$name</A></B> ";
+	    $name =~ s/,.*//g;
+	    $name =~ s/\++//g;
+	    $data{$i} .= "<dt><b><a name=\"$name\"></a><a href=\"${loc}${ftparchive}\">$name</a></b></dt> ";
 
-	    $data{$i} .= "<DD>$desc<BR><A HREF=\"$ldesc\">¾Ü¤·¤¤ÀâÌÀ</A>";
+	    $data{$i} .= "<dd>$desc<br/><a href=\"$ldesc\">¾Ü¤·¤¤ÀâÌÀ</a>";
 	    if ($packages{"$name.tbz"}) { 
 		$data{$i} .= qq{ | <a href="$packagesURL$name.tbz">¥Ñ¥Ã¥±¡¼¥¸</a>};
 	    } elsif ($packages{"$name.tgz"}) {
 		$data{$i} .= qq{ | <a href="$packagesURL$name.tgz">¥Ñ¥Ã¥±¡¼¥¸</a>};
 	    }
 
-	    $data{$i} .= qq{ | <A HREF="$pds?$sourcepath">¥½¡¼¥¹</A>};
+	    $data{$i} .= qq{ | <a href="$pds?$sourcepath">¥½¡¼¥¹</a>};
 
 	    if ($www ne "") {
 		$data{$i} .= qq{ | <a href="$www">Main Web Site</a>};
@@ -247,17 +256,17 @@ sub main {
 	    $ownerurl =~ s/&lt;/</g;
 	    $ownerurl =~ s/&gt;/>/g;
 	    $data{$i} .= 
-		"<BR><I>ÊݼéôÅö¼Ô:</I> <A HREF=\"mailto:$ownerurl\">$owner</A>";
+		"<br/><i>ÊݼéôÅö¼Ô:</i> <a href=\"mailto:$ownerurl\">$owner</a>";
 
 	    # If there are any dependencies, list them
 	    if ($bdep ne "" || $rdep ne "") {
-		$data{$i} .= "<BR><I>ɬÍפʤâ¤Î:</I> ";
+		$data{$i} .= "<br/><i>ɬÍפʤâ¤Î:</i> ";
 		my @dep = split(/ /, "$bdep $rdep");
 		my $last = '';
 		foreach my $j (sort @dep) {
 		    next if $j eq $last;
 		    $last = $j;
-		    $data{$i} .= " <A HREF=\"##$j##.html#$j\">$j</A>,";
+		    $data{$i} .= " <a href=\"##$j##.html#$j\">$j</a>,";
 		}
 		# remove the trailing comma
 		chop $data{$i};
@@ -266,21 +275,21 @@ sub main {
 	    # If the port is listed in more than one category, throw
 	    # in some cross references
 	    if ($#cat > 0) {
-		$data{$i} .= "<BR><EM>¤³¤³¤Ë¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹:</EM> ";
+		$data{$i} .= "<br/><em>¤³¤³¤Ë¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹:</em> ";
 		foreach my $j (@cat) {
 		    if ($j ne $i) {
 			if ($j eq $cat[0]) {
-			    $data{$i} .= " <STRONG><A HREF=\"$j.html#$name\">\u$j</A></STRONG>,";
+			    $data{$i} .= " <strong><a href=\"$j.html#$name\">\u$j</a></strong>,";
 			}
 			else {
-			    $data{$i} .= " <A HREF=\"$j.html#$name\">\u$j</A>,";
+			    $data{$i} .= " <a href=\"$j.html#$name\">\u$j</a>,";
 			}
 		    }
 		}
 		# remove the trailing comma
 		chop($data{$i});
 	    }
-	    $data{$i} .= "<P></P></DD>\n"
+	    $data{$i} .= "<p></p></dd>\n"
 	}
 
     	# Add an entry to the master index
@@ -289,8 +298,8 @@ sub main {
 	my $sname = $name;
 	$sname =~ s/--/-=/g;
     	$master[$portnumber] = 
-    	    "<!-- $sname --><STRONG><A HREF=\"$cat[0].html#$name\">$name</A></STRONG> " .
-    	    " -- <EM>$desc</EM><BR>\n";
+    	    "<!-- $sname --><strong><a href=\"$cat[0].html#$name\">$name</a></strong> " .
+    	    " -- <em>$desc</em><br/>\n";
 	$portnumber++;
     }
 
@@ -300,20 +309,20 @@ sub main {
     header($moutf, "FreeBSD Ports -- ¥°¥ë¡¼¥×¤Ë¤è¤ëʬÎà");
 
     print $moutf <<EOF;
-<A NAME=\"top\"></A>
+<a name=\"top\"></a>
 EOF
 
     if ($portnumber eq '0') {
-      print $moutf "<P>none found</P>\n";
+      print $moutf "<p>none found</p>\n";
     } else {
     foreach my $cg (@category_groups) {
-	print $moutf "<H3>",$category_groups{$cg},"</H3>\n";
-	print $moutf "<UL>\n";
+	print $moutf "<h3>",$category_groups{$cg},"</h3>\n";
+	print $moutf "<ul>\n";
 	foreach my $key (sort(keys(%stats))) {
 	    next if ($category_description{$key}{group} ne $cg);
 	    # For the master file...
 	    print $moutf 
-		"<LI><A HREF=\"$key.html\">\u$key</A> <em>($stats{$key})</em>";
+		"<li><a href=\"$key.html\">\u$key</a> <em>($stats{$key})</em>";
 	    if ($category_description{$key}{desc}) {
 		print $moutf " -- " . $category_description{$key}{desc};
 	    }
@@ -324,7 +333,7 @@ EOF
 		warn "Please fix me or send an E-Mail to doc\@FreeBSD.org\a\n";
 		sleep(3);
 	    }
-	    print $moutf "</LI>\n";
+	    print $moutf "</li>\n";
 
 
 	    # Create the category file
@@ -333,16 +342,16 @@ EOF
 	    if ($category_description{$key}{desc}) {
 		print $outf "<h3>", $category_description{$key}{desc}, "</h3>\n";
 	    }
-	    print $outf "<DL>\n";
+	    print $outf "<dl>\n";
 	    my $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=\"#top\">top</A>" .
-		" -- <A HREF=\"master-index.html\">Index</A>");
+	    print $outf "</dl>\n";
+	    footer($outf, "<p></p><a href=\"#top\">top</a>" .
+		" -- <a href=\"master-index.html\">Index</a>");
 	    $outf->close;
 	}
-	print $moutf "</UL>\n";
+	print $moutf "</ul>\n";
     }
     }
 
@@ -355,22 +364,22 @@ EOF
     header($moutf, "FreeBSD Ports -- ¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç");
 
     print $moutf <<EOF;
-<A NAME=\"top\"></A>
+<a name=\"top\"></a>
 EOF
 
     if ($portnumber eq '0') {
-      print $moutf "<P>none found</P>\n";
+      print $moutf "<p>none found</p>\n";
     } else {
-      print $moutf "<UL>\n";
+      print $moutf "<ul>\n";
       foreach my $key (sort(keys(%stats))) {
 	print $moutf
-	  "<LI><A HREF=\"$key.html\">\u$key</A> <em>($stats{$key})</em>";
+	  "<li><a href=\"$key.html\">\u$key</a> <em>($stats{$key})</em>\n";
 	if ($category_description{$key}{desc}) {
 	  print $moutf " -- " . $category_description{$key}{desc};
-	print $moutf "</LI>\n";
 	}
+	print $moutf "</li>\n";
       }
-      print $moutf "</UL>\n";
+      print $moutf "</ul>\n";
     }
 
     footer($moutf, "");
@@ -380,22 +389,20 @@ EOF
 
     $mindex->open(">master-index.sgml");
     header($mindex, "FreeBSD Ports Collection °ìÍ÷");
-    print $mindex "<P>\n";
+    print $mindex "<p>\n";
     print $mindex sort @master;
-    print $mindex "</P>";
-    footer($mindex, "<A HREF=\"#top\">top</A>");
+    print $mindex "</p>";
+    footer($mindex, "<a href=\"#top\">top</a>");
     $mindex->close;
 
     # Create statistics.ent
 
     $statistics->open(">statistics.ent");
 
-    # doesn't seem to work:
-    # print $statistics "<!ENTITY date '<em>$today</em>'>\n";
-
     my $ptgzsize = `cat ports.size 2>/dev/null` || "";
     if ($ptgzsize =~ /^\d+$/) {
        $ptgzsize = sprintf("%.0f", $ptgzsize/(1024*1024));
+       print $statistics "<?xml version=\"1.0\" encoding=\"eucJP\"?>\n";
        print $statistics "<!ENTITY ports.size '¤ª¤è¤½ $ptgzsize ¥á¥¬¥Ð¥¤¥È'>\n";
     } else {
        warn "Unknown size for ports.tar.gz\n";

Modified: projects/sgml2xml/ja_JP.eucJP/htdocs/ports/ports.ent
==============================================================================
--- projects/sgml2xml/ja_JP.eucJP/htdocs/ports/ports.ent	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/ja_JP.eucJP/htdocs/ports/ports.ent	Thu Aug  9 21:23:44 2012	(r39346)
@@ -1,19 +1,20 @@
+<?xml version="1.0" encoding="eucJP"?>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.1 -->
 
-<!ENTITY searchform '<FORM METHOD="GET" ACTION="http://www.FreeBSD.org/cgi/ports.cgi">
+<!ENTITY searchform '<form xmlns="http://www.w3.org/1999/xhtml" method="get" action="http://www.FreeBSD.org/cgi/ports.cgi">
 ports ¤Î¸¡º÷:
-<INPUT NAME="query" VALUE="">
-<SELECT NAME="stype">
-<OPTION VALUE="all">¤¹¤Ù¤Æ</OPTION>
-<OPTION VALUE="name">package ̾</OPTION>
-<OPTION VALUE="text">ÀâÌÀ</OPTION>
-<OPTION VALUE="pkgdescr">¾Ü¤·¤¤ÀâÌÀ</OPTION>
-<OPTION VALUE="maintainer">ÊݼéôÅö¼Ô</OPTION>
-<OPTION VALUE="requires">ɬÍפʤâ¤Î</OPTION>
-</SELECT>
-<INPUT TYPE="submit" VALUE="¸¡º÷">
-</FORM>'>
+<input name="query" value=""/>
+<select name="stype">
+<option value="all">¤¹¤Ù¤Æ</option>
+<option value="name">package ̾</option>
+<option value="text">ÀâÌÀ</option>
+<option value="pkgdescr">¾Ü¤·¤¤ÀâÌÀ</option>
+<option value="maintainer">ÊݼéôÅö¼Ô</option>
+<option value="requires">ɬÍפʤâ¤Î</option>
+</select>
+<input type="submit" value="¸¡º÷"/>
+</form>'>
 
 <!ENTITY % statistics.ent SYSTEM "statistics.ent">

Modified: projects/sgml2xml/ja_JP.eucJP/htdocs/ports/references.sgml
==============================================================================
--- projects/sgml2xml/ja_JP.eucJP/htdocs/ports/references.sgml	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/ja_JP.eucJP/htdocs/ports/references.sgml	Thu Aug  9 21:23:44 2012	(r39346)
@@ -3,6 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
 <!ENTITY base '..'>
 <!ENTITY title 'FreeBSD Ports -- ¤½¤Î¾¤Î¾ðÊó'>
+<!ENTITY % ports.ent SYSTEM "ports.ent">
 %ports.ent;
 <!ENTITY email 'ports'>
 %statistics.ent;

Modified: projects/sgml2xml/ja_JP.eucJP/htdocs/ports/searching.sgml
==============================================================================
--- projects/sgml2xml/ja_JP.eucJP/htdocs/ports/searching.sgml	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/ja_JP.eucJP/htdocs/ports/searching.sgml	Thu Aug  9 21:23:44 2012	(r39346)
@@ -3,6 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
 <!ENTITY base '..'>
 <!ENTITY title 'FreeBSD Ports ¤Î¸¡º÷'>
+<!ENTITY % ports.ent SYSTEM "ports.ent">
 %ports.ent;
 %statistics.ent;
 <!ENTITY email 'ports'>

Modified: projects/sgml2xml/ja_JP.eucJP/htdocs/ports/updating.sgml
==============================================================================
--- projects/sgml2xml/ja_JP.eucJP/htdocs/ports/updating.sgml	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/ja_JP.eucJP/htdocs/ports/updating.sgml	Thu Aug  9 21:23:44 2012	(r39346)
@@ -3,6 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
 <!ENTITY base '..'>
 <!ENTITY title 'FreeBSD Ports ¤Î¥¢¥Ã¥×¥Ç¡¼¥È'>
+<!ENTITY % ports.ent SYSTEM "ports.ent">
 %ports.ent;
 <!ENTITY email 'ports'>
 %statistics.ent;

Modified: projects/sgml2xml/ru_RU.KOI8-R/htdocs/ports/Makefile
==============================================================================
--- projects/sgml2xml/ru_RU.KOI8-R/htdocs/ports/Makefile	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/ru_RU.KOI8-R/htdocs/ports/Makefile	Thu Aug  9 21:23:44 2012	(r39346)
@@ -70,7 +70,6 @@ Makefile.gen: index.sgml .NOTMAIN
 	for categoryfile in ${CATEGORYLIST}; do \
 		${ECHO_CMD} -n " $$categoryfile.sgml" >> Makefile.gen; \
 	done
-.endif
 
 index.sgml: ${INDEX} categories packages.exists portindex ports.inc .NOTMAIN
 	${RM} -f *.sgml

Modified: projects/sgml2xml/ru_RU.KOI8-R/htdocs/ports/portindex
==============================================================================
--- projects/sgml2xml/ru_RU.KOI8-R/htdocs/ports/portindex	Thu Aug  9 15:16:40 2012	(r39345)
+++ projects/sgml2xml/ru_RU.KOI8-R/htdocs/ports/portindex	Thu Aug  9 21:23:44 2012	(r39346)
@@ -60,27 +60,32 @@ sub getdate {
 	       "éÀÌÑ", "á×ÇÕÓÔÁ", "óÅÎÔÑÂÒÑ", "ïËÔÑÂÒÑ", "îÏÑÂÒÑ", "äÅËÁÂÒÑ");
     ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
     $year += 1900;
-    return "ðÏÓÌÅÄÎÉÅ ÉÚÍÅÎÅÎÉÑ: $mday $months[$mon], $year";
+    return "$mday $months[$mon], $year";
 }
 
 sub header {
     local ($fh, $htext) = @_;
-    print $fh "<!DOCTYPE HTML PUBLIC \"-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN\" [\n";
-    print $fh "<!ENTITY base CDATA '..'>\n";
-    print $fh "<!ENTITY date  \"<em>$today</em>\">\n";
-    print $fh "<!ENTITY title '$htext'>\n";
+    print $fh "<?xml version=\"1.0\" encoding=\"koi8-r\"?>\n";
+    print $fh "<!DOCTYPE html PUBLIC \"-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN\"\n";
+    print $fh "\"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd\" [\n";
+    print $fh "<!ENTITY base '..'>\n";
     print $fh "<!ENTITY blurb  SYSTEM \"ports.inc\">\n";
     print $fh "<!ENTITY % navinclude.ports \"INCLUDE\">\n";
     print $fh "<!ENTITY email 'ports'>\n";
     print $fh "]>\n";
-    print $fh "<html>&header;\n";
+
+    print $fh "<html xmlns=\"http://www.w3.org/1999/xhtml\">";
+    print $fh "<head><title>$htext</title>";
+    print $fh "<cvs:keyword xmlns:cvs=\"http://www.FreeBSD.org/XML/CVS\">x x x $today x x x</cvs:keyword>";
+    print $fh "</head>";
+
+    print $fh "<body class=\"navinclude.about\">";
 }
 
 sub footer {
     local ($fh, $ftext) = @_;
     print $fh "\n$ftext\n";
-    print $fh "&footer;\n";
-    print $fh "</BODY>\n</HTML>\n";
+    print $fh "</body>\n</html>\n";
 }
 
 sub packages_exist {
@@ -123,7 +128,7 @@ sub category_description {
 
 sub main {
 
-    $sep = "<B>:</B>";
+    $sep = "<b>:</b>";
 
     open(INDEX, $ARGV[0]);
     while (<INDEX>) {
@@ -156,17 +161,19 @@ sub main {
 	    $ldesc =~ s/\/usr/$baseHTTP/;
 
     	    # The name description and maintainer
-	    $data{$i} .= "<DT><B><A NAME=\"$name\"></A><A HREF=\"$loc$ftparchive\">$name</A></B> ";
+	    $name =~ s/,.*//g;
+	    $name =~ s/\++//g;
+	    $data{$i} .= "<dt><b><a name=\"$name\"></a><a href=\"$loc$ftparchive\">$name</a></b></dt>";
      
 
-	    $data{$i} .= "<DD>$desc<BR><A HREF=\"$ldesc\">ðÏÌÎÏÅ ÏÐÉÓÁÎÉÅ</A>";
+	    $data{$i} .= "<dd>$desc<br/><a href=\"$ldesc\">ðÏÌÎÏÅ ÏÐÉÓÁÎÉÅ</a>";
 	    if ($packages{"$name.tbz"}) { 
 		$data{$i} .= qq{ | <a href="$packagesURL$name.tbz">ðÁËÅÔ</a>};
 	    } elsif ($packages{"$name.tgz"}) { 
 		$data{$i} .= qq{ | <a href="$packagesURL$name.tgz">ðÁËÅÔ</a>};
 	    }
 
-	    $data{$i} .= qq{ | <A HREF="$pds?$sourcepath">éÓÈÏÄÎÙÅ ÔÅËÓÔÙ</A>};
+	    $data{$i} .= qq{ | <a href="$pds?$sourcepath">éÓÈÏÄÎÙÅ ÔÅËÓÔÙ</a>};
 
             if ($www ne "") {
 		$data{$i} .= qq{ | <a href="$www">ïÓÎÏ×ÎÏÊ Web ÓÁÊÔ</a>};
@@ -176,17 +183,17 @@ sub main {
     	    $ownerurl =~ s/&lt;/</g;
     	    $owenrurl =~ s/&gt;/>/g;
 	    $data{$i} .= 
-		"<BR><I>ðÏÄÄÅÒÖËÏÊ ÚÁÎÉÍÁÅÔÓÑ:</I> <A HREF=\"mailto:$ownerurl\">$owner</A>";
+		"<br/><i>ðÏÄÄÅÒÖËÏÊ ÚÁÎÉÍÁÅÔÓÑ:</i> <a href=\"mailto:$ownerurl\">$owner</a>";
 
     	    # If there are any dependencies, list them
     	    if ($bdep ne "" || $rdep ne "") {
-    	    	$data{$i} .= "<BR><I>ôÒÅÂÕÅÔ:</I> ";
+    	    	$data{$i} .= "<br/><i>ôÒÅÂÕÅÔ:</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>,";
+    	    	    $data{$i} .= " <a href=\"##$j##.html#$j\">$j</a>,";
     	    	}
     	    	# remove the trailing comma
     	    	chop $data{$i};
@@ -195,21 +202,21 @@ sub main {
     	    # If the port is listed in more than one category, throw
     	    # in some cross references
     	    if ($#cat > 0) {
-    	    	$data{$i} .= "<BR><EM>ôÁËÖÅ ÐÒÉÓÕÔÓÔ×ÕÅÔ ×:</EM> ";
+    	    	$data{$i} .= "<br/><em>ôÁËÖÅ ÐÒÉÓÕÔÓÔ×ÕÅÔ ×:</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>,";
+			    $data{$i} .= " <strong><a href=\"$j.html#$name\">\u$j</a></strong>,";
 			}
 			else {
-			    $data{$i} .= " <A HREF=\"$j.html#$name\">\u$j</A>,";
+			    $data{$i} .= " <a href=\"$j.html#$name\">\u$j</a>,";
 			}
     	    	    }
     	    	}
     	    	# remove the trailing comma
     	    	chop($data{$i});
     	    }
-    	    $data{$i} .= "<P></P></DD>\n"
+    	    $data{$i} .= "<p></p></dd>\n"
 	}
 
         # Add an entry to the master index
@@ -218,8 +225,8 @@ sub main {
 	local ($sname) = $name; 
 	$sname =~ s/--/-=/g;
     	$master[$portnumber] = 
-    	    "<!-- $sname --><STRONG><A HREF=\"$cat[0].html#$name\">$name</A></STRONG> " .
-    	    " -- <EM>$desc</EM><BR>\n";
+    	    "<!-- $sname --><strong><a href=\"$cat[0].html#$name\">$name</a></strong> " .
+    	    " -- <em>$desc</em><br/>\n";
 	$portnumber++;
     }
 
@@ -228,19 +235,19 @@ sub main {
     &header(MOUTF, "ðÏÒÔÙ FreeBSD");
 #    print MOUTF "<!--#include virtual=\"./ports.inc\" -->\n";
     print MOUTF "&blurb;";
-    print MOUTF "<hr><P>÷ ÓÐÉÓËÅ ëÏÌÌÅËÃÉÉ ðÏÒÔÏ× FreeBSD ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-doc-projects mailing list