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

Remove the 'ports.size' target and all references to it in

Browse source 
the htdocs/ directories.

While here, fix the hostname(1) evaluation for non-en_US
translations.

These scripts used to fetch the ports.tgz file from FTP, but
this file no longer exists.  Since we already reference the
size of the ports tree (via share/xml/freebsd.ent) for the
Handbook, I do not plan to bring back this functionality, as
the information it was producing was incorrect anyway.

Note to translators of de_DE, ja_JP, and ru_RU trees:
The relevant files in the htdocs/ directories also needed to
be updated as part of this commit to avoid breaking the build.

Because my editor does not seem to properly handle ja_JP or
ru_RU, editing the installing.xml files within those trees was
not an option, as it mangled the file after saving.  A sed(1)
substitution to comment the '&ports.size;' macro was done here
instead, but the entire line referencing ftp.freebsd.org should
be removed instead.

Approved by:	doceng (implicit)
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2015-08-18 20:36:22 +00:00
parent baab78ed82
commit c67f1a1ff8
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=47265
13 changed files with 13 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
de_DE.ISO8859-1/htdocs/ports/Makefile
View file

@ -27,7 +27,7 @@ ${INDEX}:
.endif
HOSTNAME!= hostname
.if ${HOSTNAME} == "hub.freebsd.org" || ${HOSTNAME} == "freefall.freebsd.org" || ${HOSTNAME} == "www.freebsd.org" || ${HOSTNAME} == "build-web.stream.FreeBSD.org"
.if ${HOSTNAME} == "freefall.freebsd.org" || ${HOSTNAME} == "build-web.ysv.freebsd.org"
CLUSTER_MACHINE= YES
.endif
@ -60,25 +60,11 @@ Makefile.gen: categories-alpha.xml categories-grouped.xml index.xml \
done
${ECHO_CMD} >> Makefile.gen
.if defined(CLUSTER_MACHINE)
PORTS_TARGZ_URL?= ftp://ftp-master.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz
.else
PORTS_TARGZ_URL?= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz
.endif
ports.size:
.if defined (NOPORTSNET)
touch ${.TARGET}
.else
${RM} -f ${.TARGET}
${FETCH} -s ${PORTS_TARGZ_URL} > ${.TARGET}
.endif
# this builds: categories-alpha.xml, categories-grouped.xml,
# master-index.xml, statistics.ent, <category>.xml
CATEGORYLIST=`grep "^[a-z]" categories | sed -e s"/,.*//"`
categories-alpha.xml: ${INDEX} categories categories.descriptions \
packages.exists ports.ent ports.size .NOTMAIN
packages.exists ports.ent .NOTMAIN
${RM} -f categories-alpha.xml categories-grouped.xml \
master-index.xml statistics.ent
for categoryfile in ${CATEGORYLIST}; do \

2
de_DE.ISO8859-1/htdocs/ports/Makefile.inc
View file

@ -12,7 +12,7 @@ CLEANFILES+= ${INDEX} ${INDEX}.bz2
CLEANFILES+= packages.exists.temp packages.exists
CLEANFILES+= ${DYNAMIC_DOCS}
CLEANFILES+= Makefile.gen
CLEANFILES+= ports.count ports.size
CLEANFILES+= ports.count
_ALLINSTALL= packages.exists categories

16
en_US.ISO8859-1/htdocs/ports/Makefile
View file

@ -58,25 +58,11 @@ Makefile.gen: categories-alpha.xml categories-grouped.xml index.xml \
done
${ECHO_CMD} >> Makefile.gen
.if defined(CLUSTER_MACHINE)
PORTS_TARGZ_URL?= ftp://ftp-master.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz
.else
PORTS_TARGZ_URL?= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz
.endif
ports.size:
.if defined (NOPORTSNET)
touch ${.TARGET}
.else
${RM} -f ${.TARGET}
${FETCH} -s ${PORTS_TARGZ_URL} > ${.TARGET}
.endif
# this builds: categories-alpha.xml, categories-grouped.xml,
# master-index.xml, statistics.ent, <category>.xml
CATEGORYLIST=`grep "^[a-z]" categories | sed -e s"/,.*//"`
categories-alpha.xml: ${INDEX} categories categories.descriptions \
packages.exists portindex ports.ent ports.size .NOTMAIN
packages.exists portindex ports.ent .NOTMAIN
${RM} -f categories-alpha.xml categories-grouped.xml \
master-index.xml statistics.ent
for categoryfile in ${CATEGORYLIST}; do \

