18 files changed, 168 insertions, 102 deletions

diff --git a/www/zope/Makefile b/www/zope/Makefile
index 8ad0ba0fb8e4..94afb15382b8 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	www python
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
@@ -34,6 +34,13 @@ SCGIBINDIR?=	${WEBBASEDIR}/cgi-bin.default
 APACHE_CONFDIR?=	${PREFIX}/etc/apache
 PYTHON15?=	${LOCALBASE}/bin/python1.5
 
+WHOAMI!=	id -un
+.if ${WHOAMI} == "root"
+NOBODY_USER?=	nobody
+.else
+NOBODY_USER?=	${WHOAMI}
+.endif
+
 # Don't change these.
 ZOPEBASEDIR=	${PREFIX}/${SZOPEBASEDIR}
 CGIBINDIR=	${PREFIX}/${SCGIBINDIR}
@@ -50,44 +57,47 @@ do-install:	#
 		${ECHO} "Saving existing Database to /tmp/Data.fs.BAK." ; \
 		${MV} ${ZOPEBASEDIR}/var/Data.fs /tmp/Data.fs.BAK ; \
 		fi
-	#
+	@#
 	@${MKDIR} ${ZOPEBASEDIR}
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
-	#
-	@(cd ${ZOPEBASEDIR} ; \
-		${PYTHON15} w_pcgi.py ; \
-		${PYTHON15} wo_pcgi.py ; \
+	@#
+	@${CHMOD} -R u+w ${ZOPEBASEDIR}
+	@(cd ${ZOPEBASEDIR} && ${PYTHON15} w_pcgi.py)
+	@${CHMOD} -R u+w ${ZOPEBASEDIR}
+	@(cd ${ZOPEBASEDIR} && ${PYTHON15} wo_pcgi.py)
+	@(cd ${ZOPEBASEDIR} && \
 		${MV} Zope.cgi Zope.cgi.orig ; \
 		${ECHO} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
 		${CAT} Zope.cgi.orig >> Zope.cgi )
-	#
+	@#
 	@${MKDIR} ${CGIBINDIR}
 	@(cd ${ZOPEBASEDIR} ; \
-		${INSTALL} -o nobody -m 555 Zope.cgi \
+		${INSTALL} -m 555 Zope.cgi \
 			pcgi/pcgi-wrapper \
 			${CGIBINDIR} )
-	#
+	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
-	@${CHOWN} nobody ${ZOPEBASEDIR}/var
-	@${CHOWN} nobody ${ZOPEBASEDIR}/var/*
-	#
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var/*
+	@#
 	@${ECHO} "===>   Setting user/password to zopemaster/test..."
 	@(cd ${ZOPEBASEDIR} && \
 		${PYTHON15} zpasswd.py -u zopemaster \
 			-p test -e CLEARTEXT access )
-	#
-	@${CHOWN} nobody ${ZOPEBASEDIR}/access
-	#
+	@#
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/access
+	@#
 	@${ECHO} "===>   Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-Changes."
 	@${MKDIR} ${APACHE_CONFDIR}
 	@${CP} -p ${FILESDIR}/apache.conf.Zope-Changes ${APACHE_CONFDIR}/
-	#
+	@#
 	@${ECHO} "===>   Please have a look at this file and the instructions"
 	@${ECHO} "===>   therein and incorporate them to your apache.conf."
 	@${ECHO} "===>   Creating rc startup file for Zope-${PORTVERSION}..."
+	@${MKDIR} -p ${PREFIX}/etc/rc.d
 	@${SED} -e "s|%%ZOPEBASEDIR%%|${ZOPEBASEDIR}|g" -e "s|%%CGIBINDIR%%|${CGIBINDIR}|g" \
 		< ${FILESDIR}/zope.sh.in > ${PREFIX}/etc/rc.d/zope.sh
 	@${CHMOD} ug+x,o-rwx ${PREFIX}/etc/rc.d/zope.sh
diff --git a/www/zope/distinfo b/www/zope/distinfo
index d328dd0da274..95ec6edcb348 100644
--- a/www/zope/distinfo
+++ b/www/zope/distinfo
@@ -1 +1 @@
-MD5 (Zope-2.2.1-src.tgz) = 28275d775dfe131558c109d8fccd50bb
+MD5 (Zope-2.2.2-src.tgz) = 83c8197f18bf97ad62bf2c5e424e2b82
diff --git a/www/zope/pkg-plist b/www/zope/pkg-plist
index 0255bb32c2ce..1e10200d2e63 100644
--- a/www/zope/pkg-plist
+++ b/www/zope/pkg-plist
@@ -93,6 +93,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/doc/PLATFORMS/AIX.txt
 %%ZOPEBASEDIR%%/doc/PLATFORMS/README.txt
 %%ZOPEBASEDIR%%/doc/SECURITY.txt
+%%ZOPEBASEDIR%%/doc/UNITTEST.txt
 %%ZOPEBASEDIR%%/doc/WEBSERVER.txt
 %%ZOPEBASEDIR%%/doc/ZODB.txt
 %%ZOPEBASEDIR%%/import/README.txt
diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index 8ad0ba0fb8e4..94afb15382b8 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	www python
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
@@ -34,6 +34,13 @@ SCGIBINDIR?=	${WEBBASEDIR}/cgi-bin.default
 APACHE_CONFDIR?=	${PREFIX}/etc/apache
 PYTHON15?=	${LOCALBASE}/bin/python1.5
 
+WHOAMI!=	id -un
+.if ${WHOAMI} == "root"
+NOBODY_USER?=	nobody
+.else
+NOBODY_USER?=	${WHOAMI}
+.endif
+
 # Don't change these.
 ZOPEBASEDIR=	${PREFIX}/${SZOPEBASEDIR}
 CGIBINDIR=	${PREFIX}/${SCGIBINDIR}
@@ -50,44 +57,47 @@ do-install:	#
 		${ECHO} "Saving existing Database to /tmp/Data.fs.BAK." ; \
 		${MV} ${ZOPEBASEDIR}/var/Data.fs /tmp/Data.fs.BAK ; \
 		fi
-	#
+	@#
 	@${MKDIR} ${ZOPEBASEDIR}
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
-	#
-	@(cd ${ZOPEBASEDIR} ; \
-		${PYTHON15} w_pcgi.py ; \
-		${PYTHON15} wo_pcgi.py ; \
+	@#
+	@${CHMOD} -R u+w ${ZOPEBASEDIR}
+	@(cd ${ZOPEBASEDIR} && ${PYTHON15} w_pcgi.py)
+	@${CHMOD} -R u+w ${ZOPEBASEDIR}
+	@(cd ${ZOPEBASEDIR} && ${PYTHON15} wo_pcgi.py)
+	@(cd ${ZOPEBASEDIR} && \
 		${MV} Zope.cgi Zope.cgi.orig ; \
 		${ECHO} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
 		${CAT} Zope.cgi.orig >> Zope.cgi )
-	#
+	@#
 	@${MKDIR} ${CGIBINDIR}
 	@(cd ${ZOPEBASEDIR} ; \
-		${INSTALL} -o nobody -m 555 Zope.cgi \
+		${INSTALL} -m 555 Zope.cgi \
 			pcgi/pcgi-wrapper \
 			${CGIBINDIR} )
-	#
+	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
-	@${CHOWN} nobody ${ZOPEBASEDIR}/var
-	@${CHOWN} nobody ${ZOPEBASEDIR}/var/*
-	#
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var/*
+	@#
 	@${ECHO} "===>   Setting user/password to zopemaster/test..."
 	@(cd ${ZOPEBASEDIR} && \
 		${PYTHON15} zpasswd.py -u zopemaster \
 			-p test -e CLEARTEXT access )
-	#
-	@${CHOWN} nobody ${ZOPEBASEDIR}/access
-	#
+	@#
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/access
+	@#
 	@${ECHO} "===>   Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-Changes."
 	@${MKDIR} ${APACHE_CONFDIR}
 	@${CP} -p ${FILESDIR}/apache.conf.Zope-Changes ${APACHE_CONFDIR}/
-	#
+	@#
 	@${ECHO} "===>   Please have a look at this file and the instructions"
 	@${ECHO} "===>   therein and incorporate them to your apache.conf."
 	@${ECHO} "===>   Creating rc startup file for Zope-${PORTVERSION}..."
+	@${MKDIR} -p ${PREFIX}/etc/rc.d
 	@${SED} -e "s|%%ZOPEBASEDIR%%|${ZOPEBASEDIR}|g" -e "s|%%CGIBINDIR%%|${CGIBINDIR}|g" \
 		< ${FILESDIR}/zope.sh.in > ${PREFIX}/etc/rc.d/zope.sh
 	@${CHMOD} ug+x,o-rwx ${PREFIX}/etc/rc.d/zope.sh
diff --git a/www/zope210/distinfo b/www/zope210/distinfo
index d328dd0da274..95ec6edcb348 100644
--- a/www/zope210/distinfo
+++ b/www/zope210/distinfo
@@ -1 +1 @@
-MD5 (Zope-2.2.1-src.tgz) = 28275d775dfe131558c109d8fccd50bb
+MD5 (Zope-2.2.2-src.tgz) = 83c8197f18bf97ad62bf2c5e424e2b82
diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist
index 0255bb32c2ce..1e10200d2e63 100644
--- a/www/zope210/pkg-plist
+++ b/www/zope210/pkg-plist
@@ -93,6 +93,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/doc/PLATFORMS/AIX.txt
 %%ZOPEBASEDIR%%/doc/PLATFORMS/README.txt
 %%ZOPEBASEDIR%%/doc/SECURITY.txt
+%%ZOPEBASEDIR%%/doc/UNITTEST.txt
 %%ZOPEBASEDIR%%/doc/WEBSERVER.txt
 %%ZOPEBASEDIR%%/doc/ZODB.txt
 %%ZOPEBASEDIR%%/import/README.txt
diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index 8ad0ba0fb8e4..94afb15382b8 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	www python
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
@@ -34,6 +34,13 @@ SCGIBINDIR?=	${WEBBASEDIR}/cgi-bin.default
 APACHE_CONFDIR?=	${PREFIX}/etc/apache
 PYTHON15?=	${LOCALBASE}/bin/python1.5
 
+WHOAMI!=	id -un
+.if ${WHOAMI} == "root"
+NOBODY_USER?=	nobody
+.else
+NOBODY_USER?=	${WHOAMI}
+.endif
+
 # Don't change these.
 ZOPEBASEDIR=	${PREFIX}/${SZOPEBASEDIR}
 CGIBINDIR=	${PREFIX}/${SCGIBINDIR}
@@ -50,44 +57,47 @@ do-install:	#
 		${ECHO} "Saving existing Database to /tmp/Data.fs.BAK." ; \
 		${MV} ${ZOPEBASEDIR}/var/Data.fs /tmp/Data.fs.BAK ; \
 		fi
-	#
+	@#
 	@${MKDIR} ${ZOPEBASEDIR}
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
-	#
-	@(cd ${ZOPEBASEDIR} ; \
-		${PYTHON15} w_pcgi.py ; \
-		${PYTHON15} wo_pcgi.py ; \
+	@#
+	@${CHMOD} -R u+w ${ZOPEBASEDIR}
+	@(cd ${ZOPEBASEDIR} && ${PYTHON15} w_pcgi.py)
+	@${CHMOD} -R u+w ${ZOPEBASEDIR}
+	@(cd ${ZOPEBASEDIR} && ${PYTHON15} wo_pcgi.py)
+	@(cd ${ZOPEBASEDIR} && \
 		${MV} Zope.cgi Zope.cgi.orig ; \
 		${ECHO} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
 		${CAT} Zope.cgi.orig >> Zope.cgi )
-	#
+	@#
 	@${MKDIR} ${CGIBINDIR}
 	@(cd ${ZOPEBASEDIR} ; \
-		${INSTALL} -o nobody -m 555 Zope.cgi \
+		${INSTALL} -m 555 Zope.cgi \
 			pcgi/pcgi-wrapper \
 			${CGIBINDIR} )
-	#
+	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
-	@${CHOWN} nobody ${ZOPEBASEDIR}/var
-	@${CHOWN} nobody ${ZOPEBASEDIR}/var/*
-	#
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var/*
+	@#
 	@${ECHO} "===>   Setting user/password to zopemaster/test..."
 	@(cd ${ZOPEBASEDIR} && \
 		${PYTHON15} zpasswd.py -u zopemaster \
 			-p test -e CLEARTEXT access )
-	#
-	@${CHOWN} nobody ${ZOPEBASEDIR}/access
-	#
+	@#
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/access
+	@#
 	@${ECHO} "===>   Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-Changes."
 	@${MKDIR} ${APACHE_CONFDIR}
 	@${CP} -p ${FILESDIR}/apache.conf.Zope-Changes ${APACHE_CONFDIR}/
-	#
+	@#
 	@${ECHO} "===>   Please have a look at this file and the instructions"
 	@${ECHO} "===>   therein and incorporate them to your apache.conf."
 	@${ECHO} "===>   Creating rc startup file for Zope-${PORTVERSION}..."
+	@${MKDIR} -p ${PREFIX}/etc/rc.d
 	@${SED} -e "s|%%ZOPEBASEDIR%%|${ZOPEBASEDIR}|g" -e "s|%%CGIBINDIR%%|${CGIBINDIR}|g" \
 		< ${FILESDIR}/zope.sh.in > ${PREFIX}/etc/rc.d/zope.sh
 	@${CHMOD} ug+x,o-rwx ${PREFIX}/etc/rc.d/zope.sh
diff --git a/www/zope211/distinfo b/www/zope211/distinfo
index d328dd0da274..95ec6edcb348 100644
--- a/www/zope211/distinfo
+++ b/www/zope211/distinfo
@@ -1 +1 @@
-MD5 (Zope-2.2.1-src.tgz) = 28275d775dfe131558c109d8fccd50bb
+MD5 (Zope-2.2.2-src.tgz) = 83c8197f18bf97ad62bf2c5e424e2b82
diff --git a/www/zope211/pkg-plist b/www/zope211/pkg-plist
index 0255bb32c2ce..1e10200d2e63 100644
--- a/www/zope211/pkg-plist
+++ b/www/zope211/pkg-plist
@@ -93,6 +93,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/doc/PLATFORMS/AIX.txt
 %%ZOPEBASEDIR%%/doc/PLATFORMS/README.txt
 %%ZOPEBASEDIR%%/doc/SECURITY.txt
+%%ZOPEBASEDIR%%/doc/UNITTEST.txt
 %%ZOPEBASEDIR%%/doc/WEBSERVER.txt
 %%ZOPEBASEDIR%%/doc/ZODB.txt
 %%ZOPEBASEDIR%%/import/README.txt
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index 8ad0ba0fb8e4..94afb15382b8 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	www python
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
@@ -34,6 +34,13 @@ SCGIBINDIR?=	${WEBBASEDIR}/cgi-bin.default
 APACHE_CONFDIR?=	${PREFIX}/etc/apache
 PYTHON15?=	${LOCALBASE}/bin/python1.5
 
+WHOAMI!=	id -un
+.if ${WHOAMI} == "root"
+NOBODY_USER?=	nobody
+.else
+NOBODY_USER?=	${WHOAMI}
+.endif
+
 # Don't change these.
 ZOPEBASEDIR=	${PREFIX}/${SZOPEBASEDIR}
 CGIBINDIR=	${PREFIX}/${SCGIBINDIR}
@@ -50,44 +57,47 @@ do-install:	#
 		${ECHO} "Saving existing Database to /tmp/Data.fs.BAK." ; \
 		${MV} ${ZOPEBASEDIR}/var/Data.fs /tmp/Data.fs.BAK ; \
 		fi
-	#
+	@#
 	@${MKDIR} ${ZOPEBASEDIR}
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
-	#
-	@(cd ${ZOPEBASEDIR} ; \
-		${PYTHON15} w_pcgi.py ; \
-		${PYTHON15} wo_pcgi.py ; \
+	@#
+	@${CHMOD} -R u+w ${ZOPEBASEDIR}
+	@(cd ${ZOPEBASEDIR} && ${PYTHON15} w_pcgi.py)
+	@${CHMOD} -R u+w ${ZOPEBASEDIR}
+	@(cd ${ZOPEBASEDIR} && ${PYTHON15} wo_pcgi.py)
+	@(cd ${ZOPEBASEDIR} && \
 		${MV} Zope.cgi Zope.cgi.orig ; \
 		${ECHO} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
 		${CAT} Zope.cgi.orig >> Zope.cgi )
-	#
+	@#
 	@${MKDIR} ${CGIBINDIR}
 	@(cd ${ZOPEBASEDIR} ; \
-		${INSTALL} -o nobody -m 555 Zope.cgi \
+		${INSTALL} -m 555 Zope.cgi \
 			pcgi/pcgi-wrapper \
 			${CGIBINDIR} )
-	#
+	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
-	@${CHOWN} nobody ${ZOPEBASEDIR}/var
-	@${CHOWN} nobody ${ZOPEBASEDIR}/var/*
-	#
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var/*
+	@#
 	@${ECHO} "===>   Setting user/password to zopemaster/test..."
 	@(cd ${ZOPEBASEDIR} && \
 		${PYTHON15} zpasswd.py -u zopemaster \
 			-p test -e CLEARTEXT access )
-	#
-	@${CHOWN} nobody ${ZOPEBASEDIR}/access
-	#
+	@#
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/access
+	@#
 	@${ECHO} "===>   Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-Changes."
 	@${MKDIR} ${APACHE_CONFDIR}
 	@${CP} -p ${FILESDIR}/apache.conf.Zope-Changes ${APACHE_CONFDIR}/
-	#
+	@#
 	@${ECHO} "===>   Please have a look at this file and the instructions"
 	@${ECHO} "===>   therein and incorporate them to your apache.conf."
 	@${ECHO} "===>   Creating rc startup file for Zope-${PORTVERSION}..."
+	@${MKDIR} -p ${PREFIX}/etc/rc.d
 	@${SED} -e "s|%%ZOPEBASEDIR%%|${ZOPEBASEDIR}|g" -e "s|%%CGIBINDIR%%|${CGIBINDIR}|g" \
 		< ${FILESDIR}/zope.sh.in > ${PREFIX}/etc/rc.d/zope.sh
 	@${CHMOD} ug+x,o-rwx ${PREFIX}/etc/rc.d/zope.sh
diff --git a/www/zope213/distinfo b/www/zope213/distinfo
index d328dd0da274..95ec6edcb348 100644
--- a/www/zope213/distinfo
+++ b/www/zope213/distinfo
@@ -1 +1 @@
-MD5 (Zope-2.2.1-src.tgz) = 28275d775dfe131558c109d8fccd50bb
+MD5 (Zope-2.2.2-src.tgz) = 83c8197f18bf97ad62bf2c5e424e2b82
diff --git a/www/zope213/pkg-plist b/www/zope213/pkg-plist
index 0255bb32c2ce..1e10200d2e63 100644
--- a/www/zope213/pkg-plist
+++ b/www/zope213/pkg-plist
@@ -93,6 +93,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/doc/PLATFORMS/AIX.txt
 %%ZOPEBASEDIR%%/doc/PLATFORMS/README.txt
 %%ZOPEBASEDIR%%/doc/SECURITY.txt
+%%ZOPEBASEDIR%%/doc/UNITTEST.txt
 %%ZOPEBASEDIR%%/doc/WEBSERVER.txt
 %%ZOPEBASEDIR%%/doc/ZODB.txt
 %%ZOPEBASEDIR%%/import/README.txt
diff --git a/www/zope28/Makefile b/www/zope28/Makefile
index 8ad0ba0fb8e4..94afb15382b8 100644
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	www python
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
@@ -34,6 +34,13 @@ SCGIBINDIR?=	${WEBBASEDIR}/cgi-bin.default
 APACHE_CONFDIR?=	${PREFIX}/etc/apache
 PYTHON15?=	${LOCALBASE}/bin/python1.5
 
+WHOAMI!=	id -un
+.if ${WHOAMI} == "root"
+NOBODY_USER?=	nobody
+.else
+NOBODY_USER?=	${WHOAMI}
+.endif
+
 # Don't change these.
 ZOPEBASEDIR=	${PREFIX}/${SZOPEBASEDIR}
 CGIBINDIR=	${PREFIX}/${SCGIBINDIR}
@@ -50,44 +57,47 @@ do-install:	#
 		${ECHO} "Saving existing Database to /tmp/Data.fs.BAK." ; \
 		${MV} ${ZOPEBASEDIR}/var/Data.fs /tmp/Data.fs.BAK ; \
 		fi
-	#
+	@#
 	@${MKDIR} ${ZOPEBASEDIR}
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
-	#
-	@(cd ${ZOPEBASEDIR} ; \
-		${PYTHON15} w_pcgi.py ; \
-		${PYTHON15} wo_pcgi.py ; \
+	@#
+	@${CHMOD} -R u+w ${ZOPEBASEDIR}
+	@(cd ${ZOPEBASEDIR} && ${PYTHON15} w_pcgi.py)
+	@${CHMOD} -R u+w ${ZOPEBASEDIR}
+	@(cd ${ZOPEBASEDIR} && ${PYTHON15} wo_pcgi.py)
+	@(cd ${ZOPEBASEDIR} && \
 		${MV} Zope.cgi Zope.cgi.orig ; \
 		${ECHO} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
 		${CAT} Zope.cgi.orig >> Zope.cgi )
-	#
+	@#
 	@${MKDIR} ${CGIBINDIR}
 	@(cd ${ZOPEBASEDIR} ; \
-		${INSTALL} -o nobody -m 555 Zope.cgi \
+		${INSTALL} -m 555 Zope.cgi \
 			pcgi/pcgi-wrapper \
 			${CGIBINDIR} )
-	#
+	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
-	@${CHOWN} nobody ${ZOPEBASEDIR}/var
-	@${CHOWN} nobody ${ZOPEBASEDIR}/var/*
-	#
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var/*
+	@#
 	@${ECHO} "===>   Setting user/password to zopemaster/test..."
 	@(cd ${ZOPEBASEDIR} && \
 		${PYTHON15} zpasswd.py -u zopemaster \
 			-p test -e CLEARTEXT access )
-	#
-	@${CHOWN} nobody ${ZOPEBASEDIR}/access
-	#
+	@#
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/access
+	@#
 	@${ECHO} "===>   Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-Changes."
 	@${MKDIR} ${APACHE_CONFDIR}
 	@${CP} -p ${FILESDIR}/apache.conf.Zope-Changes ${APACHE_CONFDIR}/
-	#
+	@#
 	@${ECHO} "===>   Please have a look at this file and the instructions"
 	@${ECHO} "===>   therein and incorporate them to your apache.conf."
 	@${ECHO} "===>   Creating rc startup file for Zope-${PORTVERSION}..."
+	@${MKDIR} -p ${PREFIX}/etc/rc.d
 	@${SED} -e "s|%%ZOPEBASEDIR%%|${ZOPEBASEDIR}|g" -e "s|%%CGIBINDIR%%|${CGIBINDIR}|g" \
 		< ${FILESDIR}/zope.sh.in > ${PREFIX}/etc/rc.d/zope.sh
 	@${CHMOD} ug+x,o-rwx ${PREFIX}/etc/rc.d/zope.sh
diff --git a/www/zope28/distinfo b/www/zope28/distinfo
index d328dd0da274..95ec6edcb348 100644
--- a/www/zope28/distinfo
+++ b/www/zope28/distinfo
@@ -1 +1 @@
-MD5 (Zope-2.2.1-src.tgz) = 28275d775dfe131558c109d8fccd50bb
+MD5 (Zope-2.2.2-src.tgz) = 83c8197f18bf97ad62bf2c5e424e2b82
diff --git a/www/zope28/pkg-plist b/www/zope28/pkg-plist
index 0255bb32c2ce..1e10200d2e63 100644
--- a/www/zope28/pkg-plist
+++ b/www/zope28/pkg-plist
@@ -93,6 +93,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/doc/PLATFORMS/AIX.txt
 %%ZOPEBASEDIR%%/doc/PLATFORMS/README.txt
 %%ZOPEBASEDIR%%/doc/SECURITY.txt
+%%ZOPEBASEDIR%%/doc/UNITTEST.txt
 %%ZOPEBASEDIR%%/doc/WEBSERVER.txt
 %%ZOPEBASEDIR%%/doc/ZODB.txt
 %%ZOPEBASEDIR%%/import/README.txt
diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index 8ad0ba0fb8e4..94afb15382b8 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	www python
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
@@ -34,6 +34,13 @@ SCGIBINDIR?=	${WEBBASEDIR}/cgi-bin.default
 APACHE_CONFDIR?=	${PREFIX}/etc/apache
 PYTHON15?=	${LOCALBASE}/bin/python1.5
 
+WHOAMI!=	id -un
+.if ${WHOAMI} == "root"
+NOBODY_USER?=	nobody
+.else
+NOBODY_USER?=	${WHOAMI}
+.endif
+
 # Don't change these.
 ZOPEBASEDIR=	${PREFIX}/${SZOPEBASEDIR}
 CGIBINDIR=	${PREFIX}/${SCGIBINDIR}
@@ -50,44 +57,47 @@ do-install:	#
 		${ECHO} "Saving existing Database to /tmp/Data.fs.BAK." ; \
 		${MV} ${ZOPEBASEDIR}/var/Data.fs /tmp/Data.fs.BAK ; \
 		fi
-	#
+	@#
 	@${MKDIR} ${ZOPEBASEDIR}
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
-	#
-	@(cd ${ZOPEBASEDIR} ; \
-		${PYTHON15} w_pcgi.py ; \
-		${PYTHON15} wo_pcgi.py ; \
+	@#
+	@${CHMOD} -R u+w ${ZOPEBASEDIR}
+	@(cd ${ZOPEBASEDIR} && ${PYTHON15} w_pcgi.py)
+	@${CHMOD} -R u+w ${ZOPEBASEDIR}
+	@(cd ${ZOPEBASEDIR} && ${PYTHON15} wo_pcgi.py)
+	@(cd ${ZOPEBASEDIR} && \
 		${MV} Zope.cgi Zope.cgi.orig ; \
 		${ECHO} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
 		${CAT} Zope.cgi.orig >> Zope.cgi )
-	#
+	@#
 	@${MKDIR} ${CGIBINDIR}
 	@(cd ${ZOPEBASEDIR} ; \
-		${INSTALL} -o nobody -m 555 Zope.cgi \
+		${INSTALL} -m 555 Zope.cgi \
 			pcgi/pcgi-wrapper \
 			${CGIBINDIR} )
-	#
+	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
-	@${CHOWN} nobody ${ZOPEBASEDIR}/var
-	@${CHOWN} nobody ${ZOPEBASEDIR}/var/*
-	#
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var/*
+	@#
 	@${ECHO} "===>   Setting user/password to zopemaster/test..."
 	@(cd ${ZOPEBASEDIR} && \
 		${PYTHON15} zpasswd.py -u zopemaster \
 			-p test -e CLEARTEXT access )
-	#
-	@${CHOWN} nobody ${ZOPEBASEDIR}/access
-	#
+	@#
+	@${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/access
+	@#
 	@${ECHO} "===>   Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-Changes."
 	@${MKDIR} ${APACHE_CONFDIR}
 	@${CP} -p ${FILESDIR}/apache.conf.Zope-Changes ${APACHE_CONFDIR}/
-	#
+	@#
 	@${ECHO} "===>   Please have a look at this file and the instructions"
 	@${ECHO} "===>   therein and incorporate them to your apache.conf."
 	@${ECHO} "===>   Creating rc startup file for Zope-${PORTVERSION}..."
+	@${MKDIR} -p ${PREFIX}/etc/rc.d
 	@${SED} -e "s|%%ZOPEBASEDIR%%|${ZOPEBASEDIR}|g" -e "s|%%CGIBINDIR%%|${CGIBINDIR}|g" \
 		< ${FILESDIR}/zope.sh.in > ${PREFIX}/etc/rc.d/zope.sh
 	@${CHMOD} ug+x,o-rwx ${PREFIX}/etc/rc.d/zope.sh
diff --git a/www/zope29/distinfo b/www/zope29/distinfo
index d328dd0da274..95ec6edcb348 100644
--- a/www/zope29/distinfo
+++ b/www/zope29/distinfo
@@ -1 +1 @@
-MD5 (Zope-2.2.1-src.tgz) = 28275d775dfe131558c109d8fccd50bb
+MD5 (Zope-2.2.2-src.tgz) = 83c8197f18bf97ad62bf2c5e424e2b82
diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist
index 0255bb32c2ce..1e10200d2e63 100644
--- a/www/zope29/pkg-plist
+++ b/www/zope29/pkg-plist
@@ -93,6 +93,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/doc/PLATFORMS/AIX.txt
 %%ZOPEBASEDIR%%/doc/PLATFORMS/README.txt
 %%ZOPEBASEDIR%%/doc/SECURITY.txt
+%%ZOPEBASEDIR%%/doc/UNITTEST.txt
 %%ZOPEBASEDIR%%/doc/WEBSERVER.txt
 %%ZOPEBASEDIR%%/doc/ZODB.txt
 %%ZOPEBASEDIR%%/import/README.txt