diff --git a/es/ports/Makefile b/es/ports/Makefile
index b50d600972..dbca3b7e45 100644
--- a/es/ports/Makefile
+++ b/es/ports/Makefile
@@ -1,50 +1,51 @@
-# $FreeBSD: www/es/ports/Makefile,v 1.11 2001/12/12 11:57:37 phantom Exp $
+# $FreeBSD: www/es/ports/Makefile,v 1.12 2004/11/13 12:23:19 ceri Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 .if exists(Makefile.inc)
 .include "Makefile.inc"
 .endif
 
 FETCH_OPT?=	-am
 
 .if defined(NOPORTSCVS)
 ${INDEX}: $${PORTSBASE}/${PINDEX}
 	cp ${PORTSBASE}/${PINDEX} ${INDEX}
 .else
 ${INDEX}:
-	${FETCH} ${FETCH_OPT} ${INDEXURI}
+	${FETCH} ${FETCH_OPT} -o ${INDEX}.bz2 ${INDEXURI}.bz2
+	${BUNZIP2} ${INDEX}.bz2
 .endif
 
 # build the list of available packages only on the 
 # main FreeBSD machines
 hostname!= hostname
 
 packages.exists:
 .if ${hostname} == "hub.freebsd.org" || ${hostname} == "freefall.freebsd.org"
 .if  exists(${.CURDIR}/../../en/ports/packages.exists)
 	cp ${.CURDIR}/../../en/ports/${.TARGET} .
 .else
 	sh ${.CURDIR}/packages > ${.TARGET}
 .endif
 .else
 	touch ${.TARGET}
 .endif
 
 Makefile.gen: index.sgml .NOTMAIN
 	echo DOCS= *.sgml > Makefile.gen
 
 index.sgml: ${INDEX} packages.exists portindex ports.inc .NOTMAIN
 	rm -f *.sgml
 	${PORTINDEX} ${INDEX} ${.CURDIR}
 
 install: all
 
 all install clean:
 	(cd ${.CURDIR} && ${MAKE}  ${MAKEFLAGS} -f ${.CURDIR}/Makefile.inc0 ${.TARGET})
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/es/ports/Makefile.inc b/es/ports/Makefile.inc
index 6758dc1ad9..8d2459ad39 100644
--- a/es/ports/Makefile.inc
+++ b/es/ports/Makefile.inc
@@ -1,16 +1,16 @@
 
 PORTINDEX=	perl5 ${.CURDIR}/portindex
 INDEX=		INDEX
 PINDEX=		ports/${INDEX}
 
 COOKIE=		${INDEX} Makefile.gen
 
-CLEANFILES+=	${INDEX} 
+CLEANFILES+=	${INDEX} ${INDEX}.bz2
 CLEANFILES+=	packages.exists.temp  packages.exists
 CLEANFILES+= 	${DOCS} 
 CLEANFILES+=	Makefile.gen
 
 cvsindex= $${CVSROOT}/${PINDEX},v
 
 _ALLINSTALL= packages.exists ${INDEX}
 
diff --git a/ja/ports/Makefile b/ja/ports/Makefile
index 010de6884e..1c8caf9ace 100644
--- a/ja/ports/Makefile
+++ b/ja/ports/Makefile
@@ -1,82 +1,83 @@
-# $FreeBSD: www/ja/ports/Makefile,v 1.26 2004/11/01 06:36:22 rushani Exp $
+# $FreeBSD: www/ja/ports/Makefile,v 1.27 2004/11/13 12:23:19 ceri Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.37
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 .if exists(../../en/ports/Makefile.inc)
 .include "../../en/ports/Makefile.inc"
 .endif
 
 FETCH_OPT?=	-am
 
 .if defined(PINDEX_OVERRIDE)
 ${INDEX}: ${PINDEX_OVERRIDE}
 	${CP} ${PINDEX_OVERRIDE} ${INDEX}
 .elif defined(NOPORTSNET)
 ${INDEX}: $${PORTSBASE}/${PINDEX}
 	${CP} ${PORTSBASE}/${PINDEX} ${INDEX}
 .else
 ${INDEX}:
