From owner-svn-doc-projects@FreeBSD.ORG Thu Aug 9 21:23:45 2012 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD8CA106564A; Thu, 9 Aug 2012 21:23:45 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9418E8FC0A; Thu, 9 Aug 2012 21:23:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q79LNjjx055159; Thu, 9 Aug 2012 21:23:45 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q79LNjiC055137; Thu, 9 Aug 2012 21:23:45 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201208092123.q79LNjiC055137@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 9 Aug 2012 21:23:45 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: 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 X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Aug 2012 21:23:45 -0000 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, .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" [ + %ports.ent; %statistics.ent; @@ -17,7 +18,7 @@ &searchform; -
+

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 -make +make 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 @@ -52,21 +53,21 @@ thousands of applications right at your

-Each port's Makefile automatically fetches the +Each port's Makefile automatically fetches the application source code, either from a local disk, CD-ROM or via -ftp, +ftp, unpacks it on your system, applies the patches, and compiles. If -all went well, a simple make install will install the +all went well, a simple make install will install the application and register it with the package system.

-

For most ports, a precompiled package also exists, saving +

For most ports, a precompiled package 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 -pkg_add +pkg_add command on it or you can simply grab the link location and hand it straight -to pkg_add since it is capable of accepting FTP URLs as +to pkg_add since it is capable of accepting FTP URLs as well as filenames.

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" [ + %ports.ent; %statistics.ent; @@ -17,10 +18,10 @@ &searchform; -
+

If you are installing FreeBSD from CD-ROM or an ftp site, the - sysinstall + sysinstall application will allow you to install the Ports Collection directly.

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 # 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 < -$today"> - + + %ports.ent; %statistics.ent; ]> -&header; + + + $htext + + x x x $today x x x + + + &searchform; -

