Update to 1.6.2

PR:		ports/65932
Submitted by:	Tim Middleton <x@vex.net> (maintainer)

3 files changed, 77 insertions, 69 deletions

diff --git a/www/zope-formulator/Makefile b/www/zope-formulator/Makefile
index 76a50b6f921..1303d8062d4 100644
--- a/www/zope-formulator/Makefile
+++ b/www/zope-formulator/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	formulator
-PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTVERSION=	1.6.2
 CATEGORIES=	www zope
 MASTER_SITES=	http://zope.org/Members/infrae/Formulator/Formulator-${PORTVERSION}/
 PKGNAMEPREFIX=	zope-
@@ -15,7 +14,7 @@ DISTNAME=	Formulator-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	x@Vex.Net
-COMMENT=	Formulator - HTML form generatation and validation system
+COMMENT=	HTML form generatation and validation system for Zope
 
 USE_PYTHON=		yes
 USE_ZOPE=		yes
@@ -26,17 +25,25 @@ CONFLICTS=	plone-*
 ZOPEPRODUCTNAME=	Formulator
 
 WRKSRC=		${WRKDIR}/${ZOPEPRODUCTNAME}
-CPIO=		cpio --quiet -pdum -R
 
 do-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
+pre-install:
+	@${RM} -f ${PLIST}
+	@${TOUCH} ${PLIST}
+	@cd ${WRKDIR} && \
+	for f in `${FIND} ${ZOPEPRODUCTNAME} -type f`; do \
+		${ECHO_CMD} %%ZOPEPRODUCTDIR%%/$${f} >> ${PLIST}; \
+	done; \
+	for d in `${FIND} -d ${ZOPEPRODUCTNAME} -type d`; do \
+		${ECHO_CMD} @dirrm %%ZOPEPRODUCTDIR%%/$${d} >> ${PLIST}; \
+	done; \
+
 do-install:
-	@ ${CHMOD} -R og+rX ${WRKSRC}/
-	@ ${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
-	@ cd ${WRKSRC} && ${FIND} . \
-	  | ${CPIO} ${BINOWN}:${BINGRP} \
-	  ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
+	@${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/
+	@${CHMOD} -R og+rX ${WRKSRC}/
+	@${CP} -R ${WRKSRC} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/
 
 post-install:
 .if !defined(BATCH)
diff --git a/www/zope-formulator/distinfo b/www/zope-formulator/distinfo
index 9061ae72e6a..7f61ec0beef 100644
--- a/www/zope-formulator/distinfo
+++ b/www/zope-formulator/distinfo
@@ -1,2 +1,2 @@
-MD5 (zope/Formulator-1.6.1.tgz) = 3753d468f24ea36e8ca61a13096c7095
-SIZE (zope/Formulator-1.6.1.tgz) = 73406
+MD5 (zope/Formulator-1.6.2.tgz) = c5eb395918349036c7ac400dbbff98e9
+SIZE (zope/Formulator-1.6.2.tgz) = 74920
diff --git a/www/zope-formulator/pkg-plist b/www/zope-formulator/pkg-plist
index a4182a44535..8e6d38b829e 100644
--- a/www/zope-formulator/pkg-plist
+++ b/www/zope-formulator/pkg-plist
@@ -1,50 +1,3 @@
-%%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
@@ -59,13 +12,9 @@
 %%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
@@ -79,17 +28,49 @@
 %%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/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/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/__init__.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/tests/test_Form.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/tests/test_all.pyc
+%%ZOPEPRODUCTDIR%%/Formulator/tests/test_serialize.pyc
 %%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/homepage.html
+%%ZOPEPRODUCTDIR%%/Formulator/refresh.txt
 %%ZOPEPRODUCTDIR%%/Formulator/version.txt
 %%ZOPEPRODUCTDIR%%/Formulator/www/BasicField.gif
 %%ZOPEPRODUCTDIR%%/Formulator/www/CheckBoxField.gif
@@ -113,8 +94,28 @@
 %%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
+%%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/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
 @dirrm %%ZOPEPRODUCTDIR%%/Formulator/dtml
+@dirrm %%ZOPEPRODUCTDIR%%/Formulator/help
+@dirrm %%ZOPEPRODUCTDIR%%/Formulator/tests
+@dirrm %%ZOPEPRODUCTDIR%%/Formulator/www
 @dirrm %%ZOPEPRODUCTDIR%%/Formulator