From owner-svn-doc-head@freebsd.org Tue Aug 18 20:36:27 2015
Return-Path:
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3EDB29BC3D3;
Tue, 18 Aug 2015 20:36:27 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 2A397B37;
Tue, 18 Aug 2015 20:36:27 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7IKaRkr020155;
Tue, 18 Aug 2015 20:36:27 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7IKaNWe020141;
Tue, 18 Aug 2015 20:36:23 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201508182036.t7IKaNWe020141@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber
Date: Tue, 18 Aug 2015 20:36:23 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r47265 - in head: de_DE.ISO8859-1/htdocs/ports
en_US.ISO8859-1/htdocs/ports ja_JP.eucJP/htdocs/ports
ru_RU.KOI8-R/htdocs/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 18 Aug 2015 20:36:27 -0000
Author: gjb
Date: Tue Aug 18 20:36:22 2015
New Revision: 47265
URL: https://svnweb.freebsd.org/changeset/doc/47265
Log:
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
Modified:
head/de_DE.ISO8859-1/htdocs/ports/Makefile
head/de_DE.ISO8859-1/htdocs/ports/Makefile.inc
head/en_US.ISO8859-1/htdocs/ports/Makefile
head/en_US.ISO8859-1/htdocs/ports/Makefile.inc
head/en_US.ISO8859-1/htdocs/ports/installing.xml
head/en_US.ISO8859-1/htdocs/ports/portindex
head/ja_JP.eucJP/htdocs/ports/Makefile
head/ja_JP.eucJP/htdocs/ports/installing.xml
head/ja_JP.eucJP/htdocs/ports/portindex
head/ru_RU.KOI8-R/htdocs/ports/Makefile
head/ru_RU.KOI8-R/htdocs/ports/Makefile.inc
head/ru_RU.KOI8-R/htdocs/ports/installing.xml
head/ru_RU.KOI8-R/htdocs/ports/portindex
Modified: head/de_DE.ISO8859-1/htdocs/ports/Makefile
==============================================================================
--- head/de_DE.ISO8859-1/htdocs/ports/Makefile Tue Aug 18 20:29:06 2015 (r47264)
+++ head/de_DE.ISO8859-1/htdocs/ports/Makefile Tue Aug 18 20:36:22 2015 (r47265)
@@ -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 categ
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, .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 \
Modified: head/de_DE.ISO8859-1/htdocs/ports/Makefile.inc
==============================================================================
--- head/de_DE.ISO8859-1/htdocs/ports/Makefile.inc Tue Aug 18 20:29:06 2015 (r47264)
+++ head/de_DE.ISO8859-1/htdocs/ports/Makefile.inc Tue Aug 18 20:36:22 2015 (r47265)
@@ -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
Modified: head/en_US.ISO8859-1/htdocs/ports/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/ports/Makefile Tue Aug 18 20:29:06 2015 (r47264)
+++ head/en_US.ISO8859-1/htdocs/ports/Makefile Tue Aug 18 20:36:22 2015 (r47265)
@@ -58,25 +58,11 @@ Makefile.gen: categories-alpha.xml categ
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, .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 \
Modified: head/en_US.ISO8859-1/htdocs/ports/Makefile.inc
==============================================================================
--- head/en_US.ISO8859-1/htdocs/ports/Makefile.inc Tue Aug 18 20:29:06 2015 (r47264)
+++ head/en_US.ISO8859-1/htdocs/ports/Makefile.inc Tue Aug 18 20:36:22 2015 (r47265)
@@ -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
Modified: head/en_US.ISO8859-1/htdocs/ports/installing.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/ports/installing.xml Tue Aug 18 20:29:06 2015 (r47264)
+++ head/en_US.ISO8859-1/htdocs/ports/installing.xml Tue Aug 18 20:36:22 2015 (r47265)
@@ -32,11 +32,5 @@
href="&base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">portsnap
or Subversion.
-
-A gzipped
- tarball of the Ports Collection can also be downloaded. The
- current size of the file is &ports.size;.
-