4 files changed, 73 insertions, 55 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 2a5c14702e33..ee24fda8e876 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1663,6 +1663,7 @@
     SUBDIR += pear-HTML_Javascript
     SUBDIR += pear-HTML_Page2
     SUBDIR += pear-HTML_QuickForm
+    SUBDIR += pear-HTML_QuickForm2
     SUBDIR += pear-HTML_QuickForm_Controller
     SUBDIR += pear-HTML_QuickForm_Livesearch
     SUBDIR += pear-HTML_QuickForm_SelectFilter
diff --git a/devel/pear-HTML_QuickForm2/Makefile b/devel/pear-HTML_QuickForm2/Makefile
index 30fe21a93856..dfffdf694ae7 100644
--- a/devel/pear-HTML_QuickForm2/Makefile
+++ b/devel/pear-HTML_QuickForm2/Makefile
@@ -1,52 +1,80 @@
-# Ports collection makefile for:  pear-HTML_QuickForm
-# Date created:			  30 March 2004
-# Whom:				  Gerrit Beine (<gerrit@beine-computer.de>)
+# Ports collection makefile for:  pear-HTML_QuickForm2
+# Date created:			  17 May 2007
+# Whom:				  Gerrit Beine (<gerrit.beine@gmx.de>)
 #
 # $FreeBSD$
 #
 
-PORTNAME=	HTML_QuickForm
-PORTVERSION=	3.2.9
+PORTNAME=	HTML_QuickForm2
+PORTVERSION=	0.1.0
 CATEGORIES=	devel www pear
 
 MAINTAINER=	gerrit.beine@gmx.de
-COMMENT=	Provide methods for creating, validating and processing HTML forms
+COMMENT=	PHP5 rewrite of the HTML_QuickForm package
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common2.php:${PORTSDIR}/devel/pear-HTML_Common2
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+DEFAULT_PHP_VER=5
+IGNORE_WITH_PHP=4
+
 CATEGORY=	HTML
