From 1bfe2d2ce5c7fdb18a863a7c647629fb1adb7037 Mon Sep 17 00:00:00 2001 From: Satoshi Asami Date: Wed, 21 Apr 1999 11:44:43 +0000 Subject: [PATCH] Get www site info from INDEX instead of WWW_SITE. Note that I only 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 --- en/ports/Makefile | 19 ++++++------------- en/ports/portindex | 20 +++----------------- es/ports/Makefile | 18 ++++++------------ es/ports/portindex | 20 +++----------------- 4 files changed, 18 insertions(+), 59 deletions(-) diff --git a/en/ports/Makefile b/en/ports/Makefile index 3769d23e32..ebd82c7b3e 100644 --- a/en/ports/Makefile +++ b/en/ports/Makefile @@ -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" diff --git a/en/ports/portindex b/en/ports/portindex index fcfaf53c8e..af45b0947d 100755 --- a/en/ports/portindex +++ b/en/ports/portindex @@ -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() { - 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{ | Y2K}; } - if ($www{"$loc"}) { - $data{$i} .= qq{ | Main Web Site}; + if ($www ne "") { + $data{$i} .= qq{ | Main Web Site}; } $ownerurl = $owner; diff --git a/es/ports/Makefile b/es/ports/Makefile index da32a3a556..122e12c67e 100644 --- a/es/ports/Makefile +++ b/es/ports/Makefile @@ -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" diff --git a/es/ports/portindex b/es/ports/portindex index fcfaf53c8e..af45b0947d 100755 --- a/es/ports/portindex +++ b/es/ports/portindex @@ -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() { - 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{ | Y2K}; } - if ($www{"$loc"}) { - $data{$i} .= qq{ | Main Web Site}; + if ($www ne "") { + $data{$i} .= qq{ | Main Web Site}; } $ownerurl = $owner;