Update Plone to 4.2.5.

Release notes:
http://plone.org/products/plone/releases/4.2.5
http://plone.org/products/plone/releases/4.2.4
http://plone.org/products/plone/releases/4.2.3
http://plone.org/products/plone/releases/4.2.2

This update includes:
- devel/py-Products.ZCTextIndex 2.13.3 -> 2.13.4
- devel/py-Products.ATContentTypes 2.1.8 -> 2.1.12
- devel/py-Products.Archetypes 1.8.3 -> 1.8.6
- devel/py-Products.CMFCore 2.2.6 -> 2.2.7
- devel/py-Products.CMFDefault 2.2.2 -> 2.2.3
- devel/py-Products.CMFDiffTool 2.0 -> 2.0.2
- devel/py-Products.CMFDynamicViewFTI 4.0.2 -> 4.0.3
- devel/py-Products.CMFEditions 2.2.5 -> 2.2.8
- devel/py-Products.CMFFormController 3.0.2 -> 3.0.3
- devel/py-Products.CMFPlacefulWorkflow 1.5.7 -> 1.5.9
- www/py-Products.CMFPlone 4.2.1.1 -> 4.2.5
- devel/py-Products.contentmigration 2.1.1 -> 2.1.3
- devel/py-Products.ExtendedPathIndex 3.0.1 -> 3.1
- devel/py-Products.GenericSetup 1.7.2 -> 1.7.3
- devel/py-Products.Marshall 2.1.1 -> 2.1.2
- devel/py-Products.MimetypesRegistry 2.0.3 -> 2.0.4
- devel/py-Products.PasswordResetTool 2.0.8 -> 2.0.12
- devel/py-Products.PloneLanguageTool 3.2.5 -> 3.2.7
- security/py-Products.PlonePAS 4.0.13 -> 4.0.16
- security/py-Products.PluggableAuthService 1.8.0 -> 1.10.0
- devel/py-Products.PortalTransforms 2.0.7 -> 2.1.2
- devel/py-Products.ResourceRegistries 2.2.1 -> 2.2.7
- www/py-Products.TinyMCE 1.2.13 -> 1.2.16
- www/py-Products.kupu 1.5.0 -> 1.5.1
- devel/py-archetypes.querywidget 1.0.4 -> 1.0.8
- devel/py-archetypes.referencebrowserwidget 2.4.12 -> 2.4.17
- devel/py-archetypes.schemaextender 2.1.1 -> 2.1.2
- devel/py-collective.z3cform.datetimewidget 1.2.0 -> 1.2.3
- devel/py-diazo 1.0.1 -> 1.0.3
- devel/py-kss-core 1.6.4 -> 1.6.5
- www/py-plone.app.blob 1.5.2 -> 1.5.7
- www/py-plone.app.caching 1.1 -> 1.1.3
- www/py-plone.app.collection 1.0.5 -> 1.0.8
- www/py-plone.app.content 2.0.11 -> 2.0.12
- www/py-plone.app.contentmenu 2.0.6 -> 2.0.8
- www/py-plone.app.contentlisting 1.0.1 -> 1.0.4
- www/py-plone.app.contentrules 2.1.8 -> 2.1.9
- www/py-plone.app.controlpanel 2.2.8 -> 2.2.11
- www/py-plone.app.discussion 2.1.7 -> 2.1.9
- www/py-plone.app.folder 1.0.4 -> 1.0.5
- www/py-plone.app.form 2.1.1 -> 2.1.2
- www/py-plone.app.i18n 2.0.1 -> 2.0.2
- www/py-plone.app.imaging 1.0.6 -> 1.0.7
- www/py-plone.app.iterate 2.1.7 -> 2.1.9
- www/py-plone.app.layout 2.2.7 -> 2.2.9
- www/py-plone.app.ldap 1.2.8 -> 1.3.0
- www/py-plone.app.linkintegrity 1.4.6 -> 1.5.1
- www/py-plone.app.locales 4.0.15 -> 4.2.5
- www/py-plone.app.portlets 2.2.6 -> 2.3.8
- www/py-plone.app.querystring 1.0.5 -> 1.0.7
- www/py-plone.app.search 1.0.4 -> 1.0.8
- www/py-plone.app.testing 4.2 -> 4.2.2
- www/py-plone.app.theming 1.0.3 -> 1.0.4
- www/py-plone.app.upgrade 1.2.1 -> 1.2.5
- www/py-plone.app.users 1.1.3 -> 1.1.5
- www/py-plone.app.viewletmanager 2.0.2 > 2.0.3
- www/py-plone.app.vocabularies 2.1.7 -> 2.1.10
- www/py-plone.app.workflow 2.0.7 -> 2.0.10
- www/py-plone.app.z3cform 0.6.0 -> 0.6.2
- www/py-plone.autoform 1.2 -> 1.3
- www/py-plone.browserlayer 2.1.1 -> 2.1.2
- www/py-plone.cachepurging 1.0.3 -> 1.0.4
- www/py-plone.contentrules 2.0.1 -> 2.0.2
- www/py-plone.folder 1.0.2 -> 1.0.4
- www/py-plone.i18n 2.0.1 -> 2.0.5
- www/py-plone.indexer 1.0 -> 1.0.2
- www/py-plone.intelligenttext 2.0.1 -> 2.0.2
- security/py-plone.keyring 2.0 -> 2.0.1
- www/py-plone.locking 2.0.3 -> 2.0.4
- security/py-plone.openid 2.0 -> 2.0.1
- www/py-plone.outputfilters 1.6 -> 1.8
- www/py-plone.portlet.collection 2.1.1 -> 2.1.3
- www/py-plone.portlet.static 2.0.1 -> 2.0.2
- security/py-plone.protect 2.0 -> 2.0.2
- www/py-plone.registry 1.0 -> 1.0.1
- www/py-plone.resource 1.0.1 -> 1.0.2
- security/py-plone.session 3.5 -> 3.5.3
- www/py-plone.subrequest 1.6.6 -> 1.6.7
- www/py-plone.supermodel 1.1.1 -> 1.1.4
- www/py-plone.testing 4.0.4 -> 4.0.8
- www/py-plone.transformchain 1.0.2 -> 1.0.3
- www/py-plonetheme.classic 1.2.3 -> 1.2.5
- www/py-plonetheme.sunburst 1.2.7 -> 1.2.8
- textproc/py-wicked 1.1.9 -> 1.1.10
- devel/py-z3c.formwidget.query 0.8 -> 0.9
- devel/py-zope.schema 4.2.0 -> 4.2.1

73 files changed, 195 insertions, 159 deletions

