Update Plone to 4.2.1.

This update includes:
 - www/py-plone.outputfilters 1.2 -> 1.6
 - www/py-Products.CMFPlone 4.1.5 -> 4.2.1.1
 - www/py-plone.app.vocabularies 2.1.6 -> 2.1.7
 - www/py-plone.subrequest 1.6.2 -> 1.6.6
 - www/py-plone.app.discussion 2.1.5 -> 2.1.7
 - www/py-plonetheme.classic 1.1.2 -> 1.2.3
 - www/plone 4.1.5 -> 4.2.1
 - www/py-plone.i18n 2.0 -> 2.0.1
 - www/py-plone.fieldsets 2.0.1 -> 2.0.2
 - www/py-plone.app.search 1.0.2 -> 1.0.4
 - www/py-plone.app.content 2.0.9 -> 2.0.11
 - www/py-plone.app.testing 4.0.2 -> 4.2
 - www/py-plone.app.contentrules 2.1.4 -> 2.1.8
 - www/py-plone.uuid 1.0.2 -> 1.0.3
 - www/py-plone.app.upgrade 1.1.6 -> 1.2.1
 - www/py-plone.app.caching 1.0.3 -> 1.1
 - www/py-plone.app.linkintegrity 1.4.5 -> 1.4.6
 - www/py-plone.app.iterate 2.1.5 -> 2.1.7
 - www/py-plone.testing 4.0.3 -> 4.0.4
 - www/py-plone.app.contentmenu 2.0.5 -> 2.0.6
 - www/py-plone.app.controlpanel 2.2.3 -> 2.2.8
 - www/py-plone.portlet.collection 2.0.4 -> 2.1.1
 - www/py-plone.resource 1.0b6 -> 1.0.1
 - www/py-plone.app.registry 1.0.1 -> 1.1
 - www/py-plone.app.workflow 2.0.6 -> 2.0.7
 - www/py-plone.app.portlets 2.2.3 -> 2.2.6
 - www/py-plone.app.blob 1.5.1 -> 1.5.2
 - www/py-Products.TinyMCE 1.2.12 -> 1.2.13
 - www/py-plone.app.locales 4.0.11 -> 4.0.15
 - www/py-plonetheme.sunburst 1.2.4 -> 1.2.7
 - www/py-plone.app.theming 1.0b9 -> 1.0.3
 - www/py-plone.app.collection 1.0.1 -> 1.0.5
 - www/py-plone.folder 1.0.1 -> 1.0.2
 - www/py-plone.app.querystring 1.0.1 -> 1.0.5
 - www/py-plone.app.jquerytools 1.3.1 -> 1.3.2
 - www/py-plone.app.contentlisting 1.0 -> 1.0.1
 - www/py-plone.stringinterp 1.0.5 -> 1.0.7
 - www/py-plone.app.layout 2.2.4 -> 2.2.7
 - www/py-plone.app.z3cform 0.5.7 -> 0.6.0
 - www/py-plone.portlets 2.0.2 -> 2.1
 - www/py-plone.app.kss 1.7.0 -> 1.7.1
 - www/py-plone.app.redirector 1.1.2 -> 1.1.3
 - devel/py-kss-core 1.6.3 -> 1.6.4
 - devel/py-Products.ATContentTypes 2.1.7 -> 2.1.8
 - devel/py-Products.ResourceRegistries 2.0.6 -> 2.2.1
 - devel/py-five.customerize 1.0.2 -> 1.0.3
 - devel/py-diazo 1.0rc4 -> 1.0.1
 - devel/py-Products.CMFEditions 2.2.2 -> 2.2.5
 - devel/py-Products.ExtendedPathIndex 2.9 -> 3.0.1
 - devel/py-z3c.formwidget.query 0.7 -> 0.8
 - devel/py-Products.Archetypes 1.7.13 -> 1.8.3
 - devel/py-Products.CMFPlacefulWorkflow 1.5.6 -> 1.5.7
 - devel/py-archetypes.querywidget 1.0.1 -> 1.0.4
 - devel/py-Products.PloneLanguageTool 3.2.4 -> 3.2.5
 - devel/py-Products.GenericSetup 1.6.6 -> 1.7.2
 - devel/py-Products.CMFTestCase 0.9.11 -> 0.9.12
 - devel/py-Products.PasswordResetTool 2.0.7 -> 2.0.8
 - devel/py-archetypes.kss 1.7.1 -> 1.7.2
 - devel/py-collective.z3cform.datetimewidget 1.1.1 -> 1.2.0
 - devel/py-Products.PloneTestCase 0.9.13 -> 0.9.15
 - devel/py-zope.schema 4.0.1 -> 4.2.0
 - devel/py-archetypes.referencebrowserwidget 2.4.11 -> 2.4.12
 - security/py-Products.PlonePAS 4.0.12 -> 4.0.13
 - security/py-Products.PluggableAuthService 1.7.7 -> 1.8.0

