3 files changed, 24 insertions, 20 deletions

diff --git a/www/py-formencode/Makefile b/www/py-formencode/Makefile
index 22863631ebd3..54789b49d7ed 100644
--- a/www/py-formencode/Makefile
+++ b/www/py-formencode/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	py-formencode
-# Date created:		2005-11-16
-# Whom:			Choe, Cheng-Dae
-#
+# Created by: Choe, Cheng-Dae
 # $FreeBSD$
-#
 
 PORTNAME=	formencode
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.6
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,20 +11,25 @@ DISTNAME=	FormEncode-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTML form validation, generation, and conversion package
 
-USE_PYTHON=		-2.7
-USE_PYDISTUTILS=	easy_install
-USES=		gettext
+LICENSE=	PSFL
+
+OPTIONS_DEFINE=	DOCS
 
+USE_ZIP=	yes
+USES=		gettext:run
+USE_PYTHON=	-2.7
+USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	FormEncode
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
 PORTDOCS=	*
 
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
 	@(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${DOCSDIR})
 .endif
 
diff --git a/www/py-formencode/distinfo b/www/py-formencode/distinfo
index de24a0175cd8..a7550b7349cf 100644
--- a/www/py-formencode/distinfo
+++ b/www/py-formencode/distinfo
@@ -1,2 +1,2 @@
-SHA256 (FormEncode-1.2.4.tar.gz) = 8270840ee832055463b3d3328f8ae4b881e1fbe84353c97af1d913df3401feb9
-SIZE (FormEncode-1.2.4.tar.gz) = 240034
+SHA256 (FormEncode-1.2.6.zip) = 70fc1d2cf8022b1cc7fcebb5d87cc984dde799e587f05c0a0fe509b374221b0c
+SIZE (FormEncode-1.2.6.zip) = 318441
diff --git a/www/py-formencode/pkg-plist b/www/py-formencode/pkg-plist
index bb770b7cfbb1..8e993c414f75 100644
--- a/www/py-formencode/pkg-plist
+++ b/www/py-formencode/pkg-plist
@@ -21,6 +21,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/doctest_xml_compare.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/doctest_xml_compare.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/doctest_xml_compare.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/exc.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/exc.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/exc.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/fieldstorage.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/fieldstorage.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/fieldstorage.pyo
@@ -56,14 +59,10 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/fr/LC_MESSAGES/FormEncode.po
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/it/LC_MESSAGES/FormEncode.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/it/LC_MESSAGES/FormEncode.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/lt/LC_MESSAGES/FormEncode.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/lt/LC_MESSAGES/FormEncode.po
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/ja/LC_MESSAGES/FormEncode.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/ja/LC_MESSAGES/FormEncode.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/tr/LC_MESSAGES/FormEncode.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/tr/LC_MESSAGES/FormEncode.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/zh_TW/LC_MESSAGES/FormEncode.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/zh_TW/LC_MESSAGES/FormEncode.po
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/lt/LC_MESSAGES/FormEncode.mo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/lt/LC_MESSAGES/FormEncode.po
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/msgfmt.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/msgfmt.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/msgfmt.pyo
@@ -83,8 +82,12 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/sk/LC_MESSAGES/FormEncode.po
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/sl/LC_MESSAGES/FormEncode.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/sl/LC_MESSAGES/FormEncode.po
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/tr/LC_MESSAGES/FormEncode.mo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/tr/LC_MESSAGES/FormEncode.po
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/zh_CN/LC_MESSAGES/FormEncode.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/zh_CN/LC_MESSAGES/FormEncode.po
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/zh_TW/LC_MESSAGES/FormEncode.mo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/i18n/zh_TW/LC_MESSAGES/FormEncode.po
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/interfaces.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/interfaces.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/formencode/interfaces.pyo