diff --git a/devel/py-Products.ATContentTypes/Makefile b/devel/py-Products.ATContentTypes/Makefile
index 5210fdd95e64..7c9d4b062517 100644
--- a/devel/py-Products.ATContentTypes/Makefile
+++ b/devel/py-Products.ATContentTypes/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Products.ATContentTypes
-PORTVERSION=	2.1.8
+PORTVERSION=	2.1.12
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-Products.ATContentTypes/distinfo b/devel/py-Products.ATContentTypes/distinfo
index 1705417cfea9..38897af837d7 100644
--- a/devel/py-Products.ATContentTypes/distinfo
+++ b/devel/py-Products.ATContentTypes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.ATContentTypes-2.1.8.zip) = b8761974463a2a2a42018d8182b3d88bf55b41c27843b3dcc109e0c1f06c8dc5
-SIZE (zope/Products.ATContentTypes-2.1.8.zip) = 365376
+SHA256 (zope/Products.ATContentTypes-2.1.12.zip) = 3c4e116e9729b32a7188832ca47503f5ecb2597d43f2623e8440e3ea2292f78e
+SIZE (zope/Products.ATContentTypes-2.1.12.zip) = 367921
diff --git a/devel/py-Products.ATContentTypes/pkg-plist b/devel/py-Products.ATContentTypes/pkg-plist
index f051bf4b0ba4..34de66991ec7 100644
--- a/devel/py-Products.ATContentTypes/pkg-plist
+++ b/devel/py-Products.ATContentTypes/pkg-plist
@@ -22,6 +22,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/ATContentTypes/browser/criteria.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/ATContentTypes/browser/criteria.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/ATContentTypes/browser/criteria.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/ATContentTypes/browser/download.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/ATContentTypes/browser/download.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/ATContentTypes/browser/download.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/ATContentTypes/browser/nextprevious.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/ATContentTypes/browser/nextprevious.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/ATContentTypes/browser/nextprevious.pyo
diff --git a/devel/py-Products.Archetypes/Makefile b/devel/py-Products.Archetypes/Makefile
index 0a67a08b7523..a33696670301 100644
--- a/devel/py-Products.Archetypes/Makefile
+++ b/devel/py-Products.Archetypes/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Products.Archetypes
-PORTVERSION=	1.8.3
+PORTVERSION=	1.8.6
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -45,7 +45,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
 		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
 		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:${PORTSDIR}/devel/py-Products.ZSQLMethods
 
 DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
diff --git a/devel/py-Products.Archetypes/distinfo b/devel/py-Products.Archetypes/distinfo
index 1d9b7c003c96..2304f91b9178 100644
--- a/devel/py-Products.Archetypes/distinfo
+++ b/devel/py-Products.Archetypes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.Archetypes-1.8.3.zip) = fba0d68e127d73f7e96547f845ab6226b7ab600f7071fddc8c4068a04d4ec85e
-SIZE (zope/Products.Archetypes-1.8.3.zip) = 688595
+SHA256 (zope/Products.Archetypes-1.8.6.zip) = 68558082e2958d7b8e33caeeca460df705a38c76cb504593253da2b84c85704d
+SIZE (zope/Products.Archetypes-1.8.6.zip) = 693204
diff --git a/devel/py-Products.Archetypes/pkg-plist b/devel/py-Products.Archetypes/pkg-plist
index 4b0429563c7e..955e8136946f 100644
--- a/devel/py-Products.Archetypes/pkg-plist
+++ b/devel/py-Products.Archetypes/pkg-plist
@@ -151,6 +151,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/browser/lifecycle.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/browser/lifecycle.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/browser/lifecycle.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/browser/validation.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/browser/validation.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/browser/validation.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/browser/widgets.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/browser/widgets.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/browser/widgets.pyo
@@ -366,6 +369,7 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/skins/archetypes/getImageTag.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/skins/archetypes/getUniqueWidgetAttr.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/skins/archetypes/go_back.cpy
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/skins/archetypes/keywordwidget.css
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/skins/archetypes/lookupMime.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/skins/archetypes/metadata_macros.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/skins/archetypes/reference_focus_js.dtml
@@ -423,6 +427,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/skins/archetypes/wysiwyg_support.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/skins/archetypes_kss/at.kss
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/skins/archetypes_kss/at_experimental.kss
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/subscribers.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/subscribers.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/subscribers.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/tests/README.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/Archetypes/tests/__init__.pyc
diff --git a/devel/py-Products.CMFCore/Makefile b/devel/py-Products.CMFCore/Makefile
index 2a448feede58..2c6639e1bea8 100644
--- a/devel/py-Products.CMFCore/Makefile
+++ b/devel/py-Products.CMFCore/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Products.CMFCore
-PORTVERSION=	2.2.6
-PORTREVISION=	1
+PORTVERSION=	2.2.7
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,10 +14,11 @@ LICENSE=	ZPL21
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:${PORTSDIR}/devel/py-five.localsitemanager \
 		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>=0:${PORTSDIR}/devel/py-Products.ZSQLMethods
+		${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:${PORTSDIR}/devel/py-Products.ZSQLMethods \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:${PORTSDIR}/devel/py-zope.app.publication
 
 DIST_SUBDIR=	zope
-USE_PYTHON=	yes
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	easy_install
 #USE_ZOPE=	yes # cyclic dependency
 
diff --git a/devel/py-Products.CMFCore/distinfo b/devel/py-Products.CMFCore/distinfo
index 2cfa9248cc6a..28643acc77a9 100644
--- a/devel/py-Products.CMFCore/distinfo
+++ b/devel/py-Products.CMFCore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.CMFCore-2.2.6.tar.gz) = b7a3449077510cdd7386dc974657abbfcda2fd2986936d4815c8087fcb8a6071
-SIZE (zope/Products.CMFCore-2.2.6.tar.gz) = 272584
+SHA256 (zope/Products.CMFCore-2.2.7.tar.gz) = 662ede01cf548f49d2aa8d3c864a62f9282ba09f5b2f547c36b6a22e196fd22d
+SIZE (zope/Products.CMFCore-2.2.7.tar.gz) = 276144
diff --git a/devel/py-Products.CMFDefault/Makefile b/devel/py-Products.CMFDefault/Makefile
index cd24b5ff563c..0c3d08fd3338 100644
--- a/devel/py-Products.CMFDefault/Makefile
+++ b/devel/py-Products.CMFDefault/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Products.CMFDefault
-PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTVERSION=	2.2.3
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-Products.CMFDefault/distinfo b/devel/py-Products.CMFDefault/distinfo
index ba5f4e53ab92..818dbc56514b 100644
--- a/devel/py-Products.CMFDefault/distinfo
+++ b/devel/py-Products.CMFDefault/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.CMFDefault-2.2.2.tar.gz) = 8eebc42a4a0c6709520175b9041968106889fb74c53c202a2f9be6c230302fe5
-SIZE (zope/Products.CMFDefault-2.2.2.tar.gz) = 279181
+SHA256 (zope/Products.CMFDefault-2.2.3.tar.gz) = d17866a027d803f585bc75735771551854fc67b007ddee4a8923c82a39da0855
+SIZE (zope/Products.CMFDefault-2.2.3.tar.gz) = 285409
diff --git a/devel/py-Products.CMFDefault/pkg-descr b/devel/py-Products.CMFDefault/pkg-descr
index 9903e1f265c9..849f164633d5 100644
--- a/devel/py-Products.CMFDefault/pkg-descr
+++ b/devel/py-Products.CMFDefault/pkg-descr
@@ -1,3 +1,3 @@
 Default product for the Zope Content Management Framework.
 
-WWW:	http://pypi.python.org/pypi/Products.CMFDefault
+WWW: http://pypi.python.org/pypi/Products.CMFDefault
diff --git a/devel/py-Products.CMFDiffTool/Makefile b/devel/py-Products.CMFDiffTool/Makefile
index 7eb93868a93d..a69bc829ab19 100644
--- a/devel/py-Products.CMFDiffTool/Makefile
+++ b/devel/py-Products.CMFDiffTool/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	py-Products.CMFDiffTool
-# Date created:				20 December 2011
-# Whom:					Ruslan Mahmatkhanov <cvs-src@yandex.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	Products.CMFDiffTool
-PORTVERSION=	2.0
+PORTVERSION=	2.0.2
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition
 
 DIST_SUBDIR=	zope
