aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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
parentbaab78ed8256557875d07faf48e9442225b7fc2a (diff)
downloaddoc-c67f1a1ff8154993c60904d735a231bba060d328.tar.gz
doc-c67f1a1ff8154993c60904d735a231bba060d328.zip
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
Notes: svn path=/head/; revision=47265
-rw-r--r--de_DE.ISO8859-1/htdocs/ports/Makefile18
-rw-r--r--de_DE.ISO8859-1/htdocs/ports/Makefile.inc2
-rw-r--r--en_US.ISO8859-1/htdocs/ports/Makefile16
-rw-r--r--en_US.ISO8859-1/htdocs/ports/Makefile.inc2
-rw-r--r--en_US.ISO8859-1/htdocs/ports/installing.xml6
-rwxr-xr-xen_US.ISO8859-1/htdocs/ports/portindex12
-rw-r--r--ja_JP.eucJP/htdocs/ports/Makefile18
-rw-r--r--ja_JP.eucJP/htdocs/ports/installing.xml2
-rwxr-xr-xja_JP.eucJP/htdocs/ports/portindex9
-rw-r--r--ru_RU.KOI8-R/htdocs/ports/Makefile18
-rw-r--r--ru_RU.KOI8-R/htdocs/ports/Makefile.inc2
-rw-r--r--ru_RU.KOI8-R/htdocs/ports/installing.xml2
-rwxr-xr-xru_RU.KOI8-R/htdocs/ports/portindex8
13 files changed, 13 insertions, 102 deletions
diff --git a/de_DE.ISO8859-1/htdocs/ports/Makefile b/de_DE.ISO8859-1/htdocs/ports/Makefile
index 4c197e2dfc..30afd90bd5 100644
--- a/de_DE.ISO8859-1/htdocs/ports/Makefile
+++ b/de_DE.ISO8859-1/htdocs/ports/Makefile
@@ -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 \
diff --git a/de_DE.ISO8859-1/htdocs/ports/Makefile.inc b/de_DE.ISO8859-1/htdocs/ports/Makefile.inc
index 9b9aa7b7c6..63c61eca50 100644
--- a/de_DE.ISO8859-1/htdocs/ports/Makefile.inc
+++ b/de_DE.ISO8859-1/htdocs/ports/Makefile.inc
@@ -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
diff --git a/en_US.ISO8859-1/htdocs/ports/Makefile b/en_US.ISO8859-1/htdocs/ports/Makefile
index 10991c18ad..5d386d8f40 100644
--- a/en_US.ISO8859-1/htdocs/ports/Makefile
+++ b/en_US.ISO8859-1/htdocs/ports/Makefile
@@ -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 \
diff --git a/en_US.ISO8859-1/htdocs/ports/Makefile.inc b/en_US.ISO8859-1/htdocs/ports/Makefile.inc
index 5eb76f4a14..51a0bcc60c 100644
--- a/en_US.ISO8859-1/htdocs/ports/Makefile.inc
+++ b/en_US.ISO8859-1/htdocs/ports/Makefile.inc
@@ -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
diff --git a/en_US.ISO8859-1/htdocs/ports/installing.xml b/en_US.ISO8859-1/htdocs/ports/installing.xml
index f11a4c4c5c..14499f694f 100644
--- a/en_US.ISO8859-1/htdocs/ports/installing.xml
+++ b/en_US.ISO8859-1/htdocs/ports/installing.xml
@@ -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>
diff --git a/en_US.ISO8859-1/htdocs/ports/portindex b/en_US.ISO8859-1/htdocs/ports/portindex
index 6d89252d8e..7db616f757 100755
--- a/en_US.ISO8859-1/htdocs/ports/portindex
+++ b/en_US.ISO8859-1/htdocs/ports/portindex
@@ -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);
}
diff --git a/ja_JP.eucJP/htdocs/ports/Makefile b/ja_JP.eucJP/htdocs/ports/Makefile
index bd2efe4606..c4e5b7908c 100644
--- a/ja_JP.eucJP/htdocs/ports/Makefile
+++ b/ja_JP.eucJP/htdocs/ports/Makefile
@@ -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 \
diff --git a/ja_JP.eucJP/htdocs/ports/installing.xml b/ja_JP.eucJP/htdocs/ports/installing.xml
index 05b5d62033..fa5d43e946 100644
--- a/ja_JP.eucJP/htdocs/ports/installing.xml
+++ b/ja_JP.eucJP/htdocs/ports/installing.xml
@@ -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>
diff --git a/ja_JP.eucJP/htdocs/ports/portindex b/ja_JP.eucJP/htdocs/ports/portindex
index f35dad3fa0..ae6c7c967d 100755
--- a/ja_JP.eucJP/htdocs/ports/portindex
+++ b/ja_JP.eucJP/htdocs/ports/portindex
@@ -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;
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}:
.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 \
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+= ${DYNAMIC_DOCS}
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>
</body>
</html>
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
$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;