-FILES=		QuickForm.php \
-		QuickForm/advcheckbox.php QuickForm/autocomplete.php QuickForm/button.php \
-		QuickForm/checkbox.php QuickForm/date.php QuickForm/element.php \
-		QuickForm/file.php QuickForm/group.php QuickForm/header.php \
-		QuickForm/hidden.php QuickForm/hiddenselect.php QuickForm/hierselect.php \
-		QuickForm/html.php QuickForm/image.php QuickForm/input.php \
-		QuickForm/link.php QuickForm/password.php QuickForm/radio.php \
-		QuickForm/reset.php QuickForm/select.php QuickForm/static.php \
-		QuickForm/submit.php QuickForm/text.php QuickForm/textarea.php \
-		QuickForm/xbutton.php \
-		QuickForm/Renderer.php QuickForm/Rule.php QuickForm/RuleRegistry.php \
-		QuickForm/Renderer/Array.php QuickForm/Renderer/ArraySmarty.php \
-		QuickForm/Renderer/Default.php \
-		QuickForm/Renderer/ITDynamic.php QuickForm/Renderer/ITStatic.php \
-		QuickForm/Renderer/Object.php \
-		QuickForm/Renderer/ObjectFlexy.php QuickForm/Renderer/QuickHtml.php \
-		QuickForm/Rule/Callback.php QuickForm/Rule/Compare.php QuickForm/Rule/Email.php \
-		QuickForm/Rule/Range.php QuickForm/Rule/Regex.php QuickForm/Rule/Required.php
-DOCS=		elements.php filters.php formrule.php groups.php rules-builtin.php rules-custom.php \
-		renderers/FlexyDynamic_example.php renderers/FlexyStatic_example.php \
-		renderers/ITDynamic_example.php renderers/ITDynamic_example2.php \
-		renderers/ITStatic_example.php renderers/QuickHtml_example.php \
-		renderers/SmartyDynamic_example.php renderers/SmartyStatic_example.php \
-		renderers/multiple-labels.php renderers/templates/it-dynamic-2.html \
-		renderers/templates/it-dynamic.html renderers/templates/it-static.html \
-		renderers/templates/smarty-dynamic-fancygroup.tpl \
-		renderers/templates/smarty-dynamic-green.tpl renderers/templates/smarty-dynamic.tpl \
-		renderers/templates/smarty-static.tpl renderers/templates/html.html \
-		renderers/templates/flexy-dynamic.html renderers/templates/flexy-static.html \
-		renderers/templates/label.html renderers/templates/styles/green.html \
-		renderers/templates/styles/fancygroup.html
+FILES=		QuickForm2/Container/Fieldset.php \
+		QuickForm2/DataSource/Array.php \
+		QuickForm2/DataSource/Submit.php \
+		QuickForm2/DataSource/SuperGlobal.php \
+		QuickForm2/Element/Button.php \
+		QuickForm2/Element/Input.php \
+		QuickForm2/Element/InputButton.php \
+		QuickForm2/Element/InputCheckable.php \
+		QuickForm2/Element/InputCheckbox.php \
+		QuickForm2/Element/InputFile.php \
+		QuickForm2/Element/InputHidden.php \
+		QuickForm2/Element/InputImage.php \
+		QuickForm2/Element/InputPassword.php \
+		QuickForm2/Element/InputRadio.php \
+		QuickForm2/Element/InputReset.php \
+		QuickForm2/Element/InputSubmit.php \
+		QuickForm2/Element/InputText.php \
+		QuickForm2/Element/Select.php \
+		QuickForm2/Element/Textarea.php \
+		QuickForm2/Container.php \
+		QuickForm2/DataSource.php \
+		QuickForm2/Element.php \
+		QuickForm2/Exception.php \
+		QuickForm2/Factory.php \
+		QuickForm2/Node.php \
+		QuickForm2.php
+EXAMPLES=	basic-elements.php
+TESTS=		QuickForm2/Container/AllTests.php \
+		QuickForm2/Container/FieldsetTest.php \
+		QuickForm2/DataSource/AllTests.php \
+		QuickForm2/DataSource/ArrayTest.php \
+		QuickForm2/DataSource/SuperGlobalTest.php \
+		QuickForm2/Element/AllTests.php \
+		QuickForm2/Element/ButtonTest.php \
+		QuickForm2/Element/InputButtonTest.php \
+		QuickForm2/Element/InputCheckableTest.php \
+		QuickForm2/Element/InputCheckboxTest.php \
+		QuickForm2/Element/InputFileTest.php \
+		QuickForm2/Element/InputHiddenTest.php \
+		QuickForm2/Element/InputImageTest.php \
+		QuickForm2/Element/InputPasswordTest.php \
+		QuickForm2/Element/InputResetTest.php \
+		QuickForm2/Element/InputSubmitTest.php \
+		QuickForm2/Element/InputTest.php \
+		QuickForm2/Element/SelectTest.php \
+		QuickForm2/Element/TextareaTest.php \
+		QuickForm2/_files/FakeElement.php \
+		QuickForm2/_files/InvalidFile.php \
+		QuickForm2/AllTests.php \
+		QuickForm2/ContainerTest.php \
+		QuickForm2/ElementTest.php \
+		QuickForm2/FactoryTest.php \
+		QuickForm2/NodeTest.php \
+		AllTests.php \
+		QuickForm2Test.php
+_EXAMPLESDIR=	docs/examples
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
diff --git a/devel/pear-HTML_QuickForm2/distinfo b/devel/pear-HTML_QuickForm2/distinfo
index 3a01460a3da3..32d9a060bb9a 100644
--- a/devel/pear-HTML_QuickForm2/distinfo
+++ b/devel/pear-HTML_QuickForm2/distinfo
@@ -1,3 +1,3 @@
-MD5 (PEAR/HTML_QuickForm-3.2.9.tgz) = 1cebd6a4a9a1ebb8c3c7f501bba3e47d
-SHA256 (PEAR/HTML_QuickForm-3.2.9.tgz) = cf024a40a875e3cd5df0f721d6c0dca88ebccedc6eda3b7742732426963a7c30
-SIZE (PEAR/HTML_QuickForm-3.2.9.tgz) = 101392
+MD5 (PEAR/HTML_QuickForm2-0.1.0.tgz) = de91b8f00f732c8a7bc993e5d423abb1
+SHA256 (PEAR/HTML_QuickForm2-0.1.0.tgz) = ba87452e0bb51afbb55a169b44271f2201760d75c0e50b6fa45a1d34e59a8b9c
+SIZE (PEAR/HTML_QuickForm2-0.1.0.tgz) = 34260
diff --git a/devel/pear-HTML_QuickForm2/pkg-descr b/devel/pear-HTML_QuickForm2/pkg-descr
index 8eb368c94cf6..28fc888584e3 100644
--- a/devel/pear-HTML_QuickForm2/pkg-descr
+++ b/devel/pear-HTML_QuickForm2/pkg-descr
@@ -1,15 +1,4 @@
-The HTML_QuickForm package provides methods for dynamically create, validate
-and render HTML forms.
+This package is expected to offer at least the same functionality as
+HTML_QuickForm and work with PHP5 E_STRICT setting.
 
-Features:
-* More than 20 ready-to-use form elements.
-* XHTML compliant generated code.
-* Numerous mixable and extendable validation rules.
-* Automatic server-side validation and filtering.
-* On request javascript code generation for client-side validation.
-* File uploads support.
-* Total customization of form rendering.
-* Support for external template engines (ITX, Sigma, Flexy, Smarty).
-* Pluggable elements, rules and renderers extensions.
-
-WWW: http://pear.php.net/package/HTML_QuickForm
+WWW: http://pear.php.net/package/HTML_QuickForm2