-USE_PYTHON=	yes
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	easy_install
 USE_ZIP=	yes
 #USE_ZOPE=	yes
diff --git a/devel/py-Products.CMFDiffTool/distinfo b/devel/py-Products.CMFDiffTool/distinfo
index 09795a4a914d..ac50e20219bf 100644
--- a/devel/py-Products.CMFDiffTool/distinfo
+++ b/devel/py-Products.CMFDiffTool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.CMFDiffTool-2.0.zip) = bcc5ac7a2a5b9ca99feb76e076d71940e56d2e40ef8924c8b65eab65a9bc9fde
-SIZE (zope/Products.CMFDiffTool-2.0.zip) = 45247
+SHA256 (zope/Products.CMFDiffTool-2.0.2.zip) = df07ef6eb7d70f0fb4b7439c5e72c5e5e3b22dc34379d12e852f4269a89f5ed2
+SIZE (zope/Products.CMFDiffTool-2.0.2.zip) = 59165
diff --git a/devel/py-Products.CMFDiffTool/pkg-descr b/devel/py-Products.CMFDiffTool/pkg-descr
index dd9610fa71aa..0dc3d5e26217 100644
--- a/devel/py-Products.CMFDiffTool/pkg-descr
+++ b/devel/py-Products.CMFDiffTool/pkg-descr
@@ -1,3 +1,3 @@
 Diff tool for Plone.
 
-WWW:	http://pypi.python.org/pypi/Products.CMFDiffTool
+WWW: http://pypi.python.org/pypi/Products.CMFDiffTool
diff --git a/devel/py-Products.CMFDiffTool/pkg-plist b/devel/py-Products.CMFDiffTool/pkg-plist
index 0b47ae3ad630..adeeeb2eb2e8 100644
--- a/devel/py-Products.CMFDiffTool/pkg-plist
+++ b/devel/py-Products.CMFDiffTool/pkg-plist
@@ -36,7 +36,13 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/choicediff.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/choicediff.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/choicediff.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/configure.zcml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/dexteritydiff.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/dexteritydiff.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/dexteritydiff.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/exportimport/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/exportimport/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/exportimport/__init__.pyo
@@ -60,9 +66,16 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/libs/htmldiff.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/libs/htmldiff.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/locales/cmfdifftool.pot
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/locales/pt_BR/LC_MESSAGES/collective.dexteritydiff.po
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/namedfile.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/namedfile.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/namedfile.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/profiles.zcml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/profiles/default/componentregistry.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/profiles/default/metadata.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/testing.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/testing.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/testing.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/BaseTestCase.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/BaseTestCase.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/BaseTestCase.pyo
@@ -90,6 +103,27 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/testTextDiff.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/testTextDiff.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/testTextDiff.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_astextdiff.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_astextdiff.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_astextdiff.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_binarydiff.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_binarydiff.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_binarydiff.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_choicediff.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_choicediff.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_choicediff.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_dexteritydiff.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_dexteritydiff.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_dexteritydiff.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_filelistdiff.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_filelistdiff.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_filelistdiff.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_install.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_install.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_install.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_richtextdiff.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_richtextdiff.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests/test_richtextdiff.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tool.gif
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/utils.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/utils.pyc
@@ -102,6 +136,8 @@
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/tests
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/profiles/default
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/profiles
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/locales/pt_BR/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/locales/pt_BR
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/locales
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/libs
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFDiffTool/interfaces
diff --git a/devel/py-Products.CMFDynamicViewFTI/Makefile b/devel/py-Products.CMFDynamicViewFTI/Makefile
index cd155aac5344..ad3f04333aa5 100644
--- a/devel/py-Products.CMFDynamicViewFTI/Makefile
+++ b/devel/py-Products.CMFDynamicViewFTI/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	py-Products.CMFDynamicViewFTI
-# Date created:				23 December 2011
-# Whom:					Ruslan Mahmatkhanov <cvs-src@yandex.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	Products.CMFDynamicViewFTI
-PORTVERSION=	4.0.2
+PORTVERSION=	4.0.3
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,9 +11,9 @@ COMMENT=	Product for dynamic views in CMF
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:${PORTSDIR}/devel/py-zope.browsermenu \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:${PORTSDIR}/devel/py-zope.app.publisher \
 		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
 		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
 		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
diff --git a/devel/py-Products.CMFDynamicViewFTI/distinfo b/devel/py-Products.CMFDynamicViewFTI/distinfo
index 22a8041071cb..43138c34453d 100644
--- a/devel/py-Products.CMFDynamicViewFTI/distinfo
+++ b/devel/py-Products.CMFDynamicViewFTI/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.CMFDynamicViewFTI-4.0.2.zip) = e64aef6f156d890dcb02f3dae84bc3de7e64910078b100e38e80aecb85e9745d
-SIZE (zope/Products.CMFDynamicViewFTI-4.0.2.zip) = 30062
+SHA256 (zope/Products.CMFDynamicViewFTI-4.0.3.zip) = d68a2fb2f68ddcfb676e2b4c54e360a2ee3b7ca4018bf9bb81173cd7a865f16e
+SIZE (zope/Products.CMFDynamicViewFTI-4.0.3.zip) = 30389
diff --git a/devel/py-Products.CMFDynamicViewFTI/pkg-descr b/devel/py-Products.CMFDynamicViewFTI/pkg-descr
index e988fecd88d1..b60776d95014 100644
--- a/devel/py-Products.CMFDynamicViewFTI/pkg-descr
+++ b/devel/py-Products.CMFDynamicViewFTI/pkg-descr
@@ -1,3 +1,3 @@
 CMFDynamicViewFTI is a product for dynamic views in CMF.
 
-WWW:	http://pypi.python.org/pypi/Products.CMFDynamicViewFTI
+WWW: http://pypi.python.org/pypi/Products.CMFDynamicViewFTI
diff --git a/devel/py-Products.CMFEditions/Makefile b/devel/py-Products.CMFEditions/Makefile
index 02b313438ba4..1d9a6a3372c8 100644
--- a/devel/py-Products.CMFEditions/Makefile
+++ b/devel/py-Products.CMFEditions/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Products.CMFEditions
-PORTVERSION=	2.2.5
+PORTVERSION=	2.2.8
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -23,8 +23,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.copy>0:${PORTSDIR}/devel/py-zope.copy \
 		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
 		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
 		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}plone.app.blob>=0:${PORTSDIR}/www/py-plone.app.blob
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
 
 DIST_SUBDIR=	zope
 USE_PYTHON=	yes
