From c67f1a1ff8154993c60904d735a231bba060d328 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Tue, 18 Aug 2015 20:36:22 +0000 Subject: 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 --- ru_RU.KOI8-R/htdocs/ports/Makefile | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'ru_RU.KOI8-R/htdocs/ports/Makefile') 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, .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 \ -- cgit v1.2.3