diff --git a/www/zope/Makefile b/www/zope/Makefile
index 9b7eca1e4070..9966fccb18fb 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 PORTREVISION=	0
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
@@ -77,10 +77,12 @@ do-install:
 	@(cd ${ZOPEBASEDIR}/pcgi && ${RM} *.o)
 	@#
 	@${MKDIR} ${CGIBINDIR}
-	@(cd ${ZOPEBASEDIR} ; \
-		${INSTALL} -m 555 Zope.cgi \
+	@(cd ${ZOPEBASEDIR} && \
+		${MV} Zope.cgi \
 			pcgi/pcgi-wrapper \
 			${CGIBINDIR} )
+	@(cd ${CGIBINDIR} && \
+		${CHMOD} 555 Zope.cgi pcgi-wrapper )
 	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
diff --git a/www/zope/distinfo b/www/zope/distinfo
index 88fc8fe24753..e63c00d69c3e 100644
--- a/www/zope/distinfo
+++ b/www/zope/distinfo
@@ -1 +1 @@
-MD5 (zope/Zope-2.4.1-src.tgz) = 9bb93c8431118f39310a255aa6f09609
+MD5 (zope/Zope-2.4.2-src.tgz) = 9759b5609626308d1ae20047e6fed3cb
diff --git a/www/zope/pkg-plist b/www/zope/pkg-plist
index 42421e73db7b..0f7d75b97e6a 100644
--- a/www/zope/pkg-plist
+++ b/www/zope/pkg-plist
@@ -1604,12 +1604,20 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Acquisition.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/ExtensionClass.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/ExtensionClass.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Links.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Links.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/MultiMapping.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/MultiMapping.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples1.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples1.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/index.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/index.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/table.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/table.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.py
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.pyc
 %%ZOPEBASEDIR%%/lib/python/Sync.so
diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index 9b7eca1e4070..9966fccb18fb 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 PORTREVISION=	0
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
@@ -77,10 +77,12 @@ do-install:
 	@(cd ${ZOPEBASEDIR}/pcgi && ${RM} *.o)
 	@#
 	@${MKDIR} ${CGIBINDIR}
-	@(cd ${ZOPEBASEDIR} ; \
-		${INSTALL} -m 555 Zope.cgi \
+	@(cd ${ZOPEBASEDIR} && \
+		${MV} Zope.cgi \
 			pcgi/pcgi-wrapper \
 			${CGIBINDIR} )
+	@(cd ${CGIBINDIR} && \
+		${CHMOD} 555 Zope.cgi pcgi-wrapper )
 	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
diff --git a/www/zope210/distinfo b/www/zope210/distinfo
index 88fc8fe24753..e63c00d69c3e 100644
--- a/www/zope210/distinfo
+++ b/www/zope210/distinfo
@@ -1 +1 @@
-MD5 (zope/Zope-2.4.1-src.tgz) = 9bb93c8431118f39310a255aa6f09609
+MD5 (zope/Zope-2.4.2-src.tgz) = 9759b5609626308d1ae20047e6fed3cb
diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist
index 42421e73db7b..0f7d75b97e6a 100644
--- a/www/zope210/pkg-plist
+++ b/www/zope210/pkg-plist
@@ -1604,12 +1604,20 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Acquisition.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/ExtensionClass.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/ExtensionClass.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Links.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Links.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/MultiMapping.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/MultiMapping.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples1.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples1.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/index.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/index.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/table.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/table.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.py
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.pyc
 %%ZOPEBASEDIR%%/lib/python/Sync.so
diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index 9b7eca1e4070..9966fccb18fb 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 PORTREVISION=	0
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
@@ -77,10 +77,12 @@ do-install:
 	@(cd ${ZOPEBASEDIR}/pcgi && ${RM} *.o)
 	@#
 	@${MKDIR} ${CGIBINDIR}
-	@(cd ${ZOPEBASEDIR} ; \
-		${INSTALL} -m 555 Zope.cgi \
+	@(cd ${ZOPEBASEDIR} && \
+		${MV} Zope.cgi \
 			pcgi/pcgi-wrapper \
 			${CGIBINDIR} )
+	@(cd ${CGIBINDIR} && \
+		${CHMOD} 555 Zope.cgi pcgi-wrapper )
 	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
diff --git a/www/zope211/distinfo b/www/zope211/distinfo
index 88fc8fe24753..e63c00d69c3e 100644
--- a/www/zope211/distinfo
+++ b/www/zope211/distinfo
@@ -1 +1 @@
-MD5 (zope/Zope-2.4.1-src.tgz) = 9bb93c8431118f39310a255aa6f09609
+MD5 (zope/Zope-2.4.2-src.tgz) = 9759b5609626308d1ae20047e6fed3cb
diff --git a/www/zope211/pkg-plist b/www/zope211/pkg-plist
index 42421e73db7b..0f7d75b97e6a 100644
--- a/www/zope211/pkg-plist
+++ b/www/zope211/pkg-plist
@@ -1604,12 +1604,20 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Acquisition.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/ExtensionClass.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/ExtensionClass.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Links.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Links.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/MultiMapping.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/MultiMapping.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples1.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples1.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/index.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/index.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/table.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/table.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.py
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.pyc
 %%ZOPEBASEDIR%%/lib/python/Sync.so
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index 9b7eca1e4070..9966fccb18fb 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 PORTREVISION=	0
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
@@ -77,10 +77,12 @@ do-install:
 	@(cd ${ZOPEBASEDIR}/pcgi && ${RM} *.o)
 	@#
 	@${MKDIR} ${CGIBINDIR}
-	@(cd ${ZOPEBASEDIR} ; \
-		${INSTALL} -m 555 Zope.cgi \
+	@(cd ${ZOPEBASEDIR} && \
+		${MV} Zope.cgi \
 			pcgi/pcgi-wrapper \
 			${CGIBINDIR} )
+	@(cd ${CGIBINDIR} && \
+		${CHMOD} 555 Zope.cgi pcgi-wrapper )
 	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
diff --git a/www/zope213/distinfo b/www/zope213/distinfo
index 88fc8fe24753..e63c00d69c3e 100644
--- a/www/zope213/distinfo
+++ b/www/zope213/distinfo
@@ -1 +1 @@
-MD5 (zope/Zope-2.4.1-src.tgz) = 9bb93c8431118f39310a255aa6f09609
+MD5 (zope/Zope-2.4.2-src.tgz) = 9759b5609626308d1ae20047e6fed3cb
diff --git a/www/zope213/pkg-plist b/www/zope213/pkg-plist
index 42421e73db7b..0f7d75b97e6a 100644
--- a/www/zope213/pkg-plist
+++ b/www/zope213/pkg-plist
@@ -1604,12 +1604,20 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Acquisition.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/ExtensionClass.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/ExtensionClass.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Links.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Links.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/MultiMapping.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/MultiMapping.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples1.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples1.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/index.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/index.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/table.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/table.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.py
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.pyc
 %%ZOPEBASEDIR%%/lib/python/Sync.so
diff --git a/www/zope28/Makefile b/www/zope28/Makefile
index 9b7eca1e4070..9966fccb18fb 100644
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 PORTREVISION=	0
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
@@ -77,10 +77,12 @@ do-install:
 	@(cd ${ZOPEBASEDIR}/pcgi && ${RM} *.o)
 	@#
 	@${MKDIR} ${CGIBINDIR}
-	@(cd ${ZOPEBASEDIR} ; \
-		${INSTALL} -m 555 Zope.cgi \
+	@(cd ${ZOPEBASEDIR} && \
+		${MV} Zope.cgi \
 			pcgi/pcgi-wrapper \
 			${CGIBINDIR} )
+	@(cd ${CGIBINDIR} && \
+		${CHMOD} 555 Zope.cgi pcgi-wrapper )
 	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
diff --git a/www/zope28/distinfo b/www/zope28/distinfo
index 88fc8fe24753..e63c00d69c3e 100644
--- a/www/zope28/distinfo
+++ b/www/zope28/distinfo
@@ -1 +1 @@
-MD5 (zope/Zope-2.4.1-src.tgz) = 9bb93c8431118f39310a255aa6f09609
+MD5 (zope/Zope-2.4.2-src.tgz) = 9759b5609626308d1ae20047e6fed3cb
diff --git a/www/zope28/pkg-plist b/www/zope28/pkg-plist
index 42421e73db7b..0f7d75b97e6a 100644
--- a/www/zope28/pkg-plist
+++ b/www/zope28/pkg-plist
@@ -1604,12 +1604,20 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Acquisition.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/ExtensionClass.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/ExtensionClass.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Links.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Links.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/MultiMapping.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/MultiMapping.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples1.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples1.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/index.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/index.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/table.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/table.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.py
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.pyc
 %%ZOPEBASEDIR%%/lib/python/Sync.so
diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index 9b7eca1e4070..9966fccb18fb 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 PORTREVISION=	0
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
@@ -77,10 +77,12 @@ do-install:
 	@(cd ${ZOPEBASEDIR}/pcgi && ${RM} *.o)
 	@#
 	@${MKDIR} ${CGIBINDIR}
-	@(cd ${ZOPEBASEDIR} ; \
-		${INSTALL} -m 555 Zope.cgi \
+	@(cd ${ZOPEBASEDIR} && \
+		${MV} Zope.cgi \
 			pcgi/pcgi-wrapper \
 			${CGIBINDIR} )
+	@(cd ${CGIBINDIR} && \
+		${CHMOD} 555 Zope.cgi pcgi-wrapper )
 	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
diff --git a/www/zope29/distinfo b/www/zope29/distinfo
index 88fc8fe24753..e63c00d69c3e 100644
--- a/www/zope29/distinfo
+++ b/www/zope29/distinfo
@@ -1 +1 @@
-MD5 (zope/Zope-2.4.1-src.tgz) = 9bb93c8431118f39310a255aa6f09609
+MD5 (zope/Zope-2.4.2-src.tgz) = 9759b5609626308d1ae20047e6fed3cb
diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist
index 42421e73db7b..0f7d75b97e6a 100644
--- a/www/zope29/pkg-plist
+++ b/www/zope29/pkg-plist
@@ -1604,12 +1604,20 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Acquisition.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/ExtensionClass.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/ExtensionClass.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Links.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/Links.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/MultiMapping.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/MultiMapping.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples1.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/examples1.stx
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/index.ref
 %%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/index.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/table.ref
+%%ZOPEBASEDIR%%/lib/python/StructuredText/regressions/table.stx
+%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/StructuredText/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.py
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.pyc
 %%ZOPEBASEDIR%%/lib/python/Sync.so