diff --git a/devel/py-Products.CMFEditions/distinfo b/devel/py-Products.CMFEditions/distinfo
index 221b40a08d7b..604bf3513302 100644
--- a/devel/py-Products.CMFEditions/distinfo
+++ b/devel/py-Products.CMFEditions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.CMFEditions-2.2.5.zip) = 84d60058883c43c66410e8d5964f6be5a733732d3725154f5d535b99b46a0aac
-SIZE (zope/Products.CMFEditions-2.2.5.zip) = 1866305
+SHA256 (zope/Products.CMFEditions-2.2.8.zip) = 329f7c41414f4a38399b375ab2bfde1186ad83364ccc6a6bd95f110379dffd87
+SIZE (zope/Products.CMFEditions-2.2.8.zip) = 1867070
diff --git a/devel/py-Products.CMFFormController/Makefile b/devel/py-Products.CMFFormController/Makefile
index 00cc4e5952e2..8e6b9f04c479 100644
--- a/devel/py-Products.CMFFormController/Makefile
+++ b/devel/py-Products.CMFFormController/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	py-Products.CMFFormController
-# Date created:				20 December 2011
-# Whom:					Ruslan Mahmatkhanov <cvs-src@yandex.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	Products.CMFFormController
-PORTVERSION=	3.0.2
+PORTVERSION=	3.0.3
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-Products.CMFFormController/distinfo b/devel/py-Products.CMFFormController/distinfo
index 194fecb4b7ec..cd88b117bfbc 100644
--- a/devel/py-Products.CMFFormController/distinfo
+++ b/devel/py-Products.CMFFormController/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.CMFFormController-3.0.2.zip) = 938e0db6a220a7e396f3f0e3f3d36dfec0758e233efaffb355cfc68c8649ea78
-SIZE (zope/Products.CMFFormController-3.0.2.zip) = 87569
+SHA256 (zope/Products.CMFFormController-3.0.3.zip) = 71ad9f0f0535a5379cf75c56c6d8a4d36bc5146487247c3eead89e274bd637d2
+SIZE (zope/Products.CMFFormController-3.0.3.zip) = 88040
diff --git a/devel/py-Products.CMFFormController/pkg-descr b/devel/py-Products.CMFFormController/pkg-descr
index 4762e8efff5f..648de616c4a1 100644
--- a/devel/py-Products.CMFFormController/pkg-descr
+++ b/devel/py-Products.CMFFormController/pkg-descr
@@ -1,3 +1,3 @@
 CMFFormController provides a form validation mechanism for CMF.
 
-WWW:	http://pypi.python.org/pypi/Products.CMFFormController
+WWW: http://pypi.python.org/pypi/Products.CMFFormController
diff --git a/devel/py-Products.CMFPlacefulWorkflow/Makefile b/devel/py-Products.CMFPlacefulWorkflow/Makefile
index 173716fc1c72..63e216690f0d 100644
--- a/devel/py-Products.CMFPlacefulWorkflow/Makefile
+++ b/devel/py-Products.CMFPlacefulWorkflow/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Products.CMFPlacefulWorkflow
-PORTVERSION=	1.5.7
+PORTVERSION=	1.5.9
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-Products.CMFPlacefulWorkflow/distinfo b/devel/py-Products.CMFPlacefulWorkflow/distinfo
index 2e0460dbeb8d..35e64f0ab83c 100644
--- a/devel/py-Products.CMFPlacefulWorkflow/distinfo
+++ b/devel/py-Products.CMFPlacefulWorkflow/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.CMFPlacefulWorkflow-1.5.7.zip) = 0ed0fc01f7f749ffe8c54a788ddfa2b6dfde4ac2a8932edfaf6e0d05db7f46b3
-SIZE (zope/Products.CMFPlacefulWorkflow-1.5.7.zip) = 100051
+SHA256 (zope/Products.CMFPlacefulWorkflow-1.5.9.zip) = 4afeaef00a089a24b1b22eb0fa854c178754f92d3a8e5185472d900ee8201656
+SIZE (zope/Products.CMFPlacefulWorkflow-1.5.9.zip) = 103409
diff --git a/devel/py-Products.CMFPlacefulWorkflow/pkg-plist b/devel/py-Products.CMFPlacefulWorkflow/pkg-plist
index b3e107c0ffb8..46fc6562370f 100644
--- a/devel/py-Products.CMFPlacefulWorkflow/pkg-plist
+++ b/devel/py-Products.CMFPlacefulWorkflow/pkg-plist
@@ -60,6 +60,10 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/messagefactory_.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/messagefactory_.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/messagefactory_.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/permissions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/permissions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/permissions.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/permissions.zcml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/profiles.zcml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/profiles/base/actionicons.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/profiles/base/componentregistry.xml
@@ -75,6 +79,7 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/profiles/default/portal_placeful_workflow/old-plone.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/profiles/default/portal_placeful_workflow/one-state.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/profiles/default/portal_placeful_workflow/simple-publication.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/profiles/default/rolemap.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/setuphandlers.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/setuphandlers.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/setuphandlers.pyo
@@ -120,7 +125,7 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/tests/test_policy_form.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/tool.gif
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/www/WorkflowPolicyConfig_icon.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/www/add_workflow_policy.dtml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/www/add_workflow_policy.zpt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/www/add_workflow_policy_config_form.zpt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/www/define_local_workflow_policy.zpt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/CMFPlacefulWorkflow/www/manage_workflow_policy_config.zpt
diff --git a/devel/py-Products.ExtendedPathIndex/Makefile b/devel/py-Products.ExtendedPathIndex/Makefile
index 13a8b8b2e1a5..fb2e078b2644 100644
--- a/devel/py-Products.ExtendedPathIndex/Makefile
+++ b/devel/py-Products.ExtendedPathIndex/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Products.ExtendedPathIndex
-PORTVERSION=	3.0.1
+PORTVERSION=	3.1
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-Products.ExtendedPathIndex/distinfo b/devel/py-Products.ExtendedPathIndex/distinfo
index a8987c252140..0c61c35526d4 100644
--- a/devel/py-Products.ExtendedPathIndex/distinfo
+++ b/devel/py-Products.ExtendedPathIndex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.ExtendedPathIndex-3.0.1.zip) = 072225e3184200d6db4e4a8be00b0be6cd35e2fb53291989d630a2d877cce3f1
-SIZE (zope/Products.ExtendedPathIndex-3.0.1.zip) = 29053
+SHA256 (zope/Products.ExtendedPathIndex-3.1.zip) = 9f2735ee67a8ac63dff546d6291fb8949f75dafdf25452a922040e1f5011acaa
+SIZE (zope/Products.ExtendedPathIndex-3.1.zip) = 29231
diff --git a/devel/py-Products.GenericSetup/Makefile b/devel/py-Products.GenericSetup/Makefile
index 15b4c423c3fd..87b1c6ea6501 100644
--- a/devel/py-Products.GenericSetup/Makefile
+++ b/devel/py-Products.GenericSetup/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Products.GenericSetup
-PORTVERSION=	1.7.2
-PORTREVISION=	1
+PORTVERSION=	1.7.3
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-Products.GenericSetup/distinfo b/devel/py-Products.GenericSetup/distinfo
index 75ed29d15943..53b146bf167a 100644
--- a/devel/py-Products.GenericSetup/distinfo
+++ b/devel/py-Products.GenericSetup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.GenericSetup-1.7.2.tar.gz) = bddcf397ad0faa6a04ea36a2cc541c6b400982fd6c9feb05dc2b63d75e06d7fd
-SIZE (zope/Products.GenericSetup-1.7.2.tar.gz) = 142536
+SHA256 (zope/Products.GenericSetup-1.7.3.tar.gz) = 180bc1bf43e4efa84c65db2c9ae9f187b14e66a19e6632275a5915e658c001f7
+SIZE (zope/Products.GenericSetup-1.7.3.tar.gz) = 142135
diff --git a/devel/py-Products.Marshall/Makefile b/devel/py-Products.Marshall/Makefile
index 2aa207c4dbdd..ed0d8c66e794 100644
--- a/devel/py-Products.Marshall/Makefile
+++ b/devel/py-Products.Marshall/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	py-Products.Marshall
-# Date created:				02 January 2012
-# Whom:					Ruslan Mahmatkhanov <cvs-src@yandex.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	Products.Marshall
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -27,7 +22,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transact
 		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
 
 DIST_SUBDIR=	zope
