Merge following changes in the English version.

1.30 -> 1.31	ports/Makefile
	1.33 -> 1.34	ports/portindex
This commit is contained in:
Jun Kuriyama 2001-01-02 02:22:50 +00:00
parent 0bd795f3f8
commit ce1a91e27c
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=8621
2 changed files with 7 additions and 33 deletions

View file

@ -1,6 +1,6 @@
# $FreeBSD: www/ja/ports/Makefile,v 1.20 2000/11/07 08:01:02 kuriyama Exp $
# $FreeBSD: www/ja/ports/Makefile,v 1.21 2000/11/07 11:37:57 kuriyama Exp $
# The FreeBSD Japanese Documentation Project
# Original revision: 1.30
# Original revision: 1.31
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@ -29,16 +29,9 @@ CVS_OPT+= -d ${PORTSCVSROOT}
.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
@ -48,7 +41,7 @@ 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 exists(${.CURDIR}/../../en/ports/packages.exists)
@ -67,9 +60,9 @@ packages.exists: ${cvsindex} ${cvsy2k}
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

View file

@ -4,9 +4,9 @@
#
# by John Fieber <jfieber@freebsd.org>
# Mon May 13 10:31:58 EST 1996
# $FreeBSD: www/ja/ports/portindex,v 1.21 2000/12/31 11:08:42 hrs Exp $
# $FreeBSD: www/ja/ports/portindex,v 1.22 2001/01/01 18:41:42 hrs Exp $
# The FreeBSD Japanese Documentation Project
# Original revision: 1.33
# Original revision: 1.34
############################################################
@ -43,23 +43,8 @@ $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");
@ -192,10 +177,6 @@ sub main {
$data{$i} .= qq{ | <A HREF="$pds?$sourcepath">¥½¡¼¥¹</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>};
}