os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Get www site info from INDEX instead of WWW_SITE. Note that I only

Browse source 
fixed the en and es versions; the ja version did not have the www
stuff in the first place so the translators can merge in the recent
changes at their leisure. :)

Reviewed (in principle) by:	wosch, scrappy
This commit is contained in:
Satoshi Asami 1999-04-21 11:44:43 +00:00
parent 8ff2ee13ff
commit 1bfe2d2ce5
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/www/; revision=4722
4 changed files with 18 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

19
en/ports/Makefile
View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.21 1999-04-08 21:50:03 nik Exp $
# $Id: Makefile,v 1.22 1999-04-21 11:44:37 asami Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@ -9,20 +9,17 @@ INDEX= INDEX
PINDEX= ports/${INDEX}
Y2K= YEAR2000
PY2K= ports/${Y2K}
WWW= WWW_SITE
PWWW= ports/${WWW}
COOKIE= ${INDEX} Makefile.gen
.if exists(Makefile.gen)
.include "Makefile.gen"
.endif
CLEANFILES+= ${DOCS} Makefile.gen ${INDEX} ${Y2K} ${WWW} packages.exists
CLEANFILES+= ${DOCS} Makefile.gen ${INDEX} ${Y2K} packages.exists
cvsindex= $${CVSROOT}/${PINDEX},v
cvsy2k= $${CVSROOT}/${PY2K},v
cvswww= $${CVSROOT}/${PWWW},v
_ALLINSTALL= packages.exists ${INDEX} ${Y2K} ${WWW}
_ALLINSTALL= packages.exists ${INDEX} ${Y2K}
.if defined(NOPORTSCVS)
${INDEX}: $${PORTSBASE}/${PINDEX}
@ -31,8 +28,6 @@ ${INDEX}: $${PORTSBASE}/${PINDEX}
${Y2K}: $${PORTSBASE}/${PY2K}
cp ${PORTSBASE}/${PY2K} ${Y2K}
${WWW}: $${PORTSBASE}/${PWWW}
cp ${PORTSBASE}/${PWWW} ${WWW}
.else
${INDEX}: ${cvsindex}
cvs -QR co -p ${PINDEX} > ${INDEX}
@ -40,8 +35,6 @@ ${INDEX}: ${cvsindex}
${Y2K}: ${cvsy2k}
cvs -QR co -p ${PY2K} > ${Y2K}
${WWW}: ${cvswww}
cvs -QR co -p ${PWWW} > ${WWW}
.endif
# build the list of available packages only on the
@ -51,7 +44,7 @@ hostname!= hostname
.if defined(NOPORTSCVS)
packages.exists:
.else
packages.exists: ${cvsindex} ${cvsy2k} ${cvswww}
packages.exists: ${cvsindex} ${cvsy2k}
.endif
.if ${hostname} == "hub.freebsd.org" || ${hostname} == "freefall.freebsd.org"
sh ${.CURDIR}/packages > ${.TARGET}
@ -63,8 +56,8 @@ Makefile.gen: index.sgml .NOTMAIN
echo DOCS= *.sgml > Makefile.gen
${MAKE} ${MAKEFLAGS} ${.IMPSRC}
index.sgml: ${INDEX} ${Y2K} ${WWW} packages.exists portindex ports.inc .NOTMAIN
index.sgml: ${INDEX} ${Y2K} packages.exists portindex ports.inc .NOTMAIN
rm -f *.sgml
${PORTINDEX} ${INDEX} ${Y2K} ${WWW}
${PORTINDEX} ${INDEX} ${Y2K}
.include "../web.mk"

20
en/ports/portindex
View file