2
en_US.ISO8859-1/htdocs/ports/Makefile.inc
View file

@ -10,7 +10,7 @@ CLEANFILES+= ${INDEX} ${INDEX}.bz2
CLEANFILES+= packages.exists.temp packages.exists
CLEANFILES+= ${DYNAMIC_DOCS}
CLEANFILES+= Makefile.gen
CLEANFILES+= ports.count ports.size
CLEANFILES+= ports.count
_ALLINSTALL= packages.exists categories

6
en_US.ISO8859-1/htdocs/ports/installing.xml
View file

@ -32,11 +32,5 @@
href="&base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html"><tt>portsnap</tt></a>
or <a
href="&base;/doc/en_US.ISO8859-1/books/handbook/svn.html">Subversion</a>.</p>
<p>A <a
href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz">gzipped
tarball of the Ports Collection</a> can also be downloaded. The
current size of the file is &ports.size;.</p>
</body>
</html>

12
en_US.ISO8859-1/htdocs/ports/portindex
View file

@ -362,19 +362,9 @@ EOF
$mindex->close;
# Create statistics.ent
$statistics->open(">statistics.ent");
my $ptgzsize = `cat ports.size 2>/dev/null` || "";
if ($ptgzsize =~ /^\d+$/) {
$ptgzsize = sprintf("%.0f", $ptgzsize/(1024*1024));
print $statistics "<!ENTITY ports.size 'about $ptgzsize megabytes'>\n";
} else {
warn "Unknown size for ports.tar.gz\n";
print $statistics "<!ENTITY ports.size 'several tens of megabytes'>\n";
}
print $statistics "<!ENTITY ports.count '$portnumber'>\n";
$statistics->close;
close(INDEX);
}

18
ja_JP.eucJP/htdocs/ports/Makefile
View file

@ -27,7 +27,7 @@ ${INDEX}:
.endif
HOSTNAME!= hostname
.if ${HOSTNAME} == "hub.freebsd.org" || ${HOSTNAME} == "freefall.freebsd.org" || ${HOSTNAME} == "www.freebsd.org" || ${HOSTNAME} == "build-web.stream.FreeBSD.org"
.if ${HOSTNAME} == "freefall.freebsd.org" || ${HOSTNAME} == "build-web.ysv.freebsd.org"
CLUSTER_MACHINE= YES
.endif
@ -64,25 +64,11 @@ Makefile.gen: categories-alpha.xml categories-grouped.xml index.xml \
done
${ECHO_CMD} >> Makefile.gen
.if defined(CLUSTER_MACHINE)
PORTS_TARGZ_URL?= ftp://ftp-master.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz
.else
PORTS_TARGZ_URL?= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz
.endif
ports.size:
.if defined (NOPORTSNET)
touch ${.TARGET}
.else
${RM} -f ${.TARGET}
${FETCH} -s ${PORTS_TARGZ_URL} > ${.TARGET}
.endif
# this builds: categories-alpha.xml, categories-grouped.xml,
# master-index.xml, statistics.ent, <category>.xml
CATEGORYLIST=`grep "^[a-z]" ${DOC_PREFIX}/en_US.ISO8859-1/htdocs/ports/categories | sed -e s"/,.*//"`
categories-alpha.xml: ${INDEX} categories categories.descriptions \
packages.exists portindex ports.ent ports.size .NOTMAIN
packages.exists portindex ports.ent .NOTMAIN
${RM} -f categories-alpha.xml categories-grouped.xml \
master-index.xml statistics.ent
for categoryfile in ${CATEGORYLIST}; do \

2
ja_JP.eucJP/htdocs/ports/installing.xml
View file

@ -36,7 +36,7 @@
または
<a href="&enbase;/doc/ja_JP.eucJP/books/handbook/svn.html">Subversion</a>
を使ってインストールしてください。
現在のファイルのサイズは &ports.size; です。</p>
現在のファイルのサイズは <!-- &ports.size; --> です。</p>
</body>
</html>

9
ja_JP.eucJP/htdocs/ports/portindex
View file

