18 files changed, 180 insertions, 60 deletions

diff --git a/www/zope/Makefile b/www/zope/Makefile
index 0a29cb32d7a6..42cae624ebce 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -6,20 +6,17 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.6.0
-PORTREVISION=	1
+PORTVERSION=	2.6.1
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	freebsd-ports@FreeBSD.org
-COMMENT=	An object-based web application platform with DB access, WebDAV, & more
-
-BROKEN=		"Does not compile"
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	An object-based web application platform
 
 USE_PYTHON=	yes
-PYTHON_VERSION=	python2.1
+PYTHON_VERSION=	python2.2
 
 DIST_SUBDIR=	zope
 
@@ -102,10 +99,11 @@ do-install:
 			${CGIBINDIR} )
 	@(cd ${CGIBINDIR} && \
 		${CHMOD} 555 Zope.cgi pcgi-wrapper )
+	@${RM} -rf ${ZOPEBASEDIR}/lib/python/build/
 	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
-	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/var
+	@${CHOWN} root ${ZOPEBASEDIR}/var
 	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/var/*
 	@${RM} ${ZOPEBASEDIR}/var/.cvsignore
 	@if [ -e ${ZOPEBASEDIR}/var/Data.fs.preserve ] ; then \
diff --git a/www/zope/distinfo b/www/zope/distinfo
index 188763e35c10..0a7df9572373 100644
--- a/www/zope/distinfo
+++ b/www/zope/distinfo
@@ -1 +1 @@
-MD5 (zope/Zope-2.6.0-src.tgz) = a0bb91ca1df775aebfc8ff8c46afa3a9
+MD5 (zope/Zope-2.6.1-src.tgz) = a17f36b86b6e489797d8e52f1ba48efe
diff --git a/www/zope/pkg-plist b/www/zope/pkg-plist
index 88e0dcd3901c..361ab2efe20f 100644
--- a/www/zope/pkg-plist
+++ b/www/zope/pkg-plist
@@ -6,6 +6,25 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/Extensions/README.txt
 %%ZOPEBASEDIR%%/LICENSE.txt
 %%ZOPEBASEDIR%%/README.txt
+%%ZOPEBASEDIR%%/lib/python/BTrees/tests/test_check.py
+%%ZOPEBASEDIR%%/lib/python/BTrees/check.py
+%%ZOPEBASEDIR%%/lib/python/BTrees/check.pyc
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests/testPrefix.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/Prefix.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/Prefix.pyc
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Signals/SignalHandler.py
+%%ZOPEBASEDIR%%/lib/python/Signals/SignalHandler.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/ClassFactory.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/startup.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/ClassFactory.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/startup.pyc
+%%ZOPEBASEDIR%%/lib/python/Lifetime.py
+%%ZOPEBASEDIR%%/lib/python/Lifetime.pyc
 %%ZOPEBASEDIR%%/ZServer/DebugLogger.py
 %%ZOPEBASEDIR%%/ZServer/DebugLogger.pyc
 %%ZOPEBASEDIR%%/ZServer/FCGIServer.py
@@ -2457,6 +2476,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/z2.pyc
 %%ZOPEBASEDIR%%/zpasswd.py
 %%ZOPEBASEDIR%%/zpasswd.pyc
+%%ZOPEBASEDIR%%/Makefile
 %%CGIBINDIR%%/Zope.cgi
 %%CGIBINDIR%%/pcgi-wrapper
 @unexec rm -f %D/%%ZOPEBASEDIR%%/inituser
@@ -2484,7 +2504,9 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav
-@dirrm %%ZOPEBASEDIR%%/lib/python/build
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo
+@dirrm %%ZOPEBASEDIR%%/lib/python/Zope/App
 @dirrm %%ZOPEBASEDIR%%/lib/python/Zope
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils
diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index 0a29cb32d7a6..42cae624ebce 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -6,20 +6,17 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.6.0
-PORTREVISION=	1
+PORTVERSION=	2.6.1
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	freebsd-ports@FreeBSD.org
-COMMENT=	An object-based web application platform with DB access, WebDAV, & more
-
-BROKEN=		"Does not compile"
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	An object-based web application platform
 
 USE_PYTHON=	yes
-PYTHON_VERSION=	python2.1
+PYTHON_VERSION=	python2.2
 
 DIST_SUBDIR=	zope
 
@@ -102,10 +99,11 @@ do-install:
 			${CGIBINDIR} )
 	@(cd ${CGIBINDIR} && \
 		${CHMOD} 555 Zope.cgi pcgi-wrapper )
+	@${RM} -rf ${ZOPEBASEDIR}/lib/python/build/
 	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
-	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/var
+	@${CHOWN} root ${ZOPEBASEDIR}/var
 	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/var/*
 	@${RM} ${ZOPEBASEDIR}/var/.cvsignore
 	@if [ -e ${ZOPEBASEDIR}/var/Data.fs.preserve ] ; then \
diff --git a/www/zope210/distinfo b/www/zope210/distinfo
index 188763e35c10..0a7df9572373 100644
--- a/www/zope210/distinfo
+++ b/www/zope210/distinfo
@@ -1 +1 @@
-MD5 (zope/Zope-2.6.0-src.tgz) = a0bb91ca1df775aebfc8ff8c46afa3a9
+MD5 (zope/Zope-2.6.1-src.tgz) = a17f36b86b6e489797d8e52f1ba48efe
diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist
index 88e0dcd3901c..361ab2efe20f 100644
--- a/www/zope210/pkg-plist
+++ b/www/zope210/pkg-plist
@@ -6,6 +6,25 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/Extensions/README.txt
 %%ZOPEBASEDIR%%/LICENSE.txt
 %%ZOPEBASEDIR%%/README.txt
+%%ZOPEBASEDIR%%/lib/python/BTrees/tests/test_check.py
+%%ZOPEBASEDIR%%/lib/python/BTrees/check.py
+%%ZOPEBASEDIR%%/lib/python/BTrees/check.pyc
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests/testPrefix.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/Prefix.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/Prefix.pyc
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Signals/SignalHandler.py
+%%ZOPEBASEDIR%%/lib/python/Signals/SignalHandler.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/ClassFactory.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/startup.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/ClassFactory.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/startup.pyc
+%%ZOPEBASEDIR%%/lib/python/Lifetime.py
+%%ZOPEBASEDIR%%/lib/python/Lifetime.pyc
 %%ZOPEBASEDIR%%/ZServer/DebugLogger.py
 %%ZOPEBASEDIR%%/ZServer/DebugLogger.pyc
 %%ZOPEBASEDIR%%/ZServer/FCGIServer.py
@@ -2457,6 +2476,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/z2.pyc
 %%ZOPEBASEDIR%%/zpasswd.py
 %%ZOPEBASEDIR%%/zpasswd.pyc
+%%ZOPEBASEDIR%%/Makefile
 %%CGIBINDIR%%/Zope.cgi
 %%CGIBINDIR%%/pcgi-wrapper
 @unexec rm -f %D/%%ZOPEBASEDIR%%/inituser
@@ -2484,7 +2504,9 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav
-@dirrm %%ZOPEBASEDIR%%/lib/python/build
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo
+@dirrm %%ZOPEBASEDIR%%/lib/python/Zope/App
 @dirrm %%ZOPEBASEDIR%%/lib/python/Zope
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils
diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index 0a29cb32d7a6..42cae624ebce 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -6,20 +6,17 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.6.0
-PORTREVISION=	1
+PORTVERSION=	2.6.1
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	freebsd-ports@FreeBSD.org
-COMMENT=	An object-based web application platform with DB access, WebDAV, & more
-
-BROKEN=		"Does not compile"
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	An object-based web application platform
 
 USE_PYTHON=	yes
-PYTHON_VERSION=	python2.1
+PYTHON_VERSION=	python2.2
 
 DIST_SUBDIR=	zope
 
@@ -102,10 +99,11 @@ do-install:
 			${CGIBINDIR} )
 	@(cd ${CGIBINDIR} && \
 		${CHMOD} 555 Zope.cgi pcgi-wrapper )
+	@${RM} -rf ${ZOPEBASEDIR}/lib/python/build/
 	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
-	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/var
+	@${CHOWN} root ${ZOPEBASEDIR}/var
 	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/var/*
 	@${RM} ${ZOPEBASEDIR}/var/.cvsignore
 	@if [ -e ${ZOPEBASEDIR}/var/Data.fs.preserve ] ; then \
diff --git a/www/zope211/distinfo b/www/zope211/distinfo
index 188763e35c10..0a7df9572373 100644
--- a/www/zope211/distinfo
+++ b/www/zope211/distinfo
@@ -1 +1 @@
-MD5 (zope/Zope-2.6.0-src.tgz) = a0bb91ca1df775aebfc8ff8c46afa3a9
+MD5 (zope/Zope-2.6.1-src.tgz) = a17f36b86b6e489797d8e52f1ba48efe
diff --git a/www/zope211/pkg-plist b/www/zope211/pkg-plist
index 88e0dcd3901c..361ab2efe20f 100644
--- a/www/zope211/pkg-plist
+++ b/www/zope211/pkg-plist
@@ -6,6 +6,25 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/Extensions/README.txt
 %%ZOPEBASEDIR%%/LICENSE.txt
 %%ZOPEBASEDIR%%/README.txt
+%%ZOPEBASEDIR%%/lib/python/BTrees/tests/test_check.py
+%%ZOPEBASEDIR%%/lib/python/BTrees/check.py
+%%ZOPEBASEDIR%%/lib/python/BTrees/check.pyc
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests/testPrefix.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/Prefix.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/Prefix.pyc
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Signals/SignalHandler.py
+%%ZOPEBASEDIR%%/lib/python/Signals/SignalHandler.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/ClassFactory.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/startup.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/ClassFactory.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/startup.pyc
+%%ZOPEBASEDIR%%/lib/python/Lifetime.py
+%%ZOPEBASEDIR%%/lib/python/Lifetime.pyc
 %%ZOPEBASEDIR%%/ZServer/DebugLogger.py
 %%ZOPEBASEDIR%%/ZServer/DebugLogger.pyc
 %%ZOPEBASEDIR%%/ZServer/FCGIServer.py
@@ -2457,6 +2476,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/z2.pyc
 %%ZOPEBASEDIR%%/zpasswd.py
 %%ZOPEBASEDIR%%/zpasswd.pyc
+%%ZOPEBASEDIR%%/Makefile
 %%CGIBINDIR%%/Zope.cgi
 %%CGIBINDIR%%/pcgi-wrapper
 @unexec rm -f %D/%%ZOPEBASEDIR%%/inituser
@@ -2484,7 +2504,9 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav
-@dirrm %%ZOPEBASEDIR%%/lib/python/build
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo
+@dirrm %%ZOPEBASEDIR%%/lib/python/Zope/App
 @dirrm %%ZOPEBASEDIR%%/lib/python/Zope
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index 0a29cb32d7a6..42cae624ebce 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -6,20 +6,17 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.6.0
-PORTREVISION=	1
+PORTVERSION=	2.6.1
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	freebsd-ports@FreeBSD.org
-COMMENT=	An object-based web application platform with DB access, WebDAV, & more
-
-BROKEN=		"Does not compile"
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	An object-based web application platform
 
 USE_PYTHON=	yes
-PYTHON_VERSION=	python2.1
+PYTHON_VERSION=	python2.2
 
 DIST_SUBDIR=	zope
 
@@ -102,10 +99,11 @@ do-install:
 			${CGIBINDIR} )
 	@(cd ${CGIBINDIR} && \
 		${CHMOD} 555 Zope.cgi pcgi-wrapper )
+	@${RM} -rf ${ZOPEBASEDIR}/lib/python/build/
 	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
-	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/var
+	@${CHOWN} root ${ZOPEBASEDIR}/var
 	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/var/*
 	@${RM} ${ZOPEBASEDIR}/var/.cvsignore
 	@if [ -e ${ZOPEBASEDIR}/var/Data.fs.preserve ] ; then \
diff --git a/www/zope213/distinfo b/www/zope213/distinfo
index 188763e35c10..0a7df9572373 100644
--- a/www/zope213/distinfo
+++ b/www/zope213/distinfo
@@ -1 +1 @@
-MD5 (zope/Zope-2.6.0-src.tgz) = a0bb91ca1df775aebfc8ff8c46afa3a9
+MD5 (zope/Zope-2.6.1-src.tgz) = a17f36b86b6e489797d8e52f1ba48efe
diff --git a/www/zope213/pkg-plist b/www/zope213/pkg-plist
index 88e0dcd3901c..361ab2efe20f 100644
--- a/www/zope213/pkg-plist
+++ b/www/zope213/pkg-plist
@@ -6,6 +6,25 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/Extensions/README.txt
 %%ZOPEBASEDIR%%/LICENSE.txt
 %%ZOPEBASEDIR%%/README.txt
+%%ZOPEBASEDIR%%/lib/python/BTrees/tests/test_check.py
+%%ZOPEBASEDIR%%/lib/python/BTrees/check.py
+%%ZOPEBASEDIR%%/lib/python/BTrees/check.pyc
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests/testPrefix.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/Prefix.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/Prefix.pyc
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Signals/SignalHandler.py
+%%ZOPEBASEDIR%%/lib/python/Signals/SignalHandler.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/ClassFactory.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/startup.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/ClassFactory.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/startup.pyc
+%%ZOPEBASEDIR%%/lib/python/Lifetime.py
+%%ZOPEBASEDIR%%/lib/python/Lifetime.pyc
 %%ZOPEBASEDIR%%/ZServer/DebugLogger.py
 %%ZOPEBASEDIR%%/ZServer/DebugLogger.pyc
 %%ZOPEBASEDIR%%/ZServer/FCGIServer.py
@@ -2457,6 +2476,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/z2.pyc
 %%ZOPEBASEDIR%%/zpasswd.py
 %%ZOPEBASEDIR%%/zpasswd.pyc
+%%ZOPEBASEDIR%%/Makefile
 %%CGIBINDIR%%/Zope.cgi
 %%CGIBINDIR%%/pcgi-wrapper
 @unexec rm -f %D/%%ZOPEBASEDIR%%/inituser
@@ -2484,7 +2504,9 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav
-@dirrm %%ZOPEBASEDIR%%/lib/python/build
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo
+@dirrm %%ZOPEBASEDIR%%/lib/python/Zope/App
 @dirrm %%ZOPEBASEDIR%%/lib/python/Zope
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils
diff --git a/www/zope28/Makefile b/www/zope28/Makefile
index 0a29cb32d7a6..42cae624ebce 100644
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@@ -6,20 +6,17 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.6.0
-PORTREVISION=	1
+PORTVERSION=	2.6.1
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	freebsd-ports@FreeBSD.org
-COMMENT=	An object-based web application platform with DB access, WebDAV, & more
-
-BROKEN=		"Does not compile"
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	An object-based web application platform
 
 USE_PYTHON=	yes
-PYTHON_VERSION=	python2.1
+PYTHON_VERSION=	python2.2
 
 DIST_SUBDIR=	zope
 
@@ -102,10 +99,11 @@ do-install:
 			${CGIBINDIR} )
 	@(cd ${CGIBINDIR} && \
 		${CHMOD} 555 Zope.cgi pcgi-wrapper )
+	@${RM} -rf ${ZOPEBASEDIR}/lib/python/build/
 	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
-	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/var
+	@${CHOWN} root ${ZOPEBASEDIR}/var
 	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/var/*
 	@${RM} ${ZOPEBASEDIR}/var/.cvsignore
 	@if [ -e ${ZOPEBASEDIR}/var/Data.fs.preserve ] ; then \
diff --git a/www/zope28/distinfo b/www/zope28/distinfo
index 188763e35c10..0a7df9572373 100644
--- a/www/zope28/distinfo
+++ b/www/zope28/distinfo
@@ -1 +1 @@
-MD5 (zope/Zope-2.6.0-src.tgz) = a0bb91ca1df775aebfc8ff8c46afa3a9
+MD5 (zope/Zope-2.6.1-src.tgz) = a17f36b86b6e489797d8e52f1ba48efe
diff --git a/www/zope28/pkg-plist b/www/zope28/pkg-plist
index 88e0dcd3901c..361ab2efe20f 100644
--- a/www/zope28/pkg-plist
+++ b/www/zope28/pkg-plist
@@ -6,6 +6,25 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/Extensions/README.txt
 %%ZOPEBASEDIR%%/LICENSE.txt
 %%ZOPEBASEDIR%%/README.txt
+%%ZOPEBASEDIR%%/lib/python/BTrees/tests/test_check.py
+%%ZOPEBASEDIR%%/lib/python/BTrees/check.py
+%%ZOPEBASEDIR%%/lib/python/BTrees/check.pyc
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests/testPrefix.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/Prefix.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/Prefix.pyc
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Signals/SignalHandler.py
+%%ZOPEBASEDIR%%/lib/python/Signals/SignalHandler.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/ClassFactory.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/startup.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/ClassFactory.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/startup.pyc
+%%ZOPEBASEDIR%%/lib/python/Lifetime.py
+%%ZOPEBASEDIR%%/lib/python/Lifetime.pyc
 %%ZOPEBASEDIR%%/ZServer/DebugLogger.py
 %%ZOPEBASEDIR%%/ZServer/DebugLogger.pyc
 %%ZOPEBASEDIR%%/ZServer/FCGIServer.py
@@ -2457,6 +2476,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/z2.pyc
 %%ZOPEBASEDIR%%/zpasswd.py
 %%ZOPEBASEDIR%%/zpasswd.pyc
+%%ZOPEBASEDIR%%/Makefile
 %%CGIBINDIR%%/Zope.cgi
 %%CGIBINDIR%%/pcgi-wrapper
 @unexec rm -f %D/%%ZOPEBASEDIR%%/inituser
@@ -2484,7 +2504,9 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav
-@dirrm %%ZOPEBASEDIR%%/lib/python/build
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo
+@dirrm %%ZOPEBASEDIR%%/lib/python/Zope/App
 @dirrm %%ZOPEBASEDIR%%/lib/python/Zope
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils
diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index 0a29cb32d7a6..42cae624ebce 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -6,20 +6,17 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.6.0
-PORTREVISION=	1
+PORTVERSION=	2.6.1
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	freebsd-ports@FreeBSD.org
-COMMENT=	An object-based web application platform with DB access, WebDAV, & more
-
-BROKEN=		"Does not compile"
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	An object-based web application platform
 
 USE_PYTHON=	yes
-PYTHON_VERSION=	python2.1
+PYTHON_VERSION=	python2.2
 
 DIST_SUBDIR=	zope
 
@@ -102,10 +99,11 @@ do-install:
 			${CGIBINDIR} )
 	@(cd ${CGIBINDIR} && \
 		${CHMOD} 555 Zope.cgi pcgi-wrapper )
+	@${RM} -rf ${ZOPEBASEDIR}/lib/python/build/
 	@#
 	@${ECHO} "===>   Fixing permissions of Zope's own var directory..."
 	@${CHMOD} ugo+rwt ${ZOPEBASEDIR}/var
-	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/var
+	@${CHOWN} root ${ZOPEBASEDIR}/var
 	@${CHOWN} ${ZOPE_USER} ${ZOPEBASEDIR}/var/*
 	@${RM} ${ZOPEBASEDIR}/var/.cvsignore
 	@if [ -e ${ZOPEBASEDIR}/var/Data.fs.preserve ] ; then \
diff --git a/www/zope29/distinfo b/www/zope29/distinfo
index 188763e35c10..0a7df9572373 100644
--- a/www/zope29/distinfo
+++ b/www/zope29/distinfo
@@ -1 +1 @@
-MD5 (zope/Zope-2.6.0-src.tgz) = a0bb91ca1df775aebfc8ff8c46afa3a9
+MD5 (zope/Zope-2.6.1-src.tgz) = a17f36b86b6e489797d8e52f1ba48efe
diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist
index 88e0dcd3901c..361ab2efe20f 100644
--- a/www/zope29/pkg-plist
+++ b/www/zope29/pkg-plist
@@ -6,6 +6,25 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/Extensions/README.txt
 %%ZOPEBASEDIR%%/LICENSE.txt
 %%ZOPEBASEDIR%%/README.txt
+%%ZOPEBASEDIR%%/lib/python/BTrees/tests/test_check.py
+%%ZOPEBASEDIR%%/lib/python/BTrees/check.py
+%%ZOPEBASEDIR%%/lib/python/BTrees/check.pyc
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests/testPrefix.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/Prefix.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/Prefix.pyc
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Signals/SignalHandler.py
+%%ZOPEBASEDIR%%/lib/python/Signals/SignalHandler.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/ClassFactory.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/startup.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/ClassFactory.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/startup.pyc
+%%ZOPEBASEDIR%%/lib/python/Lifetime.py
+%%ZOPEBASEDIR%%/lib/python/Lifetime.pyc
 %%ZOPEBASEDIR%%/ZServer/DebugLogger.py
 %%ZOPEBASEDIR%%/ZServer/DebugLogger.pyc
 %%ZOPEBASEDIR%%/ZServer/FCGIServer.py
@@ -2457,6 +2476,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/z2.pyc
 %%ZOPEBASEDIR%%/zpasswd.py
 %%ZOPEBASEDIR%%/zpasswd.pyc
+%%ZOPEBASEDIR%%/Makefile
 %%CGIBINDIR%%/Zope.cgi
 %%CGIBINDIR%%/pcgi-wrapper
 @unexec rm -f %D/%%ZOPEBASEDIR%%/inituser
@@ -2484,7 +2504,9 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav
-@dirrm %%ZOPEBASEDIR%%/lib/python/build
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo
+@dirrm %%ZOPEBASEDIR%%/lib/python/Zope/App
 @dirrm %%ZOPEBASEDIR%%/lib/python/Zope
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils