3 files changed, 76 insertions, 72 deletions

diff --git a/www/zope-formulator/Makefile b/www/zope-formulator/Makefile
index f221fbd34142..12d3a6127838 100644
--- a/www/zope-formulator/Makefile
+++ b/www/zope-formulator/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	formulator
-PORTVERSION=	1.8.0
+PORTVERSION=	1.10
 CATEGORIES=	www zope
 MASTER_SITES=	http://www.infrae.com/download/Formulator/${PORTVERSION}/
 PKGNAMEPREFIX=	zope-
diff --git a/www/zope-formulator/distinfo b/www/zope-formulator/distinfo
index ecf2b85bdac4..8908d370305d 100644
--- a/www/zope-formulator/distinfo
+++ b/www/zope-formulator/distinfo
@@ -1,2 +1,2 @@
-MD5 (zope/Formulator-1.8.0.tgz) = 824daf4d119be572276a7e157f72d311
-SIZE (zope/Formulator-1.8.0.tgz) = 84935
+MD5 (zope/Formulator-1.10.tgz) = 58507bc294dc7329016eaabb650869aa
+SIZE (zope/Formulator-1.10.tgz) = 88759
diff --git a/www/zope-formulator/pkg-plist b/www/zope-formulator/pkg-plist
index e938d4f24dc8..73305c8e17b2 100644
--- a/www/zope-formulator/pkg-plist
+++ b/www/zope-formulator/pkg-plist
@@ -1,3 +1,51 @@
+%%ZOPEPRODUCTDIR%%/Formulator/CREDITS.txt
+%%ZOPEPRODUCTDIR%%/Formulator/DummyField.py
+%%ZOPEPRODUCTDIR%%/Formulator/DummyField.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/Errors.py
+%%ZOPEPRODUCTDIR%%/Formulator/Errors.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/FSForm.py
+%%ZOPEPRODUCTDIR%%/Formulator/FSForm.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/Field.py
+%%ZOPEPRODUCTDIR%%/Formulator/Field.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/FieldHelpTopic.py
+%%ZOPEPRODUCTDIR%%/Formulator/FieldHelpTopic.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/FieldRegistry.py
+%%ZOPEPRODUCTDIR%%/Formulator/FieldRegistry.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/Form.py
+%%ZOPEPRODUCTDIR%%/Formulator/Form.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/FormToXML.py
+%%ZOPEPRODUCTDIR%%/Formulator/FormToXML.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/FormulatorFormFile.py
+%%ZOPEPRODUCTDIR%%/Formulator/FormulatorFormFile.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/HISTORY.txt
+%%ZOPEPRODUCTDIR%%/Formulator/HelperFields.py
+%%ZOPEPRODUCTDIR%%/Formulator/HelperFields.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/INSTALL.txt
+%%ZOPEPRODUCTDIR%%/Formulator/LICENSE.txt
+%%ZOPEPRODUCTDIR%%/Formulator/ListTextAreaField.py
+%%ZOPEPRODUCTDIR%%/Formulator/ListTextAreaField.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/MethodField.py
+%%ZOPEPRODUCTDIR%%/Formulator/MethodField.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/PatternChecker.py
+%%ZOPEPRODUCTDIR%%/Formulator/PatternChecker.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/ProductForm.py
+%%ZOPEPRODUCTDIR%%/Formulator/ProductForm.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/README.txt
+%%ZOPEPRODUCTDIR%%/Formulator/StandardFields.py
+%%ZOPEPRODUCTDIR%%/Formulator/StandardFields.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/TALESField.py
+%%ZOPEPRODUCTDIR%%/Formulator/TALESField.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/TODO.txt
+%%ZOPEPRODUCTDIR%%/Formulator/Validator.py
+%%ZOPEPRODUCTDIR%%/Formulator/Validator.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/Widget.py
+%%ZOPEPRODUCTDIR%%/Formulator/Widget.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/XMLObjects.py
+%%ZOPEPRODUCTDIR%%/Formulator/XMLObjects.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/XMLToForm.py
+%%ZOPEPRODUCTDIR%%/Formulator/XMLToForm.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/__init__.py
+%%ZOPEPRODUCTDIR%%/Formulator/__init__.pyc
 %%ZOPEPRODUCTDIR%%/Formulator/dtml/FieldHelpTopic.dtml
 %%ZOPEPRODUCTDIR%%/Formulator/dtml/fieldAdd.dtml
 %%ZOPEPRODUCTDIR%%/Formulator/dtml/fieldEdit.dtml