-USE_PYTHON=	yes
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	easy_install
 USE_ZIP=	yes
 
diff --git a/devel/py-Products.Marshall/distinfo b/devel/py-Products.Marshall/distinfo
index cd004d976cd7..8a5546812b70 100644
--- a/devel/py-Products.Marshall/distinfo
+++ b/devel/py-Products.Marshall/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.Marshall-2.1.1.zip) = c6d890ec79cc0d2b9c13bdd9c8b69949507935e28c7a7d2a69fe7c5ec3327c81
-SIZE (zope/Products.Marshall-2.1.1.zip) = 144886
+SHA256 (zope/Products.Marshall-2.1.2.zip) = 52fd4b08c70aa06b13fc612211b9835da2bdac164bac0728b6d544399e529232
+SIZE (zope/Products.Marshall-2.1.2.zip) = 144391
diff --git a/devel/py-Products.Marshall/pkg-descr b/devel/py-Products.Marshall/pkg-descr
index 788cf2443504..527a6ce6c705 100644
--- a/devel/py-Products.Marshall/pkg-descr
+++ b/devel/py-Products.Marshall/pkg-descr
@@ -1,3 +1,3 @@
 Configurable Marshallers for Archetypes.
 
-WWW:	http://pypi.python.org/pypi/Products.Marshall
+WWW: http://pypi.python.org/pypi/Products.Marshall
diff --git a/devel/py-Products.MimetypesRegistry/Makefile b/devel/py-Products.MimetypesRegistry/Makefile
index 8ebe96f1a490..3b03ef516d33 100644
--- a/devel/py-Products.MimetypesRegistry/Makefile
+++ b/devel/py-Products.MimetypesRegistry/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	py-Products.MimetypesRegistry
-# Date created:				20 December 2011
-# Whom:					Ruslan Mahmatkhanov <cvs-src@yandex.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	Products.MimetypesRegistry
-PORTVERSION=	2.0.3
+PORTVERSION=	2.0.4
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -23,8 +18,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zop
 		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
 
 DIST_SUBDIR=	zope
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYTHON=	-2.7
+USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.MimetypesRegistry/distinfo b/devel/py-Products.MimetypesRegistry/distinfo
index 47fed9d7b4dc..e65e8a67af17 100644
--- a/devel/py-Products.MimetypesRegistry/distinfo
+++ b/devel/py-Products.MimetypesRegistry/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.MimetypesRegistry-2.0.3.zip) = f6b15f1d08e06b0b6c5be6963d5716b051693d56f1fce9a88358fecfcd450a5d
-SIZE (zope/Products.MimetypesRegistry-2.0.3.zip) = 290843
+SHA256 (zope/Products.MimetypesRegistry-2.0.4.zip) = eee572c4bed660dfeeb1c953b2966b3c0135101cbba58f924c84e534c3435a52
+SIZE (zope/Products.MimetypesRegistry-2.0.4.zip) = 292733
diff --git a/devel/py-Products.MimetypesRegistry/pkg-descr b/devel/py-Products.MimetypesRegistry/pkg-descr
index 03b25601ee1f..b444ad679cc6 100644
--- a/devel/py-Products.MimetypesRegistry/pkg-descr
+++ b/devel/py-Products.MimetypesRegistry/pkg-descr
@@ -1,3 +1,3 @@
 MIME type handling for Zope.
 
-WWW:	http://pypi.python.org/pypi/Products.MimetypesRegistry
+WWW: http://pypi.python.org/pypi/Products.MimetypesRegistry
diff --git a/devel/py-Products.MimetypesRegistry/pkg-plist b/devel/py-Products.MimetypesRegistry/pkg-plist
index dc83f6065d94..a47334ea8705 100644
--- a/devel/py-Products.MimetypesRegistry/pkg-plist
+++ b/devel/py-Products.MimetypesRegistry/pkg-plist
@@ -61,6 +61,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/MimetypesRegistry/setuphandlers.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/MimetypesRegistry/setuphandlers.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/MimetypesRegistry/setuphandlers.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/MimetypesRegistry/smi_mimetypes.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/MimetypesRegistry/smi_mimetypes.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/MimetypesRegistry/smi_mimetypes.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/MimetypesRegistry/skins/mimetypes_icons/application.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/MimetypesRegistry/skins/mimetypes_icons/audio.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/MimetypesRegistry/skins/mimetypes_icons/avi.png
diff --git a/devel/py-Products.PasswordResetTool/Makefile b/devel/py-Products.PasswordResetTool/Makefile
index 959f75b59f41..dff4b8d03294 100644
--- a/devel/py-Products.PasswordResetTool/Makefile
+++ b/devel/py-Products.PasswordResetTool/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Products.PasswordResetTool
-PORTVERSION=	2.0.8
+PORTVERSION=	2.0.12
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-Products.PasswordResetTool/distinfo b/devel/py-Products.PasswordResetTool/distinfo
index bc09fa7b00fe..42f69687ee74 100644
--- a/devel/py-Products.PasswordResetTool/distinfo
+++ b/devel/py-Products.PasswordResetTool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.PasswordResetTool-2.0.8.zip) = 0c8cdde766f38a096ded5de96da1a9c5fb42bedd8411d8a7e5581146accb0117
-SIZE (zope/Products.PasswordResetTool-2.0.8.zip) = 53709
+SHA256 (zope/Products.PasswordResetTool-2.0.12.zip) = e76bdd1e78bb30a2519dd3e1bed7a80110342f25d62ad11d06ac25607b44a648
+SIZE (zope/Products.PasswordResetTool-2.0.12.zip) = 57212
diff --git a/devel/py-Products.PasswordResetTool/pkg-plist b/devel/py-Products.PasswordResetTool/pkg-plist
index 6dd445dd40f2..bc76a346b009 100644
--- a/devel/py-Products.PasswordResetTool/pkg-plist
+++ b/devel/py-Products.PasswordResetTool/pkg-plist
@@ -15,6 +15,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PasswordResetTool/browser.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PasswordResetTool/browser.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PasswordResetTool/configure.zcml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PasswordResetTool/django_random.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PasswordResetTool/django_random.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PasswordResetTool/django_random.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PasswordResetTool/dtml/explainPWResetTool.dtml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PasswordResetTool/interfaces/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PasswordResetTool/interfaces/__init__.pyc
diff --git a/devel/py-Products.PloneLanguageTool/Makefile b/devel/py-Products.PloneLanguageTool/Makefile
index e4861639188a..de501effcd24 100644
--- a/devel/py-Products.PloneLanguageTool/Makefile
+++ b/devel/py-Products.PloneLanguageTool/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Products.PloneLanguageTool
-PORTVERSION=	3.2.5
+PORTVERSION=	3.2.7
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-Products.PloneLanguageTool/distinfo b/devel/py-Products.PloneLanguageTool/distinfo
index 9a72369e5f17..9ee9d9fc8125 100644
--- a/devel/py-Products.PloneLanguageTool/distinfo
+++ b/devel/py-Products.PloneLanguageTool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.PloneLanguageTool-3.2.5.zip) = cfd8d71d289bfe97c4d20e2ba7e1d82cd06203f1076ad518f8ea82b4749d84ac
-SIZE (zope/Products.PloneLanguageTool-3.2.5.zip) = 49038
+SHA256 (zope/Products.PloneLanguageTool-3.2.7.zip) = 1edac530c324cfe818ef47b88ac5f9acef7c636ace7aeb582d79204899dad042
+SIZE (zope/Products.PloneLanguageTool-3.2.7.zip) = 50158
diff --git a/devel/py-Products.PortalTransforms/Makefile b/devel/py-Products.PortalTransforms/Makefile
index b535482ed161..8bc721d8a537 100644
--- a/devel/py-Products.PortalTransforms/Makefile
+++ b/devel/py-Products.PortalTransforms/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	py-Products.PortalTransforms
-# Date created:				02 January 2012
-# Whom:					Ruslan Mahmatkhanov <cvs-src@yandex.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	Products.PortalTransforms
-PORTVERSION=	2.0.7
+PORTVERSION=	2.1.2
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-Products.PortalTransforms/distinfo b/devel/py-Products.PortalTransforms/distinfo
index 46e99cce6bfe..0dd0bee5d171 100644
--- a/devel/py-Products.PortalTransforms/distinfo
+++ b/devel/py-Products.PortalTransforms/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.PortalTransforms-2.0.7.zip) = c9de2609dfcb846de8ef81bf195f2be5362b07a17599087d13054bc153d9f6c2
-SIZE (zope/Products.PortalTransforms-2.0.7.zip) = 243524
+SHA256 (zope/Products.PortalTransforms-2.1.2.zip) = d8f6f81c647dba43ae8c45cfc1a66552c55221092475b176c35d7135e8212930
+SIZE (zope/Products.PortalTransforms-2.1.2.zip) = 266301
diff --git a/devel/py-Products.PortalTransforms/pkg-descr b/devel/py-Products.PortalTransforms/pkg-descr
index 6095cec85749..314f162c2c16 100644
--- a/devel/py-Products.PortalTransforms/pkg-descr
+++ b/devel/py-Products.PortalTransforms/pkg-descr
@@ -1,3 +1,3 @@
 MIME based content transformations.
 
