- Update to 2.6

- Add LICENSE stuff to Makefile
- Add post-build target to install the bytecode of the examples files

PR:		ports/159186
Submitted by:	Olivier Duchateau <duchateau.olivier at gmail.com>

3 files changed, 41 insertions, 5 deletions

diff --git a/devel/py-Jinja2/Makefile b/devel/py-Jinja2/Makefile
index 81b5bab9327..9ae872af9df 100644
--- a/devel/py-Jinja2/Makefile
+++ b/devel/py-Jinja2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Jinja2
-PORTVERSION=	2.5.5
-PORTREVISION=	1
+PORTVERSION=	2.6
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
@@ -16,6 +15,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A fast, and easy to use stand-alone template engine
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	easy_install
 
@@ -25,6 +27,13 @@ EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 OPTIONS=	SPEEDUPS	"Enable speedups"	on
 OPTIONS+=	BABEL	"Enable Babel extension"	off
 
+.if !defined(NOPORTEXAMPLES)
+post-build:
+# Bytecode Python
+	${PYTHON_CMD} -m compileall ${WRKSRC}/examples ; \
+	${PYTHON_CMD} -O -m compileall ${WRKSRC}/examples
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -44,7 +53,8 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:${PORTSDIR}/textproc/py-Ma
 .endif
 
 .if defined(WITH_BABEL)
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Babel-0.9.5:${PORTSDIR}/devel/py-babel
+# Actually >= 0.9.8
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:${PORTSDIR}/devel/py-babel
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-Jinja2/distinfo b/devel/py-Jinja2/distinfo
index 5bd29b9894b..da56f2968e0 100644
--- a/devel/py-Jinja2/distinfo
+++ b/devel/py-Jinja2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Jinja2-2.5.5.tar.gz) = 22f9675e42dc640c4469d4f7d210baecb5e695823af954c813d51c930235675d
-SIZE (Jinja2-2.5.5.tar.gz) = 438586
+SHA256 (Jinja2-2.6.tar.gz) = a85e185375db75c109f99ecde3d55415f035e7068a82252cf4f16c667ac38f49
+SIZE (Jinja2-2.6.tar.gz) = 389741
diff --git a/devel/py-Jinja2/pkg-plist b/devel/py-Jinja2/pkg-plist
index e9e2530f78f..02a745ce650 100644
--- a/devel/py-Jinja2/pkg-plist
+++ b/devel/py-Jinja2/pkg-plist
@@ -147,27 +147,51 @@
 %%PORTDOCS%%%%DOCSDIR%%/index.rst
 %%PORTDOCS%%%%DOCSDIR%%/integration.rst
 %%PORTDOCS%%%%DOCSDIR%%/intro.rst
+%%PORTDOCS%%%%DOCSDIR%%/latexindex.rst
 %%PORTDOCS%%%%DOCSDIR%%/sandbox.rst
 %%PORTDOCS%%%%DOCSDIR%%/switching.rst
 %%PORTDOCS%%%%DOCSDIR%%/templates.rst
 %%PORTDOCS%%%%DOCSDIR%%/tricks.rst
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/cycle.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/cycle.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/cycle.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/debugger.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/debugger.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/debugger.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/inheritance.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/inheritance.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/inheritance.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/templates/broken.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/templates/subbroken.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/test.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/test.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/test.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/test2.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/test2.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/test2.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/test_filter_and_linestatements.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/test_filter_and_linestatements.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/test_filter_and_linestatements.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/test_loop_filter.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/test_loop_filter.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/test_loop_filter.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/translate.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/translate.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/translate.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/profile.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/profile.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/profile.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/django/_form.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/django/_input_field.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/django/_textarea.html
 %%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/djangoext.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/genshi/helpers.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/genshi/index.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/genshi/layout.html
@@ -178,6 +202,8 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/mako/index.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/mako/layout.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/rwbench.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/rwbench.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rwbench/rwbench.pyo
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rwbench/mako
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rwbench/jinja
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rwbench/genshi