@@ -12,9 +60,13 @@
 %%ZOPEPRODUCTDIR%%/Formulator/dtml/formTest.dtml
 %%ZOPEPRODUCTDIR%%/Formulator/dtml/formXML.dtml
 %%ZOPEPRODUCTDIR%%/Formulator/help/BasicForm.py
+%%ZOPEPRODUCTDIR%%/Formulator/help/BasicForm.pyc
 %%ZOPEPRODUCTDIR%%/Formulator/help/Field.py
+%%ZOPEPRODUCTDIR%%/Formulator/help/Field.pyc
 %%ZOPEPRODUCTDIR%%/Formulator/help/Form.py
+%%ZOPEPRODUCTDIR%%/Formulator/help/Form.pyc
 %%ZOPEPRODUCTDIR%%/Formulator/help/ZMIForm.py
+%%ZOPEPRODUCTDIR%%/Formulator/help/ZMIForm.pyc
 %%ZOPEPRODUCTDIR%%/Formulator/help/dogfood.txt
 %%ZOPEPRODUCTDIR%%/Formulator/help/fieldEdit.txt
 %%ZOPEPRODUCTDIR%%/Formulator/help/fieldMessages.txt
@@ -28,53 +80,35 @@
 %%ZOPEPRODUCTDIR%%/Formulator/help/formXML.txt
 %%ZOPEPRODUCTDIR%%/Formulator/help/formulator_howto.txt
 %%ZOPEPRODUCTDIR%%/Formulator/help/formulator_motto.txt
-%%ZOPEPRODUCTDIR%%/Formulator/help/BasicForm.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/help/Field.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/help/Form.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/help/ZMIForm.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/CREDITS.txt
-%%ZOPEPRODUCTDIR%%/Formulator/DummyField.py
-%%ZOPEPRODUCTDIR%%/Formulator/Errors.py
-%%ZOPEPRODUCTDIR%%/Formulator/FSForm.py
-%%ZOPEPRODUCTDIR%%/Formulator/Field.py
-%%ZOPEPRODUCTDIR%%/Formulator/FieldHelpTopic.py
-%%ZOPEPRODUCTDIR%%/Formulator/FieldRegistry.py
-%%ZOPEPRODUCTDIR%%/Formulator/Form.py
-%%ZOPEPRODUCTDIR%%/Formulator/FormToXML.py
-%%ZOPEPRODUCTDIR%%/Formulator/FormulatorFormFile.py
-%%ZOPEPRODUCTDIR%%/Formulator/HISTORY.txt
-%%ZOPEPRODUCTDIR%%/Formulator/HelperFields.py
-%%ZOPEPRODUCTDIR%%/Formulator/INSTALL.txt
-%%ZOPEPRODUCTDIR%%/Formulator/LICENSE.txt
-%%ZOPEPRODUCTDIR%%/Formulator/ListTextAreaField.py
-%%ZOPEPRODUCTDIR%%/Formulator/MethodField.py
-%%ZOPEPRODUCTDIR%%/Formulator/PatternChecker.py
-%%ZOPEPRODUCTDIR%%/Formulator/ProductForm.py
-%%ZOPEPRODUCTDIR%%/Formulator/README.txt
-%%ZOPEPRODUCTDIR%%/Formulator/StandardFields.py
+%%ZOPEPRODUCTDIR%%/Formulator/helpers.py
+%%ZOPEPRODUCTDIR%%/Formulator/helpers.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/homepage.html
+%%ZOPEPRODUCTDIR%%/Formulator/i18n/__init__.py
+%%ZOPEPRODUCTDIR%%/Formulator/i18n/__init__.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/i18n/dummymessageid.py
+%%ZOPEPRODUCTDIR%%/Formulator/i18n/dummymessageid.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/i18n/formulator-de.po
+%%ZOPEPRODUCTDIR%%/Formulator/i18n/formulator-fr.po
+%%ZOPEPRODUCTDIR%%/Formulator/i18n/formulator-nl.po
+%%ZOPEPRODUCTDIR%%/Formulator/i18n/formulator.pot
+%%ZOPEPRODUCTDIR%%/Formulator/i18n/formulatormessageid.py
+%%ZOPEPRODUCTDIR%%/Formulator/i18n/formulatormessageid.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/refresh.txt
 %%ZOPEPRODUCTDIR%%/Formulator/tests/README.txt
 %%ZOPEPRODUCTDIR%%/Formulator/tests/__init__.py
