Changes 2.4.2:

* Fix issue where subclasses of Template failed to pick up attributes in the
  searchlist
* Remove old/outdated bundled memcached python client
* Allow for #encoding directives to exist after a comment (i.e. not the first
  line in a module)
* Remove support for WebWare servlets (which caused significant performance
  slowdowns on Mac OS X)
* Old/stale code pruned in preparation for Python 3 support

Changes 2.4.1:
* --quiet flag added to `cheetah` to silence printing to stdout
* Refactoring to minimize the amount of forked code for Python3
* Template.compile() will no longer create class names with numerous leading
  underscores
* DirectiveAnalyzer (cheetah-analyze script) added to report directive usage in
  templates
* Older LaTeX docs converted to rst for Sphinx
* Prevent #raw blocks from evaluating $-placeholders and escaped strings
* New tests added to verify PSP behavior and other untested internals

Changes 2.4.0:
* Fix a major performance regression in Template.__init__()
* More graceful handling of unicode when calling .respond() to render a template
* Minor code updates
* Update the default filter

3 files changed, 62 insertions, 43 deletions

diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
index f9a9220f26b..2ce99d45598 100644
--- a/devel/py-cheetah/Makefile
+++ b/devel/py-cheetah/Makefile
@@ -1,21 +1,22 @@
-# $NetBSD: Makefile,v 1.11 2009/03/05 18:51:28 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.12 2011/04/08 12:54:20 adam Exp $
 
-DISTNAME=		Cheetah-2.0.1
-PKGNAME=		${PYPKGPREFIX}-cheetah-2.0.1
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cheetahtemplate/}
+DISTNAME=	Cheetah-2.4.4
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
+CATEGORIES=	devel
+MASTER_SITES=	http://pypi.python.org/packages/source/C/Cheetah/
 
-CONFLICTS=		Cheetah-[0-9]*
-
-MAINTAINER=		shannonjr@NetBSD.org
-HOMEPAGE=		http://cheetahtemplate.sourceforge.net/
-COMMENT=		Python-powered template engine and code-generator
+MAINTAINER=	shannonjr@NetBSD.org
+HOMEPAGE=	http://www.cheetahtemplate.org/
+COMMENT=	Python-powered template engine and code-generator
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYDISTUTILSPKG=		yes
-PYSETUP=		setup.py
+CONFLICTS=	Cheetah-[0-9]*
+DEPENDS+=	${PYPKGPREFIX}-markdown>=2.0.1:../../textproc/py-markdown
+
+PYTHON_VERSIONS_ACCEPTED=	27 26 25
+
+USE_LANGUAGES=		c
 
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-cheetah/PLIST b/devel/py-cheetah/PLIST
index 898803da021..4622ed0626b 100644
--- a/devel/py-cheetah/PLIST
+++ b/devel/py-cheetah/PLIST
@@ -1,6 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:49:04 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/04/08 12:54:20 adam Exp $
 bin/cheetah
+bin/cheetah-analyze
 bin/cheetah-compile
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/Cheetah/CacheRegion.py
 ${PYSITELIB}/Cheetah/CacheRegion.pyc
 ${PYSITELIB}/Cheetah/CacheRegion.pyo
@@ -13,6 +19,12 @@ ${PYSITELIB}/Cheetah/CheetahWrapper.pyo
 ${PYSITELIB}/Cheetah/Compiler.py
 ${PYSITELIB}/Cheetah/Compiler.pyc
 ${PYSITELIB}/Cheetah/Compiler.pyo
+${PYSITELIB}/Cheetah/DirectiveAnalyzer.py
+${PYSITELIB}/Cheetah/DirectiveAnalyzer.pyc
+${PYSITELIB}/Cheetah/DirectiveAnalyzer.pyo
+${PYSITELIB}/Cheetah/Django.py
+${PYSITELIB}/Cheetah/Django.pyc
+${PYSITELIB}/Cheetah/Django.pyo
 ${PYSITELIB}/Cheetah/DummyTransaction.py
 ${PYSITELIB}/Cheetah/DummyTransaction.pyc
 ${PYSITELIB}/Cheetah/DummyTransaction.pyo