+
EOF } @@ -97,9 +105,8 @@ sub footer { print $fh < - + + EOF } @@ -206,17 +213,19 @@ sub main { $ldesc =~ s/\/usr\//$baseHTTP/; # The name description and maintainer - $data{$i} .= "
$name "; + $name =~ s/,.*//g; + $name =~ s/\++//g; + $data{$i} .= "
$name
"; - $data{$i} .= "
$desc
Long description"; + $data{$i} .= "
$desc
Long description"; if ($packages{"$name.tbz"}) { $data{$i} .= qq{ | Package}; } elsif ($packages{"$name.tgz"}) { $data{$i} .= qq{ | Package}; } - $data{$i} .= qq{ | Sources}; + $data{$i} .= qq{ | Sources}; if ($www ne "") { $data{$i} .= qq{ | Main Web Site}; @@ -226,17 +235,17 @@ sub main { $ownerurl =~ s/<//g; $data{$i} .= - "
Maintained by: $owner"; + "
Maintained by: $owner"; # If there are any dependencies, list them if ($bdep ne "" || $rdep ne "") { - $data{$i} .= "
Requires: "; + $data{$i} .= "
Requires: "; my @dep = split(/ /, "$bdep $rdep"); my $last = ''; foreach my $j (sort @dep) { next if $j eq $last; $last = $j; - $data{$i} .= " $j,"; + $data{$i} .= " $j,"; } # 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} .= "
Also listed in: "; + $data{$i} .= "
Also listed in: "; foreach my $j (@cat) { if ($j ne $i) { if ($j eq $cat[0]) { - $data{$i} .= " \u$j,"; + $data{$i} .= " \u$j,"; } else { - $data{$i} .= " \u$j,"; + $data{$i} .= " \u$j,"; } } } # remove the trailing comma chop($data{$i}); } - $data{$i} .= "

\n" + $data{$i} .= "

\n" } # Add an entry to the master index @@ -268,8 +277,8 @@ sub main { my $sname = $name; $sname =~ s/--/-=/g; $master[$portnumber] = - "$name " . - " -- $desc
\n"; + "$name " . + " -- $desc
\n"; $portnumber++; } @@ -279,20 +288,20 @@ sub main { header($moutf, "FreeBSD Ports Categories Listed By Groups"); print $moutf < + EOF if ($portnumber eq '0') { - print $moutf "

none found

\n"; + print $moutf "

none found

\n"; } else { foreach my $cg (@category_groups) { - print $moutf "

",$category_groups{$cg},"

\n"; - print $moutf "
    \n"; + print $moutf "

    ",$category_groups{$cg},"

    \n"; + print $moutf "
      \n"; foreach my $key (sort(keys(%stats))) { next if ($category_description{$key}{group} ne $cg); # For the master file... print $moutf - "
    • \u$key ($stats{$key})"; + "
    • \u$key ($stats{$key})"; 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 "
      • \n"; + print $moutf "\n"; # Create the category file $outf->open(">$key.sgml"); @@ -312,16 +321,16 @@ EOF if ($category_description{$key}{desc}) { print $outf "

      ", $category_description{$key}{desc}, "

      \n"; } - print $outf "
      \n"; + print $outf "
      \n"; my $d = join("\n", sort(split(/\n/, $data{$key}))); $d =~ s/##([^#]*)##/$catkey{$1}/g; print $outf $d; - print $outf "
      \n"; - footer($outf, "

      top" . - " -- Index"); + print $outf "
      \n"; + footer($outf, "

      top" . + " -- Index"); $outf->close; } - print $moutf "
    \n"; + print $moutf "
\n"; } } @@ -334,22 +343,22 @@ EOF header($moutf, "FreeBSD Ports Categories Listed Alphabetically"); print $moutf < + EOF if ($portnumber eq '0') { - print $moutf "

none found

\n"; + print $moutf "

none found

\n"; } else { - print $moutf "
    \n"; + print $moutf "
      \n"; foreach my $key (sort(keys(%stats))) { print $moutf - "
    • \u$key ($stats{$key})"; + "
    • \u$key ($stats{$key})"; if ($category_description{$key}{desc}) { print $moutf " -- " . $category_description{$key}{desc}; - print $moutf "
      • \n"; + print $moutf "\n"; } } - print $moutf "
    \n"; + print $moutf "
\n"; } footer($moutf, ""); @@ -359,19 +368,16 @@ EOF $mindex->open(">master-index.sgml"); header($mindex, "FreeBSD Ports Collection Index"); - print $mindex "

\n"; + print $mindex "

\n"; print $mindex sort @master; - print $mindex "

"; - footer($mindex, "top"); + print $mindex "

"; + footer($mindex, "top"); $mindex->close; # Create statistics.ent $statistics->open(">statistics.ent"); - # doesn't seem to work: - # print $statistics "$today'>\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 @@ - + Search ports for: - - - -'> + + + +'> 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" [ + %ports.ent; %statistics.ent; @@ -17,7 +18,7 @@ &searchform; -
+

To start learning more about ports and packages, see @@ -62,9 +63,9 @@ -->

  • The manual pages for - ftp, - pkg_add, and - ports. + ftp, + pkg_add, and + ports.
  • 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" [ + %ports.ent; %statistics.ent; @@ -17,7 +18,7 @@ &searchform; -
    +

    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

    However, if you already have the Ports Collection installed on -your machine, you may also search by changing to the /usr/ports -directory and performing make search name=string. +your machine, you may also search by changing to the /usr/ports +directory and performing make search name=string. See bsd.port.subdir.mk for all the options.

    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" [ + %ports.ent; %statistics.ent; @@ -17,13 +18,13 @@ &searchform; -
    +

    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. japanese/.) +where that might seem counterintuitive (e.g. japanese/.)

    Changes that affect the entire port system are now documented in the @@ -47,7 +48,7 @@ Installing Applications: Packages and Po FreeBSD Handbook; the section of the Porter's Handbook called Keeping Up; and the -ports manual page. +ports manual page.

    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" [ + %ports.ent; %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" [ + %ports.ent; %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 < -$today"> - + + %ports.ent; %statistics.ent; ]> -&header; + + + + $htext + + x x x $today x x x + + + &searchform; -
    +
    EOF } @@ -99,9 +107,8 @@ sub footer { print $fh < - + + EOF } @@ -171,7 +178,7 @@ sub main { my %descLANG; my $portnumber = 0; - my $sep = ":"; + my $sep = ":"; 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} .= "
    $name "; + $name =~ s/,.*//g; + $name =~ s/\++//g; + $data{$i} .= "
    $name
    "; - $data{$i} .= "
    $desc
    ¾Ü¤·¤¤ÀâÌÀ"; + $data{$i} .= "
    $desc
    ¾Ü¤·¤¤ÀâÌÀ"; if ($packages{"$name.tbz"}) { $data{$i} .= qq{ | ¥Ñ¥Ã¥±¡¼¥¸}; } elsif ($packages{"$name.tgz"}) { $data{$i} .= qq{ | ¥Ñ¥Ã¥±¡¼¥¸}; } - $data{$i} .= qq{ | ¥½¡¼¥¹}; + $data{$i} .= qq{ | ¥½¡¼¥¹}; if ($www ne "") { $data{$i} .= qq{ | Main Web Site}; @@ -247,17 +256,17 @@ sub main { $ownerurl =~ s/<//g; $data{$i} .= - "
    ÊݼéôÅö¼Ô: $owner"; + "
    ÊݼéôÅö¼Ô: $owner"; # If there are any dependencies, list them if ($bdep ne "" || $rdep ne "") { - $data{$i} .= "
    ɬÍפʤâ¤Î: "; + $data{$i} .= "
    ɬÍפʤâ¤Î: "; my @dep = split(/ /, "$bdep $rdep"); my $last = ''; foreach my $j (sort @dep) { next if $j eq $last; $last = $j; - $data{$i} .= " $j,"; + $data{$i} .= " $j,"; } # 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} .= "
    ¤³¤³¤Ë¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹: "; + $data{$i} .= "
    ¤³¤³¤Ë¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹: "; foreach my $j (@cat) { if ($j ne $i) { if ($j eq $cat[0]) { - $data{$i} .= " \u$j,"; + $data{$i} .= " \u$j,"; } else { - $data{$i} .= " \u$j,"; + $data{$i} .= " \u$j,"; } } } # remove the trailing comma chop($data{$i}); } - $data{$i} .= "

    \n" + $data{$i} .= "

    \n" } # Add an entry to the master index @@ -289,8 +298,8 @@ sub main { my $sname = $name; $sname =~ s/--/-=/g; $master[$portnumber] = - "$name " . - " -- $desc
    \n"; + "$name " . + " -- $desc
    \n"; $portnumber++; } @@ -300,20 +309,20 @@ sub main { header($moutf, "FreeBSD Ports -- ¥°¥ë¡¼¥×¤Ë¤è¤ëʬÎà"); print $moutf < + EOF if ($portnumber eq '0') { - print $moutf "

    none found

    \n"; + print $moutf "

    none found

    \n"; } else { foreach my $cg (@category_groups) { - print $moutf "

    ",$category_groups{$cg},"

    \n"; - print $moutf "
      \n"; + print $moutf "

      ",$category_groups{$cg},"

      \n"; + print $moutf "
        \n"; foreach my $key (sort(keys(%stats))) { next if ($category_description{$key}{group} ne $cg); # For the master file... print $moutf - "
      • \u$key ($stats{$key})"; + "
      • \u$key ($stats{$key})"; 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 "
        • \n"; + print $moutf "\n"; # Create the category file @@ -333,16 +342,16 @@ EOF if ($category_description{$key}{desc}) { print $outf "

        ", $category_description{$key}{desc}, "

        \n"; } - print $outf "
        \n"; + print $outf "
        \n"; my $d = join("\n", sort(split(/\n/, $data{$key}))); $d =~ s/##([^#]*)##/$catkey{$1}/g; print $outf $d; - print $outf "
        \n"; - footer($outf, "

        top" . - " -- Index"); + print $outf "
        \n"; + footer($outf, "

        top" . + " -- Index"); $outf->close; } - print $moutf "
      \n"; + print $moutf "
    \n"; } } @@ -355,22 +364,22 @@ EOF header($moutf, "FreeBSD Ports -- ¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç"); print $moutf < + EOF if ($portnumber eq '0') { - print $moutf "

    none found

    \n"; + print $moutf "

    none found

    \n"; } else { - print $moutf "
      \n"; + print $moutf "
        \n"; foreach my $key (sort(keys(%stats))) { print $moutf - "
      • \u$key ($stats{$key})"; + "
      • \u$key ($stats{$key})\n"; if ($category_description{$key}{desc}) { print $moutf " -- " . $category_description{$key}{desc}; - print $moutf "
        • \n"; } + print $moutf "\n"; } - print $moutf "
      \n"; + print $moutf "
    \n"; } footer($moutf, ""); @@ -380,22 +389,20 @@ EOF $mindex->open(">master-index.sgml"); header($mindex, "FreeBSD Ports Collection °ìÍ÷"); - print $mindex "

    \n"; + print $mindex "

    \n"; print $mindex sort @master; - print $mindex "

    "; - footer($mindex, "top"); + print $mindex "

    "; + footer($mindex, "top"); $mindex->close; # Create statistics.ent $statistics->open(">statistics.ent"); - # doesn't seem to work: - # print $statistics "$today'>\n"; - my $ptgzsize = `cat ports.size 2>/dev/null` || ""; if ($ptgzsize =~ /^\d+$/) { $ptgzsize = sprintf("%.0f", $ptgzsize/(1024*1024)); + print $statistics "\n"; print $statistics "\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 @@ + - + ports ¤Î¸¡º÷: - - - -'> + + + +'> 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" [ + %ports.ent; %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" [ + %ports.ent; %statistics.ent; 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" [ + %ports.ent; %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 "\n"; - print $fh "$today\">\n"; - print $fh "\n"; + print $fh "\n"; + print $fh "\n"; print $fh "\n"; print $fh "\n"; print $fh "\n"; print $fh "]>\n"; - print $fh "&header;\n"; + + print $fh ""; + print $fh "$htext"; + print $fh "x x x $today x x x"; + print $fh ""; + + print $fh ""; } sub footer { local ($fh, $ftext) = @_; print $fh "\n$ftext\n"; - print $fh "&footer;\n"; - print $fh "\n\n"; + print $fh "\n\n"; } sub packages_exist { @@ -123,7 +128,7 @@ sub category_description { sub main { - $sep = ":"; + $sep = ":"; open(INDEX, $ARGV[0]); while () { @@ -156,17 +161,19 @@ sub main { $ldesc =~ s/\/usr/$baseHTTP/; # The name description and maintainer - $data{$i} .= "
    $name "; + $name =~ s/,.*//g; + $name =~ s/\++//g; + $data{$i} .= "
    $name
    "; - $data{$i} .= "
    $desc
    ðÏÌÎÏÅ ÏÐÉÓÁÎÉÅ"; + $data{$i} .= "
    $desc
    ðÏÌÎÏÅ ÏÐÉÓÁÎÉÅ"; if ($packages{"$name.tbz"}) { $data{$i} .= qq{ | ðÁËÅÔ}; } elsif ($packages{"$name.tgz"}) { $data{$i} .= qq{ | ðÁËÅÔ}; } - $data{$i} .= qq{ | éÓÈÏÄÎÙÅ ÔÅËÓÔÙ}; + $data{$i} .= qq{ | éÓÈÏÄÎÙÅ ÔÅËÓÔÙ}; if ($www ne "") { $data{$i} .= qq{ | ïÓÎÏ×ÎÏÊ Web ÓÁÊÔ}; @@ -176,17 +183,17 @@ sub main { $ownerurl =~ s/<//g; $data{$i} .= - "
    ðÏÄÄÅÒÖËÏÊ ÚÁÎÉÍÁÅÔÓÑ: $owner"; + "
    ðÏÄÄÅÒÖËÏÊ ÚÁÎÉÍÁÅÔÓÑ: $owner"; # If there are any dependencies, list them if ($bdep ne "" || $rdep ne "") { - $data{$i} .= "
    ôÒÅÂÕÅÔ: "; + $data{$i} .= "
    ôÒÅÂÕÅÔ: "; @dep = split(/ /, "$bdep $rdep"); local($last) = ''; foreach $j (sort @dep) { next if $j eq $last; $last = $j; - $data{$i} .= " $j,"; + $data{$i} .= " $j,"; } # 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} .= "
    ôÁËÖÅ ÐÒÉÓÕÔÓÔ×ÕÅÔ ×: "; + $data{$i} .= "
    ôÁËÖÅ ÐÒÉÓÕÔÓÔ×ÕÅÔ ×: "; foreach $j (@cat) { if ($j ne $i) { if ($j eq $cat[0]) { - $data{$i} .= " \u$j,"; + $data{$i} .= " \u$j,"; } else { - $data{$i} .= " \u$j,"; + $data{$i} .= " \u$j,"; } } } # remove the trailing comma chop($data{$i}); } - $data{$i} .= "

    \n" + $data{$i} .= "

    \n" } # Add an entry to the master index @@ -218,8 +225,8 @@ sub main { local ($sname) = $name; $sname =~ s/--/-=/g; $master[$portnumber] = - "$name " . - " -- $desc
    \n"; + "$name " . + " -- $desc
    \n"; $portnumber++; } @@ -228,19 +235,19 @@ sub main { &header(MOUTF, "ðÏÒÔÙ FreeBSD"); # print MOUTF "\n"; print MOUTF "&blurb;"; - print MOUTF "

    ÷ ÓÐÉÓËÅ ëÏÌÌÅËÃÉÉ ðÏÒÔÏ× FreeBSD ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***