diff --git a/en/ports/Makefile b/en/ports/Makefile
index 1c815a672c..74856f899d 100644
--- a/en/ports/Makefile
+++ b/en/ports/Makefile
@@ -1,93 +1,86 @@
-# $FreeBSD: www/en/ports/Makefile,v 1.41 2005/10/18 12:24:12 edwin Exp $
+# $FreeBSD: www/en/ports/Makefile,v 1.42 2005/11/15 10:09:26 osa 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
 
 #
 # Force NO_TIDY for the ports web pages, since it takes a long time to
 # run tidy on these huge HTML files, and the files are valid HTML when
 # generated by portindex, even without tidy.
 #
 NO_TIDY=	YES
 
 .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}
 .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}
+HOSTNAME!= hostname
+.if ${HOSTNAME} == "hub.freebsd.org" || ${HOSTNAME} == "freefall.freebsd.org" || ${HOSTNAME} == "www.freebsd.org"
+CLUSTER_MACHINE=	YES
 .endif
 
+# Build the list of available packages, but only on the main FreeBSD machines.
+# Don't build the list if NO_PACKAGES_LINK is set and not empty.
+#
 packages.exists:
-.if ${hostname} == "hub.freebsd.org" || ${hostname} == "freefall.freebsd.org" || ${hostname} == "www.freebsd.org"
+.if defined(CLUSTER_MACHINE) && (!defined(NO_PACKAGES_LINK) || empty(NO_PACKAGES_LINK))
 	@if ${SH} ${.CURDIR}/packages > ${.TARGET}.temp; then \
 		${MV} ${.TARGET}.temp ${.TARGET}; \
 	else \
 		${RM} ${.TARGET}.temp; ${TOUCH} ${.TARGET}; \
 	fi;
 .else
 	${TOUCH} ${.TARGET}
 .endif
 
 Makefile.gen: index.sgml .NOTMAIN
 	${ECHO_CMD} DOCS= *.sgml > Makefile.gen
 .if defined(NO_TIDY)
 	${ECHO_CMD} NO_TIDY=${NO_TIDY} >> Makefile.gen
 .endif
 
 PORTS_TARGZ_URL?= ftp://ftp-master.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz
 
 ports.size:
 .if defined (NOPORTSNET)
 	touch ${.TARGET}
 .else
 	${RM} -f ${.TARGET}
 	${FETCH} -s ${PORTS_TARGZ_URL} > ${.TARGET}
 .endif
 
 index.sgml: ${INDEX} categories categories.descriptions packages.exists portindex ports.inc ports.size .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:
 	${SED} -i "" -e 's,HREF="growth,href="http://www.FreeBSD.org/ports/growth,' index.html
 .endif
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"