-	${FETCH} ${FETCH_OPT} ${INDEXURI}
+	${FETCH} ${FETCH_OPT} -o ${INDEX}.bz2 ${INDEXURI}.bz2
+	${BUNZIP2} ${INDEX}.bz2
 .endif
 
 # build the list of available packages only on the 
 # main FreeBSD machines
 hostname!= hostname
 
 
 #
 # don't build the packages links if NO_PACKAGES_LINK
 # is set and not empty.
 #
 # XXX: you can set NO_PACKAGES_LINK to your hostname to
 #      test the packages link generation
 #
 .if defined(NO_PACKAGES_LINK) && !empty(NO_PACKAGES_LINK)
 hostname=	${NO_PACKAGES_LINK}
 .endif
 
 packages.exists:
 .if ${hostname} == "hub.freebsd.org" || ${hostname} == "freefall.freebsd.org" || ${hostname} == "www.freebsd.org"
 .if  exists(${.CURDIR}/../../en/ports/packages.exists)
 	cp ${.CURDIR}/../../en/ports/${.TARGET} .
 .else
 	@if ${SH} ${.CURDIR}/../../en/ports/packages > ${.TARGET}.temp; then \
 		${MV} ${.TARGET}.temp ${.TARGET}; \
 	else \
 		${RM} ${.TARGET}.temp; ${TOUCH} ${.TARGET}; \
 	fi;
 .endif
 .else
 	${TOUCH} ${.TARGET}
 .endif
 
 Makefile.gen: index.sgml .NOTMAIN
 	${ECHO_CMD} DOCS= *.sgml > Makefile.gen
 
 index.sgml: ${INDEX} categories packages.exists portindex ports.inc .NOTMAIN
 	${RM} -f *.sgml
 	${PORTINDEX} ${INDEX} ${.CURDIR}
 
 install: all beforeinstall
 
 all install clean:
 	cd ${.CURDIR}; \
 		${MAKE} ${MAKEFLAGS} -f ${.CURDIR}/Makefile.inc0 ${.TARGET}
 .if defined(WITH_PORTS_GROWTH)
 # Because We refer www/ports/growth/status.png on web site from ports.inc,
 # don't need to have local version of the image file.
 #	cd growth; \
 #		${MAKE} ${MAKEFLAGS} ${.TARGET}
 beforeinstall:
 .else
 beforeinstall:
 	${PERL} -pi -e 's/href=\"growth/href=\"http:\/\/www.FreeBSD.org\/ports\/growth/' index.html
 .endif
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ru/ports/Makefile b/ru/ports/Makefile
index 7fe9b62b16..56e3a267c7 100644
--- a/ru/ports/Makefile
+++ b/ru/ports/Makefile
@@ -1,81 +1,82 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD: www/ru/ports/Makefile,v 1.7 2004/03/23 23:04:23 phantom Exp $
+# $FreeBSD: www/ru/ports/Makefile,v 1.8 2004/11/13 12:23:19 ceri Exp $
 # $FreeBSDru: frdp/www/ru/ports/Makefile,v 1.9 2004/03/23 21:09:19 phantom Exp $
 #
 # Original revision: 1.36
 #
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 .if exists(Makefile.inc)
 .include "Makefile.inc"
 .endif
 
 FETCH_OPT?=	-am
 
 .if defined(NOPORTSNET)
 ${INDEX}: $${PORTSBASE}/${PINDEX}
 	${CP} ${PORTSBASE}/${PINDEX} ${INDEX}
 .else
 ${INDEX}:
-	${FETCH} ${FETCH_OPT} ${INDEXURI} || (${RM} -f ${INDEX} && false)
+	${FETCH} ${FETCH_OPT} -o ${INDEX}.bz2 ${INDEXURI}.bz2
+	${BUNZIP2} ${INDEX}.bz2
 .endif
 
 # build the list of available packages only on the 
 # main FreeBSD machines
 hostname!= hostname
 
 #
 # don't build the packages links if NO_PACKAGES_LINK
 # is set and not empty.
 #
 # XXX: you can set NO_PACKAGES_LINK to your hostname to
 #      test the packages link generation
 #
 .if defined(NO_PACKAGES_LINK) && !empty(NO_PACKAGES_LINK)
 hostname=	${NO_PACKAGES_LINK}
 .endif
 
 packages.exists:
 .if ${hostname} == "hub.freebsd.org" || ${hostname} == "freefall.freebsd.org" || ${hostname} == "www.freebsd.org"
 .if  exists(${.CURDIR}/../../en/ports/packages.exists)
 	${CP} ${.CURDIR}/../../en/ports/${.TARGET} ${.CURDIR}
 .else
 	@if ${SH} ${.CURDIR}/../../en/ports/packages > ${.TARGET}.temp; then \
 		${MV} ${.TARGET}.temp ${.TARGET}; \
 	else \
 		${RM} ${.TARGET}.temp; ${TOUCH} ${.TARGET}; \
 	fi;
 .endif
 .else
 	${TOUCH} ${.TARGET}
 .endif
 
 Makefile.gen: index.sgml .NOTMAIN
 	${ECHO_CMD} DOCS= *.sgml > Makefile.gen
 
 index.sgml: ${INDEX} categories packages.exists portindex ports.inc .NOTMAIN
 	${RM} -f *.sgml
 	${PORTINDEX} ${INDEX} ${.CURDIR}
 
 install: all beforeinstall
 
 all install clean:
 	cd ${.CURDIR}; \
 		${MAKE} ${MAKEFLAGS} -f ${.CURDIR}/Makefile.inc0 ${.TARGET}
 #.if defined(WITH_PORTS_GROWTH)
 #	cd growth; \
 #		${MAKE} ${MAKEFLAGS} ${.TARGET}
 #beforeinstall:
 #.else
 beforeinstall:
 	${PERL} -pi -e 's/href=\"growth/href=\"http:\/\/www.FreeBSD.org\/ports\/growth/' index.html
 #.endif
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ru/ports/Makefile.inc b/ru/ports/Makefile.inc
index 674c72ffcc..e192229cd2 100644
--- a/ru/ports/Makefile.inc
+++ b/ru/ports/Makefile.inc
@@ -1,22 +1,22 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: www/ru/ports/Makefile.inc,v 1.2 2004/03/23 23:05:07 phantom Exp $
 # $FreeBSDru: frdp/www/ru/ports/Makefile.inc,v 1.3 2004/01/06 17:28:41 andy Exp $
 #
 #  Original revision: 1.6
 #
 
 PORTINDEX=	${PERL} ${.CURDIR}/portindex
 INDEX=		INDEX
 PINDEX=		ports/${INDEX}
 
 COOKIE=		${INDEX} Makefile.gen
 
-CLEANFILES+=	${INDEX} 
+CLEANFILES+=	${INDEX} ${INDEX}.bz2
 CLEANFILES+=	packages.exists.temp  packages.exists
 CLEANFILES+= 	${DOCS} 
 CLEANFILES+=	Makefile.gen
 
 _ALLINSTALL= packages.exists ${INDEX} categories