-%%ZOPEPRODUCTDIR%%/Formulator/tests/framework.py
-%%ZOPEPRODUCTDIR%%/Formulator/tests/runalltests.py
-%%ZOPEPRODUCTDIR%%/Formulator/tests/test_Form.py
-%%ZOPEPRODUCTDIR%%/Formulator/tests/test_serialize.py
-%%ZOPEPRODUCTDIR%%/Formulator/tests/test_validators.py
 %%ZOPEPRODUCTDIR%%/Formulator/tests/__init__.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/tests/framework.py
 %%ZOPEPRODUCTDIR%%/Formulator/tests/framework.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/tests/runalltests.py
 %%ZOPEPRODUCTDIR%%/Formulator/tests/runalltests.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/tests/test_Form.py
 %%ZOPEPRODUCTDIR%%/Formulator/tests/test_Form.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/tests/test_patternchecker.py
+%%ZOPEPRODUCTDIR%%/Formulator/tests/test_patternchecker.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/tests/test_serialize.py
 %%ZOPEPRODUCTDIR%%/Formulator/tests/test_serialize.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/tests/test_validators.py
 %%ZOPEPRODUCTDIR%%/Formulator/tests/test_validators.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/TALESField.py
-%%ZOPEPRODUCTDIR%%/Formulator/TODO.txt
-%%ZOPEPRODUCTDIR%%/Formulator/Validator.py
-%%ZOPEPRODUCTDIR%%/Formulator/Widget.py
-%%ZOPEPRODUCTDIR%%/Formulator/XMLObjects.py
-%%ZOPEPRODUCTDIR%%/Formulator/XMLToForm.py
-%%ZOPEPRODUCTDIR%%/Formulator/__init__.py
-%%ZOPEPRODUCTDIR%%/Formulator/helpers.py
-%%ZOPEPRODUCTDIR%%/Formulator/homepage.html
-%%ZOPEPRODUCTDIR%%/Formulator/refresh.txt
 %%ZOPEPRODUCTDIR%%/Formulator/version.txt
 %%ZOPEPRODUCTDIR%%/Formulator/www/BasicField.gif
 %%ZOPEPRODUCTDIR%%/Formulator/www/CheckBoxField.gif
@@ -98,36 +132,6 @@
 %%ZOPEPRODUCTDIR%%/Formulator/www/RangedIntegerField.gif
 %%ZOPEPRODUCTDIR%%/Formulator/www/StringField.gif
 %%ZOPEPRODUCTDIR%%/Formulator/www/TextAreaField.gif
-%%ZOPEPRODUCTDIR%%/Formulator/i18n/__init__.py
-%%ZOPEPRODUCTDIR%%/Formulator/i18n/dummymessageid.py
-%%ZOPEPRODUCTDIR%%/Formulator/i18n/formulatormessageid.py
-%%ZOPEPRODUCTDIR%%/Formulator/i18n/__init__.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/i18n/dummymessageid.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/i18n/formulatormessageid.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/i18n/formulator.pot
-%%ZOPEPRODUCTDIR%%/Formulator/i18n/formulator-nl.po
-%%ZOPEPRODUCTDIR%%/Formulator/DummyField.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/Errors.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/FSForm.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/Field.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/FieldHelpTopic.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/FieldRegistry.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/Form.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/FormToXML.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/FormulatorFormFile.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/HelperFields.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/ListTextAreaField.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/MethodField.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/PatternChecker.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/ProductForm.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/StandardFields.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/TALESField.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/Validator.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/Widget.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/XMLObjects.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/XMLToForm.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/__init__.pyc
-%%ZOPEPRODUCTDIR%%/Formulator/helpers.pyc
 @dirrm %%ZOPEPRODUCTDIR%%/Formulator/dtml
 @dirrm %%ZOPEPRODUCTDIR%%/Formulator/help
 @dirrm %%ZOPEPRODUCTDIR%%/Formulator/i18n