Merge the following changes in the English version:

doc.ftr         : 1.4 -> 1.5
    ports/Makefile  : 1.15 -> 1.16
    ports/portindex : 1.15 -> 1.17
This commit is contained in:
Motoyuki Konno 1998-08-26 15:01:06 +00:00
parent b9ccfe504f
commit 4fdd91f6ee
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=3422
3 changed files with 29 additions and 14 deletions

View file

@ -1,6 +1,6 @@
<!-- $Id: doc.ftr,v 1.5 1998-08-04 13:43:46 wosch Exp $ -->
<!-- $Id: doc.ftr,v 1.6 1998-08-26 15:01:05 motoyuki Exp $ -->
<!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: 1.4 -->
<!-- Original revision: 1.5 -->
<hr>
<address>

View file

@ -1,12 +1,12 @@
# $Id: Makefile,v 1.11 1998-08-24 17:12:25 motoyuki Exp $
# $Id: Makefile,v 1.12 1998-08-26 15:01:05 motoyuki Exp $
# The FreeBSD Japanese Documentation Project
# Original revision: 1.15
# Original revision: 1.16
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
PORTINDEX= perl ./portindex
PORTINDEX= perl ${.CURDIR}/portindex
INDEX= INDEX
PINDEX= ports/${INDEX}
@ -29,7 +29,7 @@ hostname!= hostname
packages.exists: ${cvsindex}
.if ${hostname} == "hub.freebsd.org" || ${hostname} == "freefall.freebsd.org"
../../en/ports/packages > ${.TARGET}
sh ${.CURDIR}/../../en/ports/packages > ${.TARGET}
.else
touch ${.TARGET}
.endif

View file

@ -4,17 +4,32 @@
#
# by John Fieber <jfieber@freebsd.org>
# Mon May 13 10:31:58 EST 1996
# $Id: portindex,v 1.7 1998-08-12 13:06:48 hanai Exp $
# $Id: portindex,v 1.8 1998-08-26 15:01:06 motoyuki Exp $
# The FreeBSD Japanese Documentation Project
# Original revision: 1.15
# Original revision: 1.17
############################################################
# 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
$base = "ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current";
$baseHTTP = "ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current";
$urlcgi = 'http://www.freebsd.org/cgi/url.cgi';
$packagesURL = 'ftp://ftp.freebsd.org/pub/FreeBSD/packages-stable/All/';
if ($ENV{'MASTER_FTP_SERVER'}) {
$ftpserver = $ENV{'MASTER_FTP_SERVER'};
} else {
$ftpserver = 'ftp://ftp.freebsd.org' if !$ftpserver;
}
$base = "$ftpserver/pub/FreeBSD/FreeBSD-current" if !$base;
$baseHTTP = $base if !$baseHTTP;
$urlcgi = 'http://www.freebsd.org/cgi/url.cgi' if !$urlcgi;
$packagesURL = "$ftpserver/pub/FreeBSD/packages-stable/All/"
if !$packagesURL;
# support tar on the fly or gzip'ed tar on the fly
$ftparchive = 'tar' if !$ftparchive;
# better layout and link to the sources
if ($urlcgi) {
@ -132,7 +147,7 @@ sub main {
$ldesc =~ s/\/usr/$baseHTTP/;
# The name description and maintainer
$data{$i} .= "<DT><B><A NAME=\"$name\"></A><A HREF=\"$loc.tar\">$name</A></B> ";
$data{$i} .= "<DT><B><A NAME=\"$name\"></A><A HREF=\"$loc.$ftparchive\">$name</A></B> ";
$data{$i} .= "<DD>$desc<BR><A HREF=\"$ldesc\">¾Ü¤·¤¤ÀâÌÀ</A>";
if ($packages{"$name.tgz"}) {
@ -188,7 +203,7 @@ sub main {
&header(MOUTF, "FreeBSD Ports");
# print MOUTF "<!--#include virtual=\"./ports.inc\" -->\n";
print MOUTF "&blurb;";
print MOUTF "<hr><P>FreeBSD Ports コレクションには, 現時点で $portnumber 個の ports が提供されています. <br> <A HREF=\"$base/ports.tar.gz\">全ての $portnumber 個の ports を tar でまとめて gzip したもの</A> (およそ 4 メガバイト) をダウンロードするか, 以下の分類からたどってください:\n";
print MOUTF "<hr><P>FreeBSD Ports コレクションには, 現時点で $portnumber 個の ports が提供されています. <br> <A HREF=\"$base/ports.tar.gz\">全ての $portnumber 個の ports を tar でまとめて gzip したもの</A> (およそ 5 メガバイト) をダウンロードするか, 以下の分類からたどってください:\n";
print MOUTF "<UL>\n";