3 files changed, 67 insertions, 16 deletions

diff --git a/textproc/py-Chameleon/Makefile b/textproc/py-Chameleon/Makefile
index 2f35a7bd7d1b..98e81016f909 100644
--- a/textproc/py-Chameleon/Makefile
+++ b/textproc/py-Chameleon/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	py-Chameleon
-# Date created:				2011-03-21
-# Whom:					Cheng-Lung Sung <clsung@FreeBSD.org>
-#
+# Created by: Cheng-Lung Sung <clsung@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Chameleon
-DISTVERSION=	2.3
+DISTVERSION=	2.11
 CATEGORIES=	textproc www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,6 +11,6 @@ MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A Python HTML/XML template language compiler
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=easy_install
 
 .include <bsd.port.mk>
diff --git a/textproc/py-Chameleon/distinfo b/textproc/py-Chameleon/distinfo
index 27d9bfd2e51a..e1b700992ad4 100644
--- a/textproc/py-Chameleon/distinfo
+++ b/textproc/py-Chameleon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Chameleon-2.3.tar.gz) = f9bd5dea7a94c54cebc681c9feea1402a00145f6d6c98685dbbfd6377197a031
-SIZE (Chameleon-2.3.tar.gz) = 117947
+SHA256 (Chameleon-2.11.tar.gz) = 4bebbc129c84344fff58ad032130ab85f1891b1f06f6da0b6623aab527f34bb8
+SIZE (Chameleon-2.11.tar.gz) = 157097
diff --git a/textproc/py-Chameleon/pkg-plist b/textproc/py-Chameleon/pkg-plist
index 886b6f06f5fe..544b515d508f 100644
--- a/textproc/py-Chameleon/pkg-plist
+++ b/textproc/py-Chameleon/pkg-plist
@@ -6,9 +6,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/ast24.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/ast24.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/ast24.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/ast25.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/ast25.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/ast25.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/astutil.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/astutil.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/astutil.pyo
@@ -193,37 +193,61 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/060.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/061-fill-one-slot-but-two-defined.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/061.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/062.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/062-comments-and-expressions.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/063.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/062.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/063-continuation.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/064.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/063.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/064-tags-and-special-characters.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/065.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/064.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/065-use-macro-in-fill.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/065.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/066-load-expression.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/066.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/067-attribute-decode.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/067.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/068-less-than-greater-than-in-attributes.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/068.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/069-translation-domain-and-macro.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/069.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/070-translation-domain-and-use-macro.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/070.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/071-html-attribute-defaults.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/071.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/072-repeat-interpolation.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/072.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/073-utf8-encoded.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/073.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/074-encoded-template.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/074.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/075-nested-macros.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/075.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/076-nested-macro-override.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/076.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/077-i18n-attributes.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/077.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/078-tags-and-newlines.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/078.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/079-implicit-i18n.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/079.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/080-xmlns-namespace-on-tal.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/080.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/081-load-spec.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/081.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/082-load-spec-computed.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/082.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/083-template-dict-to-macro.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/083.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/084-interpolation-in-cdata.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/084.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/085-nested-translation.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/085.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/086-self-closing.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/086.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/087-code-blocks.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/087.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/088-python-newlines.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/088.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/089-load-fallback.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/089.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/090.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/091.xml
@@ -258,6 +282,7 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/117.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/118.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/119.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/greeting.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/hello_world.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/inputs/hello_world.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/001.html
@@ -333,9 +358,39 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/063.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/064.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/065.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/066.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/067.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/068.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/069-en.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/069.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/070-en.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/070.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/071.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/072.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/073.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/074.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/075.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/076.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/077-en.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/077.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/078.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/079-en.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/079.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/080.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/081.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/082.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/083.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/084.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/085-en.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/085.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/086.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/087.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/088.pt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/089.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/101.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/102.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/103.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/greeting.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/hello_world.pt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/outputs/hello_world.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/chameleon/tests/test_doctests.py