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, 5 insertions, 45 deletions

diff --git a/www/py-plone.app.discussion/Makefile b/www/py-plone.app.discussion/Makefile
index af82c362e6c9..435efa3084cc 100644
--- a/www/py-plone.app.discussion/Makefile
+++ b/www/py-plone.app.discussion/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	py-plone.app.discussion
-# Date created:				03 January 2012
-# Whom:					Ruslan Mahmatkhanov <cvs-src@yandex.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	plone.app.discussion
-PORTVERSION=	2.1.5
+PORTVERSION=	2.1.7
 CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -35,9 +30,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}collective.monkeypatcher>=0:${PORTSDIR}/deve
 		${PYTHON_PKGNAMEPREFIX}z3c.form>=2.3.3:${PORTSDIR}/devel/py-z3c.form
 
 DIST_SUBDIR=	zope
-USE_PYTHON=	yes
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-plone.app.discussion/distinfo b/www/py-plone.app.discussion/distinfo
index 6746e05c1593..122de2061f17 100644
--- a/www/py-plone.app.discussion/distinfo
+++ b/www/py-plone.app.discussion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/plone.app.discussion-2.1.5.zip) = fc0ec4648adf51feb85b03070cd71a79a951f014c19cdc05fae08822b3147003
-SIZE (zope/plone.app.discussion-2.1.5.zip) = 395835
+SHA256 (zope/plone.app.discussion-2.1.7.zip) = e4e5fccb438dba371da0439f0b557b0caca857620dacdd83bd8ce605deed28ca
+SIZE (zope/plone.app.discussion-2.1.7.zip) = 308443
diff --git a/www/py-plone.app.discussion/pkg-descr b/www/py-plone.app.discussion/pkg-descr
index 090fb1602c23..fc0ad35458e3 100644
--- a/www/py-plone.app.discussion/pkg-descr
+++ b/www/py-plone.app.discussion/pkg-descr
@@ -1,3 +1,3 @@
 Enhanced discussion support for Plone.
 
-WWW:	http://pypi.python.org/pypi/plone.app.discussion
+WWW: http://pypi.python.org/pypi/plone.app.discussion
diff --git a/www/py-plone.app.discussion/pkg-plist b/www/py-plone.app.discussion/pkg-plist
index f391b1987b2e..2d2d592507e6 100644
--- a/www/py-plone.app.discussion/pkg-plist
+++ b/www/py-plone.app.discussion/pkg-plist
@@ -81,84 +81,50 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/conversation.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/conversation.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/design.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-ca.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-ca.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-cs.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-cs.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-da.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-da.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-de.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-de.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-el.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-el.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-es.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-es.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-eu.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-eu.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-fr.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-fr.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-it.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-it.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-ja.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-ja.po
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-manual.pot
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-nl.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-nl.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-no.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-no.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-pt_BR.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-pt_BR.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-uk.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-uk.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-zh_CN.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-zh_CN.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-zh_TW.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone-zh_TW.po
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/i18n/plone.pot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/interfaces.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/interfaces.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/af/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/af/LC_MESSAGES/plone.app.discussion.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/ca/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/ca/LC_MESSAGES/plone.app.discussion.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/cs/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/cs/LC_MESSAGES/plone.app.discussion.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/da/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/da/LC_MESSAGES/plone.app.discussion.po
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/de/LC_MESSAGES/.gitignore
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/de/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/de/LC_MESSAGES/plone.app.discussion.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/es/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/es/LC_MESSAGES/plone.app.discussion.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/eu/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/eu/LC_MESSAGES/plone.app.discussion.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/fi/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/fi/LC_MESSAGES/plone.app.discussion.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/fr/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/fr/LC_MESSAGES/plone.app.discussion.po
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/it/LC_MESSAGES/.gitignore
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/it/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/it/LC_MESSAGES/plone.app.discussion.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/ja/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/ja/LC_MESSAGES/plone.app.discussion.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/nl/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/nl/LC_MESSAGES/plone.app.discussion.po
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/no/LC_MESSAGES/.gitignore
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/no/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/no/LC_MESSAGES/plone.app.discussion.po
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/plone.app.discussion-manual.pot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/plone.app.discussion.pot
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/pt_BR/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/pt_BR/LC_MESSAGES/plone.app.discussion.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/sv/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/sv/LC_MESSAGES/plone.app.discussion.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/uk/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/uk/LC_MESSAGES/plone.app.discussion.po
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/update.sh
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/zh_CN/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/zh_CN/LC_MESSAGES/plone.app.discussion.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/zh_TW/LC_MESSAGES/plone.app.discussion.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/locales/zh_TW/LC_MESSAGES/plone.app.discussion.po
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/notifications.zcml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/discussion/patches.py