Date: Tue, 18 Aug 2015 20:36:23 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> 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 Message-ID: <201508182036.t7IKaNWe020141@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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, <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 \ 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, <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 \ 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"><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> Modified: head/en_US.ISO8859-1/htdocs/ports/portindex ============================================================================== --- head/en_US.ISO8859-1/htdocs/ports/portindex Tue Aug 18 20:29:06 2015 (r47264) +++ head/en_US.ISO8859-1/htdocs/ports/portindex Tue Aug 18 20:36:22 2015 (r47265) @@ -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); } Modified: head/ja_JP.eucJP/htdocs/ports/Makefile ============================================================================== --- head/ja_JP.eucJP/htdocs/ports/Makefile Tue Aug 18 20:29:06 2015 (r47264) +++ head/ja_JP.eucJP/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 @@ -64,25 +64,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, <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 \ Modified: head/ja_JP.eucJP/htdocs/ports/installing.xml ============================================================================== --- head/ja_JP.eucJP/htdocs/ports/installing.xml Tue Aug 18 20:29:06 2015 (r47264) +++ head/ja_JP.eucJP/htdocs/ports/installing.xml Tue Aug 18 20:36:22 2015 (r47265) @@ -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> Modified: head/ja_JP.eucJP/htdocs/ports/portindex ============================================================================== --- head/ja_JP.eucJP/htdocs/ports/portindex Tue Aug 18 20:29:06 2015 (r47264) +++ head/ja_JP.eucJP/htdocs/ports/portindex Tue Aug 18 20:36:22 2015 (r47265) @@ -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; Modified: head/ru_RU.KOI8-R/htdocs/ports/Makefile ============================================================================== --- head/ru_RU.KOI8-R/htdocs/ports/Makefile Tue Aug 18 20:29:06 2015 (r47264) +++ head/ru_RU.KOI8-R/htdocs/ports/Makefile Tue Aug 18 20:36:22 2015 (r47265) @@ -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 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, <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 \ Modified: head/ru_RU.KOI8-R/htdocs/ports/Makefile.inc ============================================================================== --- head/ru_RU.KOI8-R/htdocs/ports/Makefile.inc Tue Aug 18 20:29:06 2015 (r47264) +++ head/ru_RU.KOI8-R/htdocs/ports/Makefile.inc Tue Aug 18 20:36:22 2015 (r47265) @@ -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 Modified: head/ru_RU.KOI8-R/htdocs/ports/installing.xml ============================================================================== --- head/ru_RU.KOI8-R/htdocs/ports/installing.xml Tue Aug 18 20:29:06 2015 (r47264) +++ head/ru_RU.KOI8-R/htdocs/ports/installing.xml Tue Aug 18 20:36:22 2015 (r47265) @@ -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> Modified: head/ru_RU.KOI8-R/htdocs/ports/portindex ============================================================================== --- head/ru_RU.KOI8-R/htdocs/ports/portindex Tue Aug 18 20:29:06 2015 (r47264) +++ head/ru_RU.KOI8-R/htdocs/ports/portindex Tue Aug 18 20:36:22 2015 (r47265) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508182036.t7IKaNWe020141>