4 files changed, 52 insertions, 12 deletions

diff --git a/devel/py-Jinja/Makefile b/devel/py-Jinja/Makefile
index dfe465f1228f..3397303d261c 100644
--- a/devel/py-Jinja/Makefile
+++ b/devel/py-Jinja/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Jinja
-PORTVERSION=	0.9
+PORTVERSION=	1.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
@@ -18,6 +18,20 @@ COMMENT=	A fast, and easy to use stand-alone template engine
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	easy_install
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+PYEASYINSTALL_ARCHDEP=	yes
+PYEASYINSTALL_INSTALLARGS=	-N ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}
+PYEASYINSTALL_UNINSTALLARGS=	-q -m -N ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}
+
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+
+.if defined(NOPORTDOCS)
+MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS}
+.else
+RM_OPTS=	-R
+post-install:
+	@${MKDIR} ${DOCSDIR}
+	@${MV} ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}/docs/html ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}/docs/txt ${DOCSDIR}/
+	@${RM} ${RM_OPTS} ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}/docs
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-Jinja/distinfo b/devel/py-Jinja/distinfo
index aa352f39b186..8eb787b4777c 100644
--- a/devel/py-Jinja/distinfo
+++ b/devel/py-Jinja/distinfo
@@ -1,3 +1,3 @@
-MD5 (Jinja-0.9.tar.gz) = a5aaebb6285e044b6b9d56facae1c1f2
-SHA256 (Jinja-0.9.tar.gz) = 652db44e332b65fdd797665a52e9f7527e437d2b943bbc010bee88cd38d76bbe
-SIZE (Jinja-0.9.tar.gz) = 55816
+MD5 (Jinja-1.2.tar.gz) = 1235a005ade00b213800ff1e798c0241
+SHA256 (Jinja-1.2.tar.gz) = 36252f3d0356008a31a537a31cfba189f7b5898b8e2da454f72ea5f987db8b31
+SIZE (Jinja-1.2.tar.gz) = 252918
diff --git a/devel/py-Jinja/files/patch-setup.py b/devel/py-Jinja/files/patch-setup.py
new file mode 100644
index 000000000000..44213af0751e
--- /dev/null
+++ b/devel/py-Jinja/files/patch-setup.py
@@ -0,0 +1,28 @@
+--- setup.py	2007-11-17 18:13:24.000000000 +0100
++++ setup.py.port	2008-02-16 14:36:17.000000000 +0100
+@@ -51,6 +51,13 @@
+             print '  problem: %s' % e
+             print '=' * 79
+ 
++if not os.environ.has_key('NOPORTDOCS'):
++    port_data_files=[
++        ('docs/html', list(list_files('docs/html'))),
++        ('docs/txt', list(list_files('docs/src')))
++    ]
++else:
++    port_data_files=[]
+ 
+ setup(
+     name='Jinja',
+@@ -78,10 +85,7 @@
+     ],
+     keywords=['python.templating.engines'],
+     packages=['jinja', 'jinja.translators'],
+-    data_files=[
+-        ('docs/html', list(list_files('docs/html'))),
+-        ('docs/txt', list(list_files('docs/src')))
+-    ],
++    data_files=port_data_files,
+     entry_points='''
+     [python.templating.engines]
+     jinja = jinja.plugin:BuffetPlugin
diff --git a/devel/py-Jinja/pkg-descr b/devel/py-Jinja/pkg-descr
index 667732afc809..21cacb41cb8d 100644
--- a/devel/py-Jinja/pkg-descr
+++ b/devel/py-Jinja/pkg-descr
@@ -1,9 +1,7 @@
-Jinja is a small but very fast and easy to use stand-alone template engine
-written in pure python.
-Since version 0.6 it uses a new parser that increases parsing performance
-a lot by caching the nodelists on the harddisk if wanted.
-It includes multiple template inheritance and other features like simple
-value escaping.
+Jinja is a sandboxed  template engine written in pure Python  licensed
+under the BSD license. It provides a Django-like non-XML syntax and
+compiles templates into executable python code. It's basically a
+combination of Django templates and python code.
 
 Author: Armin Ronacher
-WWW:	http://wsgiarea.pocoo.org/jinja/
+WWW:	http://jinja.pocoo.org/