@@ -68,15 +80,33 @@ ${PYSITELIB}/Cheetah/Templates/_SkeletonPage.pyo
 ${PYSITELIB}/Cheetah/Templates/__init__.py
 ${PYSITELIB}/Cheetah/Templates/__init__.pyc
 ${PYSITELIB}/Cheetah/Templates/__init__.pyo
+${PYSITELIB}/Cheetah/Tests/Analyzer.py
+${PYSITELIB}/Cheetah/Tests/Analyzer.pyc
+${PYSITELIB}/Cheetah/Tests/Analyzer.pyo
 ${PYSITELIB}/Cheetah/Tests/CheetahWrapper.py
 ${PYSITELIB}/Cheetah/Tests/CheetahWrapper.pyc
 ${PYSITELIB}/Cheetah/Tests/CheetahWrapper.pyo
-${PYSITELIB}/Cheetah/Tests/FileRefresh.py
-${PYSITELIB}/Cheetah/Tests/FileRefresh.pyc
-${PYSITELIB}/Cheetah/Tests/FileRefresh.pyo
+${PYSITELIB}/Cheetah/Tests/Cheps.py
+${PYSITELIB}/Cheetah/Tests/Cheps.pyc
+${PYSITELIB}/Cheetah/Tests/Cheps.pyo
+${PYSITELIB}/Cheetah/Tests/Filters.py
+${PYSITELIB}/Cheetah/Tests/Filters.pyc
+${PYSITELIB}/Cheetah/Tests/Filters.pyo
+${PYSITELIB}/Cheetah/Tests/Misc.py
+${PYSITELIB}/Cheetah/Tests/Misc.pyc
+${PYSITELIB}/Cheetah/Tests/Misc.pyo
 ${PYSITELIB}/Cheetah/Tests/NameMapper.py
 ${PYSITELIB}/Cheetah/Tests/NameMapper.pyc
 ${PYSITELIB}/Cheetah/Tests/NameMapper.pyo
+${PYSITELIB}/Cheetah/Tests/Parser.py
+${PYSITELIB}/Cheetah/Tests/Parser.pyc
+${PYSITELIB}/Cheetah/Tests/Parser.pyo
+${PYSITELIB}/Cheetah/Tests/Performance.py
+${PYSITELIB}/Cheetah/Tests/Performance.pyc
+${PYSITELIB}/Cheetah/Tests/Performance.pyo
+${PYSITELIB}/Cheetah/Tests/Regressions.py
+${PYSITELIB}/Cheetah/Tests/Regressions.pyc
+${PYSITELIB}/Cheetah/Tests/Regressions.pyo
 ${PYSITELIB}/Cheetah/Tests/SyntaxAndOutput.py
 ${PYSITELIB}/Cheetah/Tests/SyntaxAndOutput.pyc
 ${PYSITELIB}/Cheetah/Tests/SyntaxAndOutput.pyo
@@ -86,12 +116,15 @@ ${PYSITELIB}/Cheetah/Tests/Template.pyo
 ${PYSITELIB}/Cheetah/Tests/Test.py
 ${PYSITELIB}/Cheetah/Tests/Test.pyc
 ${PYSITELIB}/Cheetah/Tests/Test.pyo
+${PYSITELIB}/Cheetah/Tests/Unicode.py
+${PYSITELIB}/Cheetah/Tests/Unicode.pyc
+${PYSITELIB}/Cheetah/Tests/Unicode.pyo
 ${PYSITELIB}/Cheetah/Tests/__init__.py
 ${PYSITELIB}/Cheetah/Tests/__init__.pyc
 ${PYSITELIB}/Cheetah/Tests/__init__.pyo
-${PYSITELIB}/Cheetah/Tests/unittest_local_copy.py
-${PYSITELIB}/Cheetah/Tests/unittest_local_copy.pyc
-${PYSITELIB}/Cheetah/Tests/unittest_local_copy.pyo
+${PYSITELIB}/Cheetah/Tests/xmlrunner.py
+${PYSITELIB}/Cheetah/Tests/xmlrunner.pyc
+${PYSITELIB}/Cheetah/Tests/xmlrunner.pyo
 ${PYSITELIB}/Cheetah/Tools/CGITemplate.py
 ${PYSITELIB}/Cheetah/Tools/CGITemplate.pyc
 ${PYSITELIB}/Cheetah/Tools/CGITemplate.pyo
