On Sat, 15 Jan 2011, Antoine Jacoutot wrote:
> Hi.
>
> Can anyone using py-cheetah gives this update a try please.
> All dependents ports still build fine and I need this for an upcoming
> workrave update.
>
> Comments/ok appreciated :-)
New diff after py-markdown fixup.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-cheetah/Makefile,v
retrieving revision 1.16
diff -u -u -r1.16 Makefile
--- Makefile 15 Nov 2010 19:46:07 -0000 1.16
+++ Makefile 15 Jan 2011 18:54:08 -0000
@@ -2,21 +2,20 @@
COMMENT= Python-powered template engine and code generator
-VERSION= 2.0.1
+VERSION= 2.4.4
DISTNAME= Cheetah-${VERSION}
PKGNAME= py-cheetah-${VERSION}
-REVISION = 1
CATEGORIES= devel textproc
HOMEPAGE= http://www.cheetahtemplate.org/
-# BSD-like
+# MIT
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cheetahtemplate/}
+MASTER_SITES= http://pypi.python.org/packages/source/C/Cheetah/
MODULES= lang/python
REGRESS_DEPENDS= devel/py-cheetah
@@ -26,9 +25,7 @@
SUBST_VARS= VERSION
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-cheetah
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/py-cheetah/
+RUN_DEPENDS= textproc/markdown
do-regress:
mkdir /tmp/.cheetah
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-cheetah/distinfo,v
retrieving revision 1.7
diff -u -u -r1.7 distinfo
--- distinfo 13 Jan 2008 17:39:39 -0000 1.7
+++ distinfo 15 Jan 2011 18:54:08 -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.4.tar.gz) = hTkXEW5zGvvIyKQ8N+bdug==
+RMD160 (Cheetah-2.4.4.tar.gz) = rlFuCQMThk8D2/4THa2j/sn2AkM=
+SHA1 (Cheetah-2.4.4.tar.gz) = whj12LyXs5SXaA9r6be9CT9pbok=
+SHA256 (Cheetah-2.4.4.tar.gz) = vjCCKfDB5eWvTyfX7gbZC7GeavMFl5Tl/VNqbymptVA=
+SIZE (Cheetah-2.4.4.tar.gz) = 190989
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-cheetah/pkg/PLIST,v
retrieving revision 1.8
diff -u -u -r1.8 PLIST
--- pkg/PLIST 13 Jan 2008 17:39:39 -0000 1.8
+++ pkg/PLIST 15 Jan 2011 18:54:08 -0000
@@ -1,11 +1,13 @@
@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/requires.txt
lib/python${MODPY_VERSION}/site-packages/Cheetah-${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
@@ -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
--
Antoine
