3 files changed, 20 insertions, 16 deletions

diff --git a/www/plone3/Makefile b/www/plone3/Makefile
index c548126bfd79..7eba0898bf2b 100644
--- a/www/plone3/Makefile
+++ b/www/plone3/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	plone3
-PORTVERSION=	3.1.4
+PORTVERSION=	3.1.5.1
 CATEGORIES=	www zope
-MASTER_SITES=	https://launchpad.net/plone/${PORTVERSION:R}/${PORTVERSION}/+download/
+MASTER_SITES=	https://launchpad.net/plone/3.1/${PORTVERSION}/+download/
 DISTNAME=	Plone-${PORTVERSION}
 DIST_SUBDIR=	zope
 
diff --git a/www/plone3/distinfo b/www/plone3/distinfo
index 3e1cd127099c..4be6dc246d11 100644
--- a/www/plone3/distinfo
+++ b/www/plone3/distinfo
@@ -1,3 +1,3 @@
-MD5 (zope/Plone-3.1.4.tar.gz) = 1bdd7db2676ec829396a02e4c4c3e123
-SHA256 (zope/Plone-3.1.4.tar.gz) = 351b3bdc0348ecef0ee9932ee994a1b8286c9216d7c3ed5b11c3501796d17d08
-SIZE (zope/Plone-3.1.4.tar.gz) = 12731933
+MD5 (zope/Plone-3.1.5.1.tar.gz) = fd1438613d402630b44a76c6271744a0
+SHA256 (zope/Plone-3.1.5.1.tar.gz) = 565baee275a7463022df05d05a310e14de8f70d5cb93474e4eeac96e6b37d87f
+SIZE (zope/Plone-3.1.5.1.tar.gz) = 12742358
diff --git a/www/plone3/pkg-plist b/www/plone3/pkg-plist
index f80a1970f5ec..edbfb5f50bec 100644
--- a/www/plone3/pkg-plist
+++ b/www/plone3/pkg-plist
@@ -2727,6 +2727,7 @@
 %%ZOPEPRODUCTDIR%%/CMFPlone/migrations/v3_1/profiles/three0_beta1/metadata.xml
 %%ZOPEPRODUCTDIR%%/CMFPlone/migrations/v3_1/profiles/three0_beta1/portlets.xml
 %%ZOPEPRODUCTDIR%%/CMFPlone/migrations/v3_1/profiles/three11_three12/jsregistry.xml
+%%ZOPEPRODUCTDIR%%/CMFPlone/migrations/v3_1/profiles/three13_three14/propertiestool.xml
 %%ZOPEPRODUCTDIR%%/CMFPlone/overrides.zcml
 %%ZOPEPRODUCTDIR%%/CMFPlone/patches/__init__.py
 %%ZOPEPRODUCTDIR%%/CMFPlone/patches/__init__.pyc
@@ -3829,8 +3830,6 @@
 %%ZOPEPRODUCTDIR%%/CMFPlone/tests/testTranslationServiceTool.pyc
 %%ZOPEPRODUCTDIR%%/CMFPlone/tests/testURLTool.py
 %%ZOPEPRODUCTDIR%%/CMFPlone/tests/testURLTool.pyc
-%%ZOPEPRODUCTDIR%%/CMFPlone/tests/testUnicodeNormalizer.py
-%%ZOPEPRODUCTDIR%%/CMFPlone/tests/testUnicodeNormalizer.pyc
 %%ZOPEPRODUCTDIR%%/CMFPlone/tests/testUnicodeSplitter.py
 %%ZOPEPRODUCTDIR%%/CMFPlone/tests/testUnicodeSplitter.pyc
 %%ZOPEPRODUCTDIR%%/CMFPlone/tests/testUserFolderBasics.py
@@ -6262,6 +6261,8 @@
 %%ZOPEPRODUCTDIR%%/PloneTranslations/locales/pt/LC_MESSAGES/plonefrontpage.po
 %%ZOPEPRODUCTDIR%%/PloneTranslations/locales/pt/LC_MESSAGES/plonelocales.mo
 %%ZOPEPRODUCTDIR%%/PloneTranslations/locales/pt/LC_MESSAGES/plonelocales.po