@ -42,7 +42,6 @@ $today = &getdate;
&packages_exist('packages.exists', *packages);
&category_description('categories', *category_description);
&y2k_statements;
&www_sites;
&main;
sub y2k_statements {
@ -59,19 +58,6 @@ sub y2k_statements {
}
sub www_sites {
open(WWW, $ARGV[2]);
while(<WWW>) {
chop();
( $dir, $url ) = split(/\s+/);
$dir = $base . "/" . $dir;
$www{$dir} = $url;
}
close(WWW);
}
sub getdate {
@months = ("January", "February", "March", "April", "May","June",
"July", "August", "September", "October", "November", "December");
@ -152,7 +138,7 @@ sub main {
# Read a record
($name, $loc, $prefix, $desc, $ldesc, $owner, $cats,
$bdep, $rdep) = split('\|');
$bdep, $rdep, $www) = split('\|');
# Check for double hyphens in the name (--).
$name =~ s/--/-/g;
@ -188,8 +174,8 @@ sub main {
$data{$i} .= qq{ | <a href="$y2k{$loc}">Y2K</a>};
}
if ($www{"$loc"}) {
$data{$i} .= qq{ | <a href="$www{$loc}">Main Web Site</a>};
if ($www ne "") {
$data{$i} .= qq{ | <a href="$www">Main Web Site</a>};
}
$ownerurl = $owner;

18
es/ports/Makefile
View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.2 1999-03-18 13:55:09 jesusr Exp $
# $Id: Makefile,v 1.3 1999-04-21 11:44:43 asami Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@ -9,20 +9,17 @@ INDEX= INDEX
PINDEX= ports/${INDEX}
Y2K= YEAR2000
PY2K= ports/${Y2K}
WWW= WWW_SITE
PWWW= ports/${WWW}
COOKIE= ${INDEX} Makefile.gen
.if exists(Makefile.gen)
.include "Makefile.gen"
.endif
CLEANFILES+= ${DOCS} Makefile.gen ${INDEX} ${Y2K} ${WWW} packages.exists
CLEANFILES+= ${DOCS} Makefile.gen ${INDEX} ${Y2K} packages.exists
cvsindex= $${CVSROOT}/${PINDEX},v
cvsy2k= $${CVSROOT}/${PY2K},v
cvswww= $${CVSROOT}/${PWWW},v
_ALLINSTALL= packages.exists ${INDEX} ${Y2K} ${WWW}
_ALLINSTALL= packages.exists ${INDEX} ${Y2K}
${INDEX}: ${cvsindex}
cvs -QR co -p ${PINDEX} > ${INDEX}
@ -30,14 +27,11 @@ ${INDEX}: ${cvsindex}
${Y2K}: ${cvsy2k}
cvs -QR co -p ${PY2K} > ${Y2K}
${WWW}: ${cvswww}
cvs -QR co -p ${PWWW} > ${WWW}
# build the list of available packages only on the
# main FreeBSD machines
hostname!= hostname
packages.exists: ${cvsindex} ${cvsy2k} ${cvswww}
packages.exists: ${cvsindex} ${cvsy2k}
.if ${hostname} == "hub.freebsd.org" || ${hostname} == "freefall.freebsd.org"
sh ${.CURDIR}/packages > ${.TARGET}
.else
@ -48,8 +42,8 @@ Makefile.gen: index.sgml .NOTMAIN
echo DOCS= *.sgml > Makefile.gen
${MAKE} ${MAKEFLAGS} ${.IMPSRC}
index.sgml: ${INDEX} ${Y2K} ${WWW} packages.exists portindex ports.inc .NOTMAIN
index.sgml: ${INDEX} ${Y2K} packages.exists portindex ports.inc .NOTMAIN
rm -f *.sgml
${PORTINDEX} ${INDEX} ${Y2K} ${WWW}
${PORTINDEX} ${INDEX} ${Y2K}
.include "../web.mk"

20
es/ports/portindex
View file

@ -42,7 +42,6 @@ $today = &getdate;
&packages_exist('packages.exists', *packages);
&category_description('categories', *category_description);
&y2k_statements;
&www_sites;
&main;
sub y2k_statements {
@ -59,19 +58,6 @@ sub y2k_statements {
}
sub www_sites {
open(WWW, $ARGV[2]);
while(<WWW>) {
chop();
( $dir, $url ) = split(/\s+/);
$dir = $base . "/" . $dir;
$www{$dir} = $url;
}
close(WWW);
}
sub getdate {
@months = ("January", "February", "March", "April", "May","June",
"July", "August", "September", "October", "November", "December");
@ -152,7 +138,7 @@ sub main {
# Read a record
($name, $loc, $prefix, $desc, $ldesc, $owner, $cats,
$bdep, $rdep) = split('\|');
$bdep, $rdep, $www) = split('\|');
# Check for double hyphens in the name (--).
$name =~ s/--/-/g;
@ -188,8 +174,8 @@ sub main {
$data{$i} .= qq{ | <a href="$y2k{$loc}">Y2K</a>};
}
if ($www{"$loc"}) {
$data{$i} .= qq{ | <a href="$www{$loc}">Main Web Site</a>};
if ($www ne "") {
$data{$i} .= qq{ | <a href="$www">Main Web Site</a>};
}
$ownerurl = $owner;