-WWW:	http://pypi.python.org/pypi/Products.PortalTransforms
+WWW: http://pypi.python.org/pypi/Products.PortalTransforms
diff --git a/devel/py-Products.PortalTransforms/pkg-plist b/devel/py-Products.PortalTransforms/pkg-plist
index 5e64e24eb7d5..30443155ae43 100644
--- a/devel/py-Products.PortalTransforms/pkg-plist
+++ b/devel/py-Products.PortalTransforms/pkg-plist
@@ -72,6 +72,10 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/input/rest3.rst
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/input/rss2html.xslt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/input/test.doc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/input/test_invalid_tags.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/input/test_js.doc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/input/test_js_on.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/input/test_js_uri.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/input/test_lynx.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/input/test_python.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/input/test_python.pyc
@@ -111,6 +115,7 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/test_intelligenttext.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/test_intelligenttext.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/test_intelligenttext.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/test_js_uri.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/test_transforms.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/test_transforms.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PortalTransforms/tests/test_transforms.pyo
diff --git a/devel/py-Products.ResourceRegistries/Makefile b/devel/py-Products.ResourceRegistries/Makefile
index 348084e9f71b..3fc06c51976b 100644
--- a/devel/py-Products.ResourceRegistries/Makefile
+++ b/devel/py-Products.ResourceRegistries/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Products.ResourceRegistries
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.7
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-Products.ResourceRegistries/distinfo b/devel/py-Products.ResourceRegistries/distinfo
index 00d6a0be61df..05897998d740 100644
--- a/devel/py-Products.ResourceRegistries/distinfo
+++ b/devel/py-Products.ResourceRegistries/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.ResourceRegistries-2.2.1.zip) = acd2a0afe55388c514be4679f12a0b2752536eb7c979839aefd84c5126465a74
-SIZE (zope/Products.ResourceRegistries-2.2.1.zip) = 133003
+SHA256 (zope/Products.ResourceRegistries-2.2.7.zip) = cb66e2f232042cee3468edf97b13aa8efa40fa477bac7a3b0a16352a71d0e88d
+SIZE (zope/Products.ResourceRegistries-2.2.7.zip) = 134220
diff --git a/devel/py-Products.ZCTextIndex/Makefile b/devel/py-Products.ZCTextIndex/Makefile
index a171f4528324..5d035a4aba2c 100644
--- a/devel/py-Products.ZCTextIndex/Makefile
+++ b/devel/py-Products.ZCTextIndex/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	py-Products.ZCTextIndex
-# Date created:				Nov 14, 2011
-# Whom:					Ruslan Mahmatkhanov <cvs-src@yandex.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	Products.ZCTextIndex
-PORTVERSION=	2.13.3
+PORTVERSION=	2.13.4
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-Products.ZCTextIndex/distinfo b/devel/py-Products.ZCTextIndex/distinfo
index 722e48f7bca4..33e2c328a055 100644
--- a/devel/py-Products.ZCTextIndex/distinfo
+++ b/devel/py-Products.ZCTextIndex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.ZCTextIndex-2.13.3.zip) = 1b0518793cd11af5e42f7bee02ed09291a8418aae3c106e551473396b7ea859f
-SIZE (zope/Products.ZCTextIndex-2.13.3.zip) = 100347
+SHA256 (zope/Products.ZCTextIndex-2.13.4.zip) = 48d10140c189a8957165991e57642fb19386c21c28e6e0a94c83d97f5f976097
+SIZE (zope/Products.ZCTextIndex-2.13.4.zip) = 101044
diff --git a/devel/py-Products.contentmigration/Makefile b/devel/py-Products.contentmigration/Makefile
index f17808624560..417c233fdabc 100644
--- a/devel/py-Products.contentmigration/Makefile
+++ b/devel/py-Products.contentmigration/Makefile
@@ -1,24 +1,19 @@
-# New ports collection makefile for:	py-Products.contentmigration
-# Date created:				20 December 2011
-# Whom:					Ruslan Mahmatkhanov <cvs-src@yandex.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	Products.contentmigration
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.3
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	zope@FreeBSD.org
-COMMENT=	A generic content migration framework for Plone
+COMMENT=	Generic content migration framework for Plone
 
 LICENSE=	LGPL20
 
 DIST_SUBDIR=	zope
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYTHON=	-2.7
+USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.contentmigration/distinfo b/devel/py-Products.contentmigration/distinfo
index da1398ece4e8..41c0a7e52f4d 100644
--- a/devel/py-Products.contentmigration/distinfo
+++ b/devel/py-Products.contentmigration/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Products.contentmigration-2.1.1.zip) = 9f97af58d3eda18c73ffe237d434237dfc8c1785fb1326fe2bbd4e67c5a2f24b
-SIZE (zope/Products.contentmigration-2.1.1.zip) = 56136
+SHA256 (zope/Products.contentmigration-2.1.3.zip) = 838dde3f22e1d34184f30993d7987d0c269c0723196120c1204c21cce2db6f19
+SIZE (zope/Products.contentmigration-2.1.3.zip) = 57104
diff --git a/devel/py-Products.contentmigration/pkg-descr b/devel/py-Products.contentmigration/pkg-descr
index 4502c4f465b6..4ee1ca1e664b 100644
--- a/devel/py-Products.contentmigration/pkg-descr
+++ b/devel/py-Products.contentmigration/pkg-descr
@@ -1,3 +1,3 @@
 A generic content migration framework for Plone.
 
