- Update to 2.5.2

- Add options WITH_SPEEDUPS (on) and WITH_BABEL (off)
- Remove files/patch-*

5 files changed, 38 insertions, 32 deletions

diff --git a/devel/py-Jinja2/Makefile b/devel/py-Jinja2/Makefile
index 2726de1a6d0b..8ad3c62a51a0 100644
--- a/devel/py-Jinja2/Makefile
+++ b/devel/py-Jinja2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	Jinja2
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	2.5.2
+PORTREVISION=	0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
@@ -18,11 +18,13 @@ COMMENT=	A fast, and easy to use stand-alone template engine
 
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	easy_install
-PYEASYINSTALL_ARCHDEP=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
+OPTIONS=	SPEEDUPS	"Enable speedups"	on
+OPTIONS+=	BABEL	"Enable Babel extension"	off
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -33,4 +35,14 @@ post-install:
 	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SPEEDUPS)
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:${PORTSDIR}/textproc/py-MarkupSafe
+.endif
+
+.if defined(WITH_BABEL)
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Babel-0.9.5:${PORTSDIR}/devel/py-babel
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/py-Jinja2/distinfo b/devel/py-Jinja2/distinfo
index 6a32d7cb2398..916ccd033f7f 100644
--- a/devel/py-Jinja2/distinfo
+++ b/devel/py-Jinja2/distinfo
@@ -1,3 +1,3 @@
-MD5 (Jinja2-2.4.1.tar.gz) = e0cf5af057fac63ac9689b86c8b31ce6
-SHA256 (Jinja2-2.4.1.tar.gz) = a90b3f18ccbb50c0a0fb3eaff23d60b7664e3e447c676a2cd21459a257574b38
-SIZE (Jinja2-2.4.1.tar.gz) = 689032
+MD5 (Jinja2-2.5.2.tar.gz) = 3829be2926a067ee024e6d3e5327dbf7
+SHA256 (Jinja2-2.5.2.tar.gz) = 19040f01b3a9d8c63e4d57936f78710908199b69370ab44a0f7407dd891f019b
+SIZE (Jinja2-2.5.2.tar.gz) = 697422
diff --git a/devel/py-Jinja2/files/patch-manifest.in-speedups b/devel/py-Jinja2/files/patch-manifest.in-speedups
deleted file mode 100644
index 76c10f2dd2ef..000000000000
--- a/devel/py-Jinja2/files/patch-manifest.in-speedups
+++ /dev/null
@@ -1,9 +0,0 @@
---- MANIFEST.in.dist	2010-02-19 07:31:56.000000000 -0500
-+++ MANIFEST.in	2010-04-06 23:28:31.000000000 -0400
-@@ -1,4 +1,5 @@
--include MANIFEST.in Makefile CHANGES LICENSE AUTHORS jinja2/_speedups.c
-+include MANIFEST.in Makefile CHANGES LICENSE AUTHORS
-+exclude jinja2/_speedups.c
- recursive-include docs *
- recursive-include custom_fixers *
- recursive-include ext *
diff --git a/devel/py-Jinja2/files/patch-setup.py-speedups b/devel/py-Jinja2/files/patch-setup.py-speedups
deleted file mode 100644
index 9fdde8f3103d..000000000000
--- a/devel/py-Jinja2/files/patch-setup.py-speedups
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2010-05-10 20:18:44.000000000 -0400
-+++ setup.py	2010-05-10 20:19:39.000000000 -0400
-@@ -80,7 +80,7 @@
-     packages=['jinja2', 'jinja2.testsuite', 'jinja2.testsuite.res'],
-     features={
-         'speedups': Feature("optional C speed-enhancements",
--            standard=False,
-+            standard=True,
-             ext_modules=[
-                 Extension('jinja2._speedups', ['jinja2/_speedups.c'])
-             ]
diff --git a/devel/py-Jinja2/pkg-plist b/devel/py-Jinja2/pkg-plist
index 3915152fa920..08bd8d9d7cfa 100644
--- a/devel/py-Jinja2/pkg-plist
+++ b/devel/py-Jinja2/pkg-plist
@@ -3,17 +3,28 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_speedups.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_speedups.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_speedups.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_speedups.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_debugsupport.c
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/_bundle.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/_bundle.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/_bundle.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/_constants.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/_constants.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/_constants.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/_native.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/_native.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/_native.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/tests.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/tests.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe/tests.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_stringdefs.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_stringdefs.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_stringdefs.pyo
@@ -195,6 +206,7 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/django/index.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/django/layout.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/djangoext.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/djangoext.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/genshi/helpers.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/genshi/index.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/genshi/layout.html
@@ -205,6 +217,7 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/mako/index.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/mako/layout.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/rwbench.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/rwbench.pyc
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rwbench/mako
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rwbench/jinja
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rwbench/genshi
@@ -220,6 +233,7 @@
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/testsuite/res/templates
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/testsuite/res
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/testsuite
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/_markupsafe
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%