common changes:
 - strip Makefile header
 - choose proper value for USE_PYTHON in a cases when I sure that the port
   is required -2.7 only or may be built/run both 2.x and 3.x
 - comment off USE_ZOPE
 - tab -> space in pkg-descr:WWW

nuances:
 - new port www/py-plone.app.jquery added per this plone update requirements
 - devel/py-zope.schema updated to 4.2.0 because I hadn't got any response from
   maintainer and because this exact version is required for this plone update

feature highlights/release notes:
 - http://plone.org/products/plone/releases/4.2
 - http://plone.org/products/plone/releases/4.2.1

4 files changed, 9 insertions, 18 deletions

diff --git a/www/py-plone.app.collection/Makefile b/www/py-plone.app.collection/Makefile
index 94312e76b35f..a027439396a1 100644
--- a/www/py-plone.app.collection/Makefile
+++ b/www/py-plone.app.collection/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	py-plone.app.collection
-# Date created:				03 January 2012
-# Whom:					Ruslan Mahmatkhanov <cvs-src@yandex.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	plone.app.collection
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.5
 CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,20 +11,18 @@ COMMENT=	Tools for constructing navigation and site sections
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>=0:${PORTSDIR}/devel/py-archetypes.querywidget \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>=1.0.2:${PORTSDIR}/devel/py-archetypes.querywidget \
 		${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:${PORTSDIR}/www/py-plone.app.contentlisting \
 		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:${PORTSDIR}/www/py-plone.app.form \
 		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:${PORTSDIR}/www/py-plone.app.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.app.testing>=0:${PORTSDIR}/www/py-plone.app.testing \
 		${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:${PORTSDIR}/www/py-plone.app.vocabularies \
+		${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>0:${PORTSDIR}/www/py-plone.portlet.collection \
 		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.testing>=0:${PORTSDIR}/www/py-plone.testing \
 		${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:${PORTSDIR}/devel/py-Products.Archetypes \
 		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
 		${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:${PORTSDIR}/devel/py-Products.CMFQuickInstallerTool \
 		${PYTHON_PKGNAMEPREFIX}Products.validation>=0:${PORTSDIR}/devel/py-Products.validation \
 		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}unittest2>=0:${PORTSDIR}/devel/py-unittest2 \
 		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
 		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
 		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib \
@@ -40,6 +33,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>=0:${PORTSDIR}/devel/
 DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
-#USE_ZOPE=	yes
+USE_ZIP=	yes
+USE_ZOPE=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-plone.app.collection/distinfo b/www/py-plone.app.collection/distinfo
index 0d0cbcd681b4..07fc0ad6211b 100644
--- a/www/py-plone.app.collection/distinfo
+++ b/www/py-plone.app.collection/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/plone.app.collection-1.0.1.tar.gz) = 568da629a95066ef889a6be1874a26f16dbef7046363f8faa47777f699e7f232
-SIZE (zope/plone.app.collection-1.0.1.tar.gz) = 20108
+SHA256 (zope/plone.app.collection-1.0.5.zip) = 39a2929c5f99d68e5df29c29674d591875de108c12eb0d8bd37337d868a9d415
+SIZE (zope/plone.app.collection-1.0.5.zip) = 36075
diff --git a/www/py-plone.app.collection/pkg-descr b/www/py-plone.app.collection/pkg-descr
index 915076a47e1c..2ee2e74e1639 100644
--- a/www/py-plone.app.collection/pkg-descr
+++ b/www/py-plone.app.collection/pkg-descr
@@ -1,4 +1,4 @@
 Collections in Plone are the most powerful tool content editors and site
 managers have to construct navigation and site sections.
 
-WWW:	http://pypi.python.org/pypi/plone.app.collection
+WWW: http://pypi.python.org/pypi/plone.app.collection
diff --git a/www/py-plone.app.collection/pkg-plist b/www/py-plone.app.collection/pkg-plist
index 54b8118e0e12..0c6253498153 100644
--- a/www/py-plone.app.collection/pkg-plist
+++ b/www/py-plone.app.collection/pkg-plist
@@ -43,11 +43,8 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/portlets/collectionportlet.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/portlets/collectionportlet.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/portlets/collectionportlet.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/portlets/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/portlets/templates/collectionportlet.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/profiles/default/factorytool.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/profiles/default/metadata.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/profiles/default/portlets.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/profiles/default/rolemap.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/profiles/default/types.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/profiles/default/types/Collection.xml
@@ -57,6 +54,7 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/tests/base.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/tests/base.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/tests/base.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/tests/image.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/tests/test_collection.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/tests/test_collection.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/tests/test_collection.pyo
@@ -67,7 +65,6 @@
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/profiles/default/types
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/profiles/default
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/profiles
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/portlets/templates
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/portlets
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/browser/templates
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/collection/browser