-WWW:	http://pypi.python.org/pypi/Products.contentmigration
+WWW: http://pypi.python.org/pypi/Products.contentmigration
diff --git a/devel/py-archetypes.querywidget/Makefile b/devel/py-archetypes.querywidget/Makefile
index ea1d5d4f5637..35d738fe7fba 100644
--- a/devel/py-archetypes.querywidget/Makefile
+++ b/devel/py-archetypes.querywidget/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	archetypes.querywidget
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.8
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-archetypes.querywidget/distinfo b/devel/py-archetypes.querywidget/distinfo
index 286cb6a41152..1bddb37ba31c 100644
--- a/devel/py-archetypes.querywidget/distinfo
+++ b/devel/py-archetypes.querywidget/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/archetypes.querywidget-1.0.4.zip) = fd9ecd99e34deae8edbcc28c8d669d10d0a755582c79622825aaf3fac0e9a5b0
-SIZE (zope/archetypes.querywidget-1.0.4.zip) = 69208
+SHA256 (zope/archetypes.querywidget-1.0.8.zip) = 12febb8ca0bc15e6e737bfc1862583eb1daec7d679296521a10084bc33c7e98c
+SIZE (zope/archetypes.querywidget-1.0.8.zip) = 75068
diff --git a/devel/py-archetypes.querywidget/pkg-plist b/devel/py-archetypes.querywidget/pkg-plist
index 22aaa13bfa88..003e5a86ea74 100644
--- a/devel/py-archetypes.querywidget/pkg-plist
+++ b/devel/py-archetypes.querywidget/pkg-plist
@@ -23,6 +23,8 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/profiles/default/jsregistry.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/profiles/default/metadata.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/profiles/default/skins.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/profiles/test_fixture/metadata.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/profiles/test_fixture/registry.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/querywidget.css
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/querywidget.js
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/skins/querywidget/querywidget.pt
@@ -41,7 +43,7 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/tests/base.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/tests/base.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/tests/base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/tests/integration.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/tests/integration.rst
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/tests/javascripts/README.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/tests/javascripts/jquery.js
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/tests/javascripts/querywidget.js
@@ -51,6 +53,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/tests/test_integration_doctest.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/tests/test_integration_doctest.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/tests/test_integration_doctest.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/tests/test_multi_select_widget.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/tests/test_multi_select_widget.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/tests/test_multi_select_widget.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/views.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/views.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/views.pyo
@@ -63,6 +68,7 @@
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/templates
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/skins/querywidget
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/skins
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/profiles/test_fixture
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/profiles/default
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget/profiles
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/querywidget
diff --git a/devel/py-archetypes.referencebrowserwidget/Makefile b/devel/py-archetypes.referencebrowserwidget/Makefile
index 27e65090175a..f06c77ccdc66 100644
--- a/devel/py-archetypes.referencebrowserwidget/Makefile
+++ b/devel/py-archetypes.referencebrowserwidget/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	archetypes.referencebrowserwidget
-PORTVERSION=	2.4.12
+PORTVERSION=	2.4.17
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	zope@FreeBSD.org
-COMMENT=	A referencebrowser implementation for Archetypes
+COMMENT=	Implementation of referencebrowser widget for Archetypes
 
 LICENSE=	ZPL21
 
diff --git a/devel/py-archetypes.referencebrowserwidget/distinfo b/devel/py-archetypes.referencebrowserwidget/distinfo
index 2e7d4ed2869f..08b5f0cfdb6f 100644
--- a/devel/py-archetypes.referencebrowserwidget/distinfo
+++ b/devel/py-archetypes.referencebrowserwidget/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/archetypes.referencebrowserwidget-2.4.12.zip) = 4e0eff019e6b8a55bf0aafc4eb341e4a8e45ed842c08e538642be947001a194d
-SIZE (zope/archetypes.referencebrowserwidget-2.4.12.zip) = 62127
+SHA256 (zope/archetypes.referencebrowserwidget-2.4.17.zip) = f691cc483ed942aaecf8d7e547b46097c815a460e16699045499573cb71d39b9
+SIZE (zope/archetypes.referencebrowserwidget-2.4.17.zip) = 66299
diff --git a/devel/py-archetypes.referencebrowserwidget/pkg-plist b/devel/py-archetypes.referencebrowserwidget/pkg-plist
index a38117279b16..779244f5a2dc 100644
--- a/devel/py-archetypes.referencebrowserwidget/pkg-plist
+++ b/devel/py-archetypes.referencebrowserwidget/pkg-plist
@@ -49,6 +49,7 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/referencebrowserwidget/tests/base.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/referencebrowserwidget/tests/base.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/referencebrowserwidget/tests/reference_access.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/referencebrowserwidget/tests/reference_order.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/referencebrowserwidget/tests/sample.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/referencebrowserwidget/tests/test_browser.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/archetypes/referencebrowserwidget/tests/test_browser.pyc
diff --git a/devel/py-archetypes.schemaextender/Makefile b/devel/py-archetypes.schemaextender/Makefile
index cc01e558d15c..7283f3656df0 100644
--- a/devel/py-archetypes.schemaextender/Makefile
+++ b/devel/py-archetypes.schemaextender/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	py-archetypes.schemaextender
-# Date created:				02 January 2012
-# Whom:					Ruslan Mahmatkhanov <cvs-src@yandex.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	archetypes.schemaextender
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-archetypes.schemaextender/distinfo b/devel/py-archetypes.schemaextender/distinfo
index 4f1044a21ff7..02fdeb8c0008 100644
--- a/devel/py-archetypes.schemaextender/distinfo
+++ b/devel/py-archetypes.schemaextender/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/archetypes.schemaextender-2.1.1.zip) = 7ba5cefafbe7e97a9c33172ba16852138d33b05addf6b5f61ddb6b82f2154449
-SIZE (zope/archetypes.schemaextender-2.1.1.zip) = 41025
+SHA256 (zope/archetypes.schemaextender-2.1.2.zip) = d151e3298c4ec19d9b6c2eb5fff807dd24ff051cc4170d099d41d4b7998c4715
+SIZE (zope/archetypes.schemaextender-2.1.2.zip) = 41833
diff --git a/devel/py-archetypes.schemaextender/pkg-descr b/devel/py-archetypes.schemaextender/pkg-descr
index b3913b642703..64e92b6b140a 100644
--- a/devel/py-archetypes.schemaextender/pkg-descr
+++ b/devel/py-archetypes.schemaextender/pkg-descr
@@ -1,3 +1,3 @@
 Dynamically extend Archetypes schemas with named adapters.
 
