Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-cheetah/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	30 Aug 2010 22:24:15 -0000	1.15
+++ Makefile	18 Sep 2010 11:57:18 -0000
@@ -2,10 +2,9 @@
 
 COMMENT=		Python-powered template engine and code generator
 
-VERSION=		2.0.1
-DISTNAME=		Cheetah-${VERSION}
-PKGNAME=		py-cheetah-${VERSION}
-REVISION =		1
+MODPY_EGG_VERSION=	2.4.3
+DISTNAME=		Cheetah-${MODPY_EGG_VERSION}
+PKGNAME=		py-cheetah-${MODPY_EGG_VERSION}
 CATEGORIES=		devel textproc
 
 HOMEPAGE=		http://www.cheetahtemplate.org/
@@ -16,19 +15,13 @@
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cheetahtemplate/}
+MASTER_SITES=		${MASTER_SITE_PYPI:=C/Cheetah/}
 
 MODULES=		lang/python
 REGRESS_DEPENDS=	::devel/py-cheetah
 MODPY_SETUPTOOLS=	Yes
 MAKE_ENV+=		CHEETAH_USE_SETUPTOOLS=1
 MODPY_BADEGGS=		Cheetah
-
-SUBST_VARS=		VERSION
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-cheetah
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/py-cheetah/
 
 do-regress:
 	mkdir /tmp/.cheetah
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-cheetah/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	13 Jan 2008 17:39:39 -0000	1.7
+++ distinfo	18 Sep 2010 11:57:18 -0000
@@ -1,5 +1,5 @@
-MD5 (Cheetah-2.0.1.tar.gz) = eEWilQ6oUKE8SIomthrFCg==
-RMD160 (Cheetah-2.0.1.tar.gz) = no7wr8TqvRNJ5CKPWteFUfe92+Q=
-SHA1 (Cheetah-2.0.1.tar.gz) = bBqrkL8tNPP3KZjJb/J2fYcKXn0=
-SHA256 (Cheetah-2.0.1.tar.gz) = cLYYoDUGgx9Zuh/4QzkH7o1OrV/J8bP2ENOE4Iomk4w=
-SIZE (Cheetah-2.0.1.tar.gz) = 215295
+MD5 (Cheetah-2.4.3.tar.gz) = 6dEuaus7Ubdam0IU9pje+A==
+RMD160 (Cheetah-2.4.3.tar.gz) = muZW9BGndqdXhWZrMWSrshS56sw=
+SHA1 (Cheetah-2.4.3.tar.gz) = LoTayoA/GcTWny23EgrwO2AjlMg=
+SHA256 (Cheetah-2.4.3.tar.gz) = G0UKBYB/tJe6e1LtgU25X5HG1vVvSQi6twegvK82+bU=
+SIZE (Cheetah-2.4.3.tar.gz) = 190867
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-cheetah/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- pkg/PLIST	13 Jan 2008 17:39:39 -0000	1.8
+++ pkg/PLIST	18 Sep 2010 11:57:18 -0000
@@ -1,12 +1,14 @@
 @comment $OpenBSD: PLIST,v 1.8 2008/01/13 17:39:39 martynas Exp $
 bin/cheetah
+bin/cheetah-analyze
 bin/cheetah-compile
 lib/python${MODPY_VERSION}/site-packages/Cheetah/
-lib/python${MODPY_VERSION}/site-packages/Cheetah-${VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/Cheetah-${VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/Cheetah-${VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/Cheetah-${VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/Cheetah-${VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/Cheetah-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/Cheetah-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/Cheetah-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/Cheetah-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/Cheetah-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/Cheetah-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/Cheetah/CacheRegion.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/CacheRegion.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/CacheStore.py
@@ -15,6 +17,10 @@
 lib/python${MODPY_VERSION}/site-packages/Cheetah/CheetahWrapper.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Compiler.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Compiler.pyc
+lib/python${MODPY_VERSION}/site-packages/Cheetah/DirectiveAnalyzer.py
+lib/python${MODPY_VERSION}/site-packages/Cheetah/DirectiveAnalyzer.pyc
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Django.py
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Django.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/DummyTransaction.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/DummyTransaction.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/ErrorCatchers.py
@@ -55,22 +61,36 @@
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Templates/__init__.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Templates/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Analyzer.py
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Analyzer.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/CheetahWrapper.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/CheetahWrapper.pyc
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/FileRefresh.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/FileRefresh.pyc
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Cheps.py
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Cheps.pyc
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Filters.py
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Filters.pyc
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Misc.py
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Misc.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/NameMapper.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/NameMapper.pyc
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Parser.py
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Parser.pyc
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Performance.py
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Performance.pyc
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Regressions.py
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Regressions.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/SyntaxAndOutput.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/SyntaxAndOutput.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Template.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Template.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Test.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Test.pyc
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Unicode.py
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/Unicode.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/__init__.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/unittest_local_copy.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/unittest_local_copy.pyc
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/xmlrunner.py
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Tests/xmlrunner.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tools/
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tools/CGITemplate.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Tools/CGITemplate.pyc
@@ -90,8 +110,6 @@
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/Indenter.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/Misc.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/Misc.pyc
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/VerifyType.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/VerifyType.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/WebInputMixin.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/WebInputMixin.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/__init__.py
@@ -100,17 +118,8 @@
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/htmlDecode.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/htmlEncode.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/htmlEncode.pyc
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/memcache.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/memcache.pyc
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/optik/
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/optik/__init__.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/optik/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/optik/errors.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/optik/errors.pyc
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/optik/option.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/optik/option.pyc
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/optik/option_parser.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/optik/option_parser.pyc
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/statprof.py
+lib/python${MODPY_VERSION}/site-packages/Cheetah/Utils/statprof.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Version.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/Version.pyc
 lib/python${MODPY_VERSION}/site-packages/Cheetah/__init__.py
@@ -118,5 +127,3 @@
 lib/python${MODPY_VERSION}/site-packages/Cheetah/_namemapper.so
 lib/python${MODPY_VERSION}/site-packages/Cheetah/convertTmplPathToModuleName.py
 lib/python${MODPY_VERSION}/site-packages/Cheetah/convertTmplPathToModuleName.pyc
-share/doc/py-cheetah/
-share/doc/py-cheetah/README