+%%ZOPEPRODUCTDIR%%/PloneTranslations/locales/pt_BR/LC_MESSAGES/plonefrontpage.mo
+%%ZOPEPRODUCTDIR%%/PloneTranslations/locales/pt_BR/LC_MESSAGES/plonefrontpage.po
 %%ZOPEPRODUCTDIR%%/PloneTranslations/locales/pt_BR/LC_MESSAGES/plonelocales.mo
 %%ZOPEPRODUCTDIR%%/PloneTranslations/locales/pt_BR/LC_MESSAGES/plonelocales.po
 %%ZOPEPRODUCTDIR%%/PloneTranslations/locales/rm/LC_MESSAGES/plonelocales.mo
@@ -6310,15 +6311,8 @@
 %%ZOPEPRODUCTDIR%%/PloneTranslations/locales/zh_HK/LC_MESSAGES/plonelocales.po
 %%ZOPEPRODUCTDIR%%/PloneTranslations/locales/zh_TW/LC_MESSAGES/plonelocales.mo
 %%ZOPEPRODUCTDIR%%/PloneTranslations/locales/zh_TW/LC_MESSAGES/plonelocales.po
-%%ZOPEPRODUCTDIR%%/PloneTranslations/tests/README.txt
 %%ZOPEPRODUCTDIR%%/PloneTranslations/tests/__init__.py
 %%ZOPEPRODUCTDIR%%/PloneTranslations/tests/__init__.pyc
-%%ZOPEPRODUCTDIR%%/PloneTranslations/tests/framework.py
-%%ZOPEPRODUCTDIR%%/PloneTranslations/tests/framework.pyc
-%%ZOPEPRODUCTDIR%%/PloneTranslations/tests/i18ngenerator.py
-%%ZOPEPRODUCTDIR%%/PloneTranslations/tests/i18ngenerator.pyc
-%%ZOPEPRODUCTDIR%%/PloneTranslations/tests/runalltests.py
-%%ZOPEPRODUCTDIR%%/PloneTranslations/tests/runalltests.pyc
 %%ZOPEPRODUCTDIR%%/PloneTranslations/tests/test_i18n.py
 %%ZOPEPRODUCTDIR%%/PloneTranslations/tests/test_i18n.pyc
 %%ZOPEPRODUCTDIR%%/PloneTranslations/utils/admix.py
@@ -6329,8 +6323,6 @@
 %%ZOPEPRODUCTDIR%%/PloneTranslations/utils/fillmsgstr.pyc
 %%ZOPEPRODUCTDIR%%/PloneTranslations/utils/filter.py
 %%ZOPEPRODUCTDIR%%/PloneTranslations/utils/filter.pyc
-%%ZOPEPRODUCTDIR%%/PloneTranslations/utils/i18ngenerate.py
-%%ZOPEPRODUCTDIR%%/PloneTranslations/utils/i18ngenerate.pyc
 %%ZOPEPRODUCTDIR%%/PloneTranslations/utils/list.py
 %%ZOPEPRODUCTDIR%%/PloneTranslations/utils/list.pyc
 %%ZOPEPRODUCTDIR%%/PloneTranslations/utils/rebuild-pot.py
@@ -7957,6 +7949,7 @@
 %%ZOPELIBPYTHONDIR%%/borg/localrole/default.zcml
 %%ZOPELIBPYTHONDIR%%/borg/localrole/default_adapter.py
 %%ZOPELIBPYTHONDIR%%/borg/localrole/default_adapter.pyc
+%%ZOPELIBPYTHONDIR%%/borg/localrole/exportimport.zcml
 %%ZOPELIBPYTHONDIR%%/borg/localrole/factory_adapter.py
 %%ZOPELIBPYTHONDIR%%/borg/localrole/factory_adapter.pyc
 %%ZOPELIBPYTHONDIR%%/borg/localrole/interfaces.py
@@ -8897,6 +8890,8 @@
 %%ZOPELIBPYTHONDIR%%/plone/app/form/widgets/configure.zcml
 %%ZOPELIBPYTHONDIR%%/plone/app/form/widgets/datecomponents.py
 %%ZOPELIBPYTHONDIR%%/plone/app/form/widgets/datecomponents.pyc
