2 files changed, 121 insertions, 121 deletions

diff --git a/www/zope-formulator/Makefile b/www/zope-formulator/Makefile
index 5bcfe5414632..76a50b6f9214 100644
--- a/www/zope-formulator/Makefile
+++ b/www/zope-formulator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	formulator
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	www zope
 MASTER_SITES=	http://zope.org/Members/infrae/Formulator/Formulator-${PORTVERSION}/
 PKGNAMEPREFIX=	zope-
@@ -24,7 +25,6 @@ CONFLICTS=	plone-*
 
 ZOPEPRODUCTNAME=	Formulator
 
-PLIST_SUB=	ZOPEBASEDIR=${SZOPEBASEDIR}
 WRKSRC=		${WRKDIR}/${ZOPEPRODUCTNAME}
 CPIO=		cpio --quiet -pdum -R
 
diff --git a/www/zope-formulator/pkg-plist b/www/zope-formulator/pkg-plist
index df96190bde50..a4182a44535d 100644
--- a/www/zope-formulator/pkg-plist
+++ b/www/zope-formulator/pkg-plist
@@ -1,120 +1,120 @@
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/CREDITS.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/DummyField.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/DummyField.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Errors.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Errors.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FSForm.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FSForm.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Field.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Field.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FieldHelpTopic.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FieldHelpTopic.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FieldRegistry.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FieldRegistry.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Form.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Form.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FormToXML.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FormToXML.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/HISTORY.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/HelperFields.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/HelperFields.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/INSTALL.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/LICENSE.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/ListTextAreaField.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/ListTextAreaField.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/MethodField.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/MethodField.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/PatternChecker.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/PatternChecker.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/ProductForm.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/ProductForm.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/StandardFields.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/StandardFields.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/TALESField.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/TALESField.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/TODO.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Validator.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Validator.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Widget.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Widget.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/XMLObjects.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/XMLObjects.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/XMLToForm.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/XMLToForm.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/homepage.html
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/FieldHelpTopic.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/fieldAdd.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/fieldEdit.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/fieldListHeader.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/fieldMessages.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/fieldOverride.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/fieldTales.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/fieldTest.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/formAdd.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/formOrder.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/formSettings.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/formTest.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/formXML.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/BasicForm.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/BasicForm.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/Field.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/Field.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/Form.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/Form.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/ZMIForm.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/ZMIForm.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/dogfood.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/fieldEdit.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/fieldMessages.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/fieldOverride.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/fieldTales.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/fieldTest.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/formContents.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/formOrder.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/formSettings.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/formTest.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/formXML.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/formulator_howto.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/formulator_motto.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_Form.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_Form.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_all.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_all.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_serialize.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_serialize.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_validators.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_validators.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/version.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/BasicField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/CheckBoxField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/DateTimeField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/EmailField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/FileField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/FloatField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/Form.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/IntegerField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/LabelField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/LinesField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/LinkField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/ListField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/MethodField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/MultiCheckBoxField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/MultiListField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/MultipleListField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/PasswordField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/PatternField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/RadioField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/RangedIntegerField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/StringField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/TextAreaField.gif
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Formulator/www
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Formulator/help
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Formulator
+%%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/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/homepage.html
+%%ZOPEPRODUCTDIR%%/Formulator/dtml/FieldHelpTopic.dtml
+%%ZOPEPRODUCTDIR%%/Formulator/dtml/fieldAdd.dtml
+%%ZOPEPRODUCTDIR%%/Formulator/dtml/fieldEdit.dtml
+%%ZOPEPRODUCTDIR%%/Formulator/dtml/fieldListHeader.dtml
+%%ZOPEPRODUCTDIR%%/Formulator/dtml/fieldMessages.dtml
+%%ZOPEPRODUCTDIR%%/Formulator/dtml/fieldOverride.dtml
+%%ZOPEPRODUCTDIR%%/Formulator/dtml/fieldTales.dtml
+%%ZOPEPRODUCTDIR%%/Formulator/dtml/fieldTest.dtml
+%%ZOPEPRODUCTDIR%%/Formulator/dtml/formAdd.dtml
+%%ZOPEPRODUCTDIR%%/Formulator/dtml/formOrder.dtml
+%%ZOPEPRODUCTDIR%%/Formulator/dtml/formSettings.dtml
+%%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
+%%ZOPEPRODUCTDIR%%/Formulator/help/fieldOverride.txt
+%%ZOPEPRODUCTDIR%%/Formulator/help/fieldTales.txt
+%%ZOPEPRODUCTDIR%%/Formulator/help/fieldTest.txt
+%%ZOPEPRODUCTDIR%%/Formulator/help/formContents.txt
+%%ZOPEPRODUCTDIR%%/Formulator/help/formOrder.txt
+%%ZOPEPRODUCTDIR%%/Formulator/help/formSettings.txt
+%%ZOPEPRODUCTDIR%%/Formulator/help/formTest.txt
+%%ZOPEPRODUCTDIR%%/Formulator/help/formXML.txt
+%%ZOPEPRODUCTDIR%%/Formulator/help/formulator_howto.txt
+%%ZOPEPRODUCTDIR%%/Formulator/help/formulator_motto.txt
+%%ZOPEPRODUCTDIR%%/Formulator/tests/README.txt
+%%ZOPEPRODUCTDIR%%/Formulator/tests/__init__.py
+%%ZOPEPRODUCTDIR%%/Formulator/tests/__init__.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/tests/test_Form.py
+%%ZOPEPRODUCTDIR%%/Formulator/tests/test_Form.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/tests/test_all.py
+%%ZOPEPRODUCTDIR%%/Formulator/tests/test_all.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/version.txt
+%%ZOPEPRODUCTDIR%%/Formulator/www/BasicField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/CheckBoxField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/DateTimeField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/EmailField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/FileField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/FloatField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/Form.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/IntegerField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/LabelField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/LinesField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/LinkField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/ListField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/MethodField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/MultiCheckBoxField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/MultiListField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/MultipleListField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/PasswordField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/PatternField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/RadioField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/RangedIntegerField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/StringField.gif
+%%ZOPEPRODUCTDIR%%/Formulator/www/TextAreaField.gif
+@dirrm %%ZOPEPRODUCTDIR%%/Formulator/www
+@dirrm %%ZOPEPRODUCTDIR%%/Formulator/tests
+@dirrm %%ZOPEPRODUCTDIR%%/Formulator/help
+@dirrm %%ZOPEPRODUCTDIR%%/Formulator/dtml
+@dirrm %%ZOPEPRODUCTDIR%%/Formulator