-WWW:	http://pypi.python.org/pypi/archetypes.schemaextender
+WWW: http://pypi.python.org/pypi/archetypes.schemaextender
diff --git a/devel/py-collective.z3cform.datetimewidget/Makefile b/devel/py-collective.z3cform.datetimewidget/Makefile
index fdb6886474a3..16cff793e0f1 100644
--- a/devel/py-collective.z3cform.datetimewidget/Makefile
+++ b/devel/py-collective.z3cform.datetimewidget/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	collective.z3cform.datetimewidget
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.3
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-collective.z3cform.datetimewidget/distinfo b/devel/py-collective.z3cform.datetimewidget/distinfo
index b9687b2e6179..9585150752ff 100644
--- a/devel/py-collective.z3cform.datetimewidget/distinfo
+++ b/devel/py-collective.z3cform.datetimewidget/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/collective.z3cform.datetimewidget-1.2.0.zip) = cd5495fe9e83f4463bbec963b793b2f404848d76b4c68a8831ccdb09ad04ca0c
-SIZE (zope/collective.z3cform.datetimewidget-1.2.0.zip) = 61958
+SHA256 (zope/collective.z3cform.datetimewidget-1.2.3.zip) = c421958a745cd45d6fe504356bdaf114b63ba77f4209a8cab2a44cead1103d7a
+SIZE (zope/collective.z3cform.datetimewidget-1.2.3.zip) = 62958
diff --git a/devel/py-diazo/Makefile b/devel/py-diazo/Makefile
index 4dcaacfc436a..fc26f676d522 100644
--- a/devel/py-diazo/Makefile
+++ b/devel/py-diazo/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	diazo
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.3
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-diazo/distinfo b/devel/py-diazo/distinfo
index b94999a8fb3b..0d95013745fe 100644
--- a/devel/py-diazo/distinfo
+++ b/devel/py-diazo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (diazo-1.0.1.zip) = baa49d7d46f0f937614799c1b6eef6bad5e69d238d5006ba6d4509a06cf13756
-SIZE (diazo-1.0.1.zip) = 548300
+SHA256 (diazo-1.0.3.zip) = 6c3ad148a90034cd22813ace0a17b047501a0fec9f1feed682376533bfc93710
+SIZE (diazo-1.0.3.zip) = 539816
diff --git a/devel/py-diazo/pkg-plist b/devel/py-diazo/pkg-plist
index 460107bc7199..e4c2d2a8c718 100644
--- a/devel/py-diazo/pkg-plist
+++ b/devel/py-diazo/pkg-plist
@@ -21,7 +21,10 @@ bin/diazorun
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/cssrules.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/cssrules.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/cssrules.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/debug_resources/diazo-debug.css
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/debug_resources/diazo-iframe.js
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/defaults.xsl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/diazo-debug.zcml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/dummy.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/emit-stylesheet.xsl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/filter.xsl
@@ -40,6 +43,7 @@ bin/diazorun
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/runtrace.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/runtrace.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/runtrace.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/runtrace_to_html.xsl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/__init__.pyo
@@ -575,6 +579,14 @@ bin/diazorun
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-if/output.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-if/rules.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-if/theme.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge-multiple-if-true/content.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge-multiple-if-true/output.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge-multiple-if-true/rules.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge-multiple-if-true/theme.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge-multiple/content.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge-multiple/output.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge-multiple/rules.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge-multiple/theme.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge-separator/content.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge-separator/output.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge-separator/rules.xml
@@ -704,6 +716,8 @@ bin/diazorun
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-notheme-if-content
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-notheme-if
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge-separator
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge-multiple-if-true
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge-multiple
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-merge
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-if-path
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/v1-if-not-path
@@ -823,6 +837,7 @@ bin/diazorun
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/absolute-prefix-disabled
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests/absolute-prefix
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo/debug_resources
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/diazo
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/devel/py-kss-core/Makefile b/devel/py-kss-core/Makefile
index 3d693792bee8..e0abe3e7b422 100644
--- a/devel/py-kss-core/Makefile
+++ b/devel/py-kss-core/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kss-core
-PORTVERSION=	1.6.4
+PORTVERSION=	1.6.5
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-kss-core/distinfo b/devel/py-kss-core/distinfo
index 8f9772bd81d2..e1e1997108b0 100644
--- a/devel/py-kss-core/distinfo
+++ b/devel/py-kss-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/kss.core-1.6.4.zip) = 6704382a507465e51925fda4abb3d12b5b998381047ac8a3bc10e839faca157d
-SIZE (zope/kss.core-1.6.4.zip) = 554627
+SHA256 (zope/kss.core-1.6.5.zip) = ededaa654e826072e76be28068d805aeb5a9a3b6010f4076e3a3b0fefcc57905
+SIZE (zope/kss.core-1.6.5.zip) = 554950
diff --git a/devel/py-z3c.formwidget.query/Makefile b/devel/py-z3c.formwidget.query/Makefile
index ab89c449be15..55f3300bf563 100644
--- a/devel/py-z3c.formwidget.query/Makefile
+++ b/devel/py-z3c.formwidget.query/Makefile
@@ -1,18 +1,17 @@
 # $FreeBSD$
 
 PORTNAME=	z3c.formwidget.query
-PORTVERSION=	0.8
+PORTVERSION=	0.9
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	zope@FreeBSD.org
-COMMENT=	A source query widget for z3c.form
+COMMENT=	Source query widget for z3c.form
 
 LICENSE=	ZPL21
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}z3c.form>=0:${PORTSDIR}/devel/py-z3c.form \
-		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:${PORTSDIR}/devel/py-zope.app.form \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
 		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
 		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
diff --git a/devel/py-z3c.formwidget.query/distinfo b/devel/py-z3c.formwidget.query/distinfo
index 6cd756afbbce..8c50cf6dce78 100644
--- a/devel/py-z3c.formwidget.query/distinfo
+++ b/devel/py-z3c.formwidget.query/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/z3c.formwidget.query-0.8.zip) = b397f90013ebab7e5c2b5e6edbb9b984dbc14e235ba1f4dc0784f97571a0a595
-SIZE (zope/z3c.formwidget.query-0.8.zip) = 15864
+SHA256 (zope/z3c.formwidget.query-0.9.zip) = 575d1d5158f68ef35f41d51dd66bdaeacf7f59521cce62315e5d0730e420ad01
+SIZE (zope/z3c.formwidget.query-0.9.zip) = 16298
diff --git a/devel/py-zope.schema/Makefile b/devel/py-zope.schema/Makefile
index fd20439a8678..dd63d3f43b9c 100644
--- a/devel/py-zope.schema/Makefile
+++ b/devel/py-zope.schema/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	zope.schema
-PORTVERSION=	4.2.0
+PORTVERSION=	4.2.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,8 +15,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:${PORTSDIR}/devel/py-z
 		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event
 
 DIST_SUBDIR=	zope
-# Python3 ready
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=easy_install
+USE_ZIP=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zope.schema/distinfo b/devel/py-zope.schema/distinfo
index 2fbc01e02f03..4ceae571fb1d 100644
--- a/devel/py-zope.schema/distinfo
+++ b/devel/py-zope.schema/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/zope.schema-4.2.0.tar.gz) = b4b5c1492c7accfeabe677f5f4435285e9d5d9a10fab33cd24648180b5b70837
-SIZE (zope/zope.schema-4.2.0.tar.gz) = 66932
+SHA256 (zope/zope.schema-4.2.1.zip) = e48f9a333287a6c2e8d35d11ca59dfb1931f65db1ab0da7ff30e22ad3fe86d4d
+SIZE (zope/zope.schema-4.2.1.zip) = 93704