4 files changed, 15 insertions, 166 deletions

diff --git a/devel/py-Jinja/Makefile b/devel/py-Jinja/Makefile
index a8849e9dd9f6..4eef5d9835b1 100644
--- a/devel/py-Jinja/Makefile
+++ b/devel/py-Jinja/Makefile
@@ -3,33 +3,26 @@
 
 PORTNAME=	Jinja
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
-COMMENT=	A fast and easy to use stand-alone template engine
+COMMENT=	Fast and easy to use stand-alone template engine
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-NO_STAGE=	yes
+LICENSE=	BSD3CLAUSE
 
-PYEASYINSTALL_ARCHDEP=	yes
-PYEASYINSTALL_INSTALLARGS=	-N ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}
-PYEASYINSTALL_UNINSTALLARGS=	-q -m -N ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+PORTDOCS=	*
 
-.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
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/py-Jinja/files/patch-setup.py b/devel/py-Jinja/files/patch-setup.py
index 44213af0751e..9ca7e4926be6 100644
--- a/devel/py-Jinja/files/patch-setup.py
+++ b/devel/py-Jinja/files/patch-setup.py
@@ -1,20 +1,6 @@
---- 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 @@
+--- ./setup.py.orig	2007-11-17 20:13:24.000000000 +0300
++++ ./setup.py	2014-03-03 13:21:43.000000000 +0400
+@@ -78,10 +78,7 @@
      ],
      keywords=['python.templating.engines'],
      packages=['jinja', 'jinja.translators'],
@@ -22,7 +8,7 @@
 -        ('docs/html', list(list_files('docs/html'))),
 -        ('docs/txt', list(list_files('docs/src')))
 -    ],
-+    data_files=port_data_files,
++    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 21cacb41cb8d..8b8553f6f826 100644
--- a/devel/py-Jinja/pkg-descr
+++ b/devel/py-Jinja/pkg-descr
@@ -1,7 +1,6 @@
-Jinja is a sandboxed  template engine written in pure Python  licensed
+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://jinja.pocoo.org/
+WWW: http://jinja.pocoo.org/
diff --git a/devel/py-Jinja/pkg-plist b/devel/py-Jinja/pkg-plist
deleted file mode 100644
index 2506aa97f8cc..000000000000
--- a/devel/py-Jinja/pkg-plist
+++ /dev/null
@@ -1,129 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/html/altsyntax.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api.html
-%%PORTDOCS%%%%DOCSDIR%%/html/builtins.html
-%%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/html/debugging.html
-%%PORTDOCS%%%%DOCSDIR%%/html/designerdoc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/devintro.html
-%%PORTDOCS%%%%DOCSDIR%%/html/devrecipies.html
-%%PORTDOCS%%%%DOCSDIR%%/html/escaping.html
-%%PORTDOCS%%%%DOCSDIR%%/html/filters.html
-%%PORTDOCS%%%%DOCSDIR%%/html/frameworks.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fromdjango.html
-%%PORTDOCS%%%%DOCSDIR%%/html/i18n.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/inheritance.html
-%%PORTDOCS%%%%DOCSDIR%%/html/installation.html
-%%PORTDOCS%%%%DOCSDIR%%/html/jinjabanner.png
-%%PORTDOCS%%%%DOCSDIR%%/html/jinjalogo.png
-%%PORTDOCS%%%%DOCSDIR%%/html/loaders.html
-%%PORTDOCS%%%%DOCSDIR%%/html/objects.html
-%%PORTDOCS%%%%DOCSDIR%%/html/recipies.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scopes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/streaming.html
-%%PORTDOCS%%%%DOCSDIR%%/html/style.css
-%%PORTDOCS%%%%DOCSDIR%%/html/templatei18n.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tests.html
-%%PORTDOCS%%%%DOCSDIR%%/html/translators.html
-%%PORTDOCS%%%%DOCSDIR%%/html/watermark.png
-%%PORTDOCS%%%%DOCSDIR%%/txt/altsyntax.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/api.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/builtins.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/changelog.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/debugging.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/designerdoc.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/devintro.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/devrecipies.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/escaping.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/filters.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/frameworks.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/fromdjango.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/i18n.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/index.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/inheritance.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/installation.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/loaders.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/objects.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/recipies.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/scopes.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/streaming.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/templatei18n.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/tests.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/translators.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/_debugger.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/_debugger.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/_debugger.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/_debugger.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/_native.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/_native.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/_native.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/_speedups.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/_speedups.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/_speedups.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/_speedups.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/constants.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/constants.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/constants.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/datastructure.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/datastructure.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/datastructure.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/debugger.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/debugger.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/debugger.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/defaults.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/defaults.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/defaults.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/environment.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/environment.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/environment.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/exceptions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/filters.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/filters.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/filters.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/lexer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/lexer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/lexer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/loaders.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/loaders.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/loaders.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/nodes.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/nodes.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/nodes.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/parser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/parser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/parser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/plugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/plugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/plugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/translators/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/translators/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/translators/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/translators/python.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/translators/python.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/translators/python.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/utils.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja/translators
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%