+%%ZOPELIBPYTHONDIR%%/plone/app/form/widgets/multicheckboxwidget.py
+%%ZOPELIBPYTHONDIR%%/plone/app/form/widgets/multicheckboxwidget.pyc
 %%ZOPELIBPYTHONDIR%%/plone/app/form/widgets/interfaces.py
 %%ZOPELIBPYTHONDIR%%/plone/app/form/widgets/interfaces.pyc
 %%ZOPELIBPYTHONDIR%%/plone/app/form/widgets/overrides.zcml
@@ -9366,6 +9361,8 @@
 %%ZOPELIBPYTHONDIR%%/plone/app/openid/setuphandlers.pyc
 %%ZOPELIBPYTHONDIR%%/plone/app/openid/skins/ploneopenid/logged_out.cpt
 %%ZOPELIBPYTHONDIR%%/plone/app/openid/skins/ploneopenid/logged_out.cpt.metadata
+%%ZOPELIBPYTHONDIR%%/plone/app/openid/skins/ploneopenid/login_failed.cpt
+%%ZOPELIBPYTHONDIR%%/plone/app/openid/skins/ploneopenid/login_failed.cpt.metadata
 %%ZOPELIBPYTHONDIR%%/plone/app/openid/skins/ploneopenid/login_form.cpt
 %%ZOPELIBPYTHONDIR%%/plone/app/openid/skins/ploneopenid/login_form.cpt.metadata
 %%ZOPELIBPYTHONDIR%%/plone/app/openid/skins/ploneopenid/openid-icon.gif
@@ -10021,6 +10018,8 @@
 %%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/negotiator.pyc
 %%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/path.py
 %%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/path.pyc
+%%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/subdomain.py
+%%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/subdomain.pyc
 %%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/tests/__init__.py
 %%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/tests/__init__.pyc
 %%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/tests/test_cookie.py
@@ -10029,6 +10028,8 @@
 %%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/tests/test_negotiator.pyc
 %%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/tests/test_path.py
 %%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/tests/test_path.pyc
+%%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/tests/test_subdomain.py
+%%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/tests/test_subdomain.pyc
 %%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/tests/test_tld.py
 %%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/tests/test_tld.pyc
 %%ZOPELIBPYTHONDIR%%/plone/i18n/negotiator/tld.py
@@ -10044,6 +10045,8 @@
 %%ZOPELIBPYTHONDIR%%/plone/i18n/normalizer/de.pyc
 %%ZOPELIBPYTHONDIR%%/plone/i18n/normalizer/el.py
 %%ZOPELIBPYTHONDIR%%/plone/i18n/normalizer/el.pyc
+%%ZOPELIBPYTHONDIR%%/plone/i18n/normalizer/fr.py
+%%ZOPELIBPYTHONDIR%%/plone/i18n/normalizer/fr.pyc
 %%ZOPELIBPYTHONDIR%%/plone/i18n/normalizer/interfaces.py
 %%ZOPELIBPYTHONDIR%%/plone/i18n/normalizer/interfaces.pyc
 %%ZOPELIBPYTHONDIR%%/plone/i18n/normalizer/pl.py
@@ -11095,6 +11098,7 @@
 @dirrm %%ZOPEPRODUCTDIR%%/CMFPlone/profiles/default
 @dirrm %%ZOPEPRODUCTDIR%%/CMFPlone/profiles
 @dirrm %%ZOPEPRODUCTDIR%%/CMFPlone/patches
+@dirrm %%ZOPEPRODUCTDIR%%/CMFPlone/migrations/v3_1/profiles/three13_three14
 @dirrm %%ZOPEPRODUCTDIR%%/CMFPlone/migrations/v3_1/profiles/three11_three12
 @dirrm %%ZOPEPRODUCTDIR%%/CMFPlone/migrations/v3_1/profiles/three0_beta1
 @dirrm %%ZOPEPRODUCTDIR%%/CMFPlone/migrations/v3_1/profiles