@@ -117,9 +150,6 @@ ${PYSITELIB}/Cheetah/Utils/Indenter.pyo
 ${PYSITELIB}/Cheetah/Utils/Misc.py
 ${PYSITELIB}/Cheetah/Utils/Misc.pyc
 ${PYSITELIB}/Cheetah/Utils/Misc.pyo
-${PYSITELIB}/Cheetah/Utils/VerifyType.py
-${PYSITELIB}/Cheetah/Utils/VerifyType.pyc
-${PYSITELIB}/Cheetah/Utils/VerifyType.pyo
 ${PYSITELIB}/Cheetah/Utils/WebInputMixin.py
 ${PYSITELIB}/Cheetah/Utils/WebInputMixin.pyc
 ${PYSITELIB}/Cheetah/Utils/WebInputMixin.pyo
@@ -132,21 +162,9 @@ ${PYSITELIB}/Cheetah/Utils/htmlDecode.pyo
 ${PYSITELIB}/Cheetah/Utils/htmlEncode.py
 ${PYSITELIB}/Cheetah/Utils/htmlEncode.pyc
 ${PYSITELIB}/Cheetah/Utils/htmlEncode.pyo
-${PYSITELIB}/Cheetah/Utils/memcache.py
-${PYSITELIB}/Cheetah/Utils/memcache.pyc
-${PYSITELIB}/Cheetah/Utils/memcache.pyo
-${PYSITELIB}/Cheetah/Utils/optik/__init__.py
-${PYSITELIB}/Cheetah/Utils/optik/__init__.pyc
-${PYSITELIB}/Cheetah/Utils/optik/__init__.pyo
-${PYSITELIB}/Cheetah/Utils/optik/errors.py
-${PYSITELIB}/Cheetah/Utils/optik/errors.pyc
-${PYSITELIB}/Cheetah/Utils/optik/errors.pyo
-${PYSITELIB}/Cheetah/Utils/optik/option.py
-${PYSITELIB}/Cheetah/Utils/optik/option.pyc
-${PYSITELIB}/Cheetah/Utils/optik/option.pyo
-${PYSITELIB}/Cheetah/Utils/optik/option_parser.py
-${PYSITELIB}/Cheetah/Utils/optik/option_parser.pyc
-${PYSITELIB}/Cheetah/Utils/optik/option_parser.pyo
+${PYSITELIB}/Cheetah/Utils/statprof.py
+${PYSITELIB}/Cheetah/Utils/statprof.pyc
+${PYSITELIB}/Cheetah/Utils/statprof.pyo
 ${PYSITELIB}/Cheetah/Version.py
 ${PYSITELIB}/Cheetah/Version.pyc
 ${PYSITELIB}/Cheetah/Version.pyo
diff --git a/devel/py-cheetah/distinfo b/devel/py-cheetah/distinfo
index d01524e2855..3b4478689f4 100644
--- a/devel/py-cheetah/distinfo
+++ b/devel/py-cheetah/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2008/04/29 11:07:36 shannonjr Exp $
+$NetBSD: distinfo,v 1.6 2011/04/08 12:54:20 adam Exp $
 
-SHA1 (Cheetah-2.0.1.tar.gz) = 6c1aab90bf2d34f3f72998c96ff2767d870a5e7d
-RMD160 (Cheetah-2.0.1.tar.gz) = 9e8ef0afc4eabd1349e4228f5ad78551f7bddbe4
-Size (Cheetah-2.0.1.tar.gz) = 215295 bytes
+SHA1 (Cheetah-2.4.4.tar.gz) = c218f5d8bc97b39497680f6be9b7bd093f696e89
+RMD160 (Cheetah-2.4.4.tar.gz) = ae516e090313864f03dbfe131dada3fec9f60243
+Size (Cheetah-2.4.4.tar.gz) = 190989 bytes