path: root/ru_RU.KOI8-R
diff options
authorGlen Barber <gjb@FreeBSD.org>2015-08-18 20:36:22 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-08-18 20:36:22 +0000
commitc67f1a1ff8154993c60904d735a231bba060d328 (patch)
treec1260528824ac9b7fe107b9f06b62fafc5032643 /ru_RU.KOI8-R
parentbaab78ed8256557875d07faf48e9442225b7fc2a (diff)
Remove the 'ports.size' target and all references to it in
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
Notes: svn path=/head/; revision=47265
Diffstat (limited to 'ru_RU.KOI8-R')
4 files changed, 4 insertions, 26 deletions
diff --git a/ru_RU.KOI8-R/htdocs/ports/Makefile b/ru_RU.KOI8-R/htdocs/ports/Makefile
index 35620dc89c..eee1261393 100644
--- a/ru_RU.KOI8-R/htdocs/ports/Makefile
+++ b/ru_RU.KOI8-R/htdocs/ports/Makefile
@@ -32,7 +32,7 @@ ${INDEX}:
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"
@@ -65,25 +65,11 @@ Makefile.gen: categories-alpha.xml categories-grouped.xml index.xml \
${ECHO_CMD} >> Makefile.gen
-.if defined(CLUSTER_MACHINE)
-PORTS_TARGZ_URL?= ftp://ftp-master.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz
-PORTS_TARGZ_URL?= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz
-.if defined (NOPORTSNET)
- touch ${.TARGET}
- ${RM} -f ${.TARGET}
# 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 \
diff --git a/ru_RU.KOI8-R/htdocs/ports/Makefile.inc b/ru_RU.KOI8-R/htdocs/ports/Makefile.inc
index 981b4f21ae..e0d9bd7474 100644
--- a/ru_RU.KOI8-R/htdocs/ports/Makefile.inc
+++ b/ru_RU.KOI8-R/htdocs/ports/Makefile.inc
@@ -17,7 +17,7 @@ CLEANFILES+= ${INDEX} ${INDEX}.bz2
CLEANFILES+= packages.exists.temp packages.exists
CLEANFILES+= Makefile.gen
-CLEANFILES+= ports.count ports.size
+CLEANFILES+= ports.count
_ALLINSTALL= packages.exists categories
diff --git a/ru_RU.KOI8-R/htdocs/ports/installing.xml b/ru_RU.KOI8-R/htdocs/ports/installing.xml
index 77ea65c0a5..0d336e3226 100644
--- a/ru_RU.KOI8-R/htdocs/ports/installing.xml
+++ b/ru_RU.KOI8-R/htdocs/ports/installing.xml
@@ -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>
diff --git a/ru_RU.KOI8-R/htdocs/ports/portindex b/ru_RU.KOI8-R/htdocs/ports/portindex
index 41be9f97bb..130c54fda2 100755
--- a/ru_RU.KOI8-R/htdocs/ports/portindex
+++ b/ru_RU.KOI8-R/htdocs/ports/portindex
@@ -386,14 +386,6 @@ EOF
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";