@ -399,15 +399,6 @@ EOF
$statistics->open(">statistics.ent");
my $ptgzsize = `cat ports.size 2>/dev/null` || "";
if ($ptgzsize =~ /^\d+$/) {
$ptgzsize = sprintf("%.0f", $ptgzsize/(1024*1024));
print $statistics "<?xml version=\"1.0\" encoding=\"euc-jp\"?>\n";
print $statistics "<!ENTITY ports.size 'およそ $ptgzsize メガバイト'>\n";
} else {
warn "Unknown size for ports.tar.gz\n";
print $statistics "<!ENTITY ports.size 'several tens of megabytes'>\n";
}
print $statistics "<!ENTITY ports.count '$portnumber'>\n";
$statistics->close;

18
ru_RU.KOI8-R/htdocs/ports/Makefile
View file

@ -32,7 +32,7 @@ ${INDEX}:
.endif
HOSTNAME!= hostname
.if ${HOSTNAME} == "hub.freebsd.org" || ${HOSTNAME} == "freefall.freebsd.org" || ${HOSTNAME} == "www.freebsd.org" || ${HOSTNAME} == "build-web.stream.FreeBSD.org"
.if ${HOSTNAME} == "freefall.freebsd.org" || ${HOSTNAME} == "build-web.ysv.freebsd.org"
CLUSTER_MACHINE= YES
.endif
@ -65,25 +65,11 @@ Makefile.gen: categories-alpha.xml categories-grouped.xml index.xml \
done
${ECHO_CMD} >> Makefile.gen
.if defined(CLUSTER_MACHINE)
PORTS_TARGZ_URL?= ftp://ftp-master.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz
.else
PORTS_TARGZ_URL?= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz
.endif
ports.size:
.if defined (NOPORTSNET)
touch ${.TARGET}
.else
${RM} -f ${.TARGET}
${FETCH} -s ${PORTS_TARGZ_URL} > ${.TARGET}
.endif
# this builds: categories-alpha.xml, categories-grouped.xml,
# master-index.xml, statistics.ent, <category>.xml
CATEGORYLIST=`grep "^[a-z]" categories | awk -F, '{print $$1}'`
categories-alpha.xml: ${INDEX} categories categories.descriptions \
packages.exists portindex ports.ent ports.size .NOTMAIN
packages.exists portindex ports.ent .NOTMAIN
${RM} -f categories-alpha.xml categories-grouped.xml \
master-index.xml statistics.ent
for categoryfile in ${CATEGORYLIST}; do \

2
ru_RU.KOI8-R/htdocs/ports/Makefile.inc
View file

@ -17,7 +17,7 @@ CLEANFILES+= ${INDEX} ${INDEX}.bz2
CLEANFILES+= packages.exists.temp packages.exists
CLEANFILES+= ${DYNAMIC_DOCS}
CLEANFILES+= Makefile.gen
CLEANFILES+= ports.count ports.size
CLEANFILES+= ports.count
_ALLINSTALL= packages.exists categories

2
ru_RU.KOI8-R/htdocs/ports/installing.xml
View file

@ -33,7 +33,7 @@
<p>Если же вы не используете этот метод установки, вы можете
<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz">
загрузить сжатый архив</a> с полным деревом портов. Размер файла
ÓĎÓÔÁ×ĚŃĹÔ &ports.size;.</p>
ÓĎÓÔÁ×ĚŃĹÔ <!-- &ports.size; -->.</p>
</body>
</html>

8
ru_RU.KOI8-R/htdocs/ports/portindex
View file

@ -386,14 +386,6 @@ EOF
$statistics->open(">statistics.ent");
print $statistics "<?xml version=\"1.0\" encoding=\"koi8-r\"?>\n";
my $ptgzsize = `cat ports.size 2>/dev/null` || "";
if ($ptgzsize =~ /^\d+$/) {
$ptgzsize = sprintf("%.0f", $ptgzsize/(1024*1024));
print $statistics "<!ENTITY ports.size '$ptgzsize ÍĹÇÁÂÁĘÔ'>\n";
} else {
warn "Unknown size for ports.tar.gz\n";
print $statistics "<!ENTITY ports.size 'ÎĹÓËĎĚŘËĎ ÄĹÓŃÔËĎ× ÍĹÇÁÂÁĘÔ'>\n";
}
print $statistics "<!ENTITY ports.count '$portnumber'>\n";
$statistics->close;