svn commit: r346872 - in head/devel/py-Jinja: . files

[Ruslan Makhmatkhanov]

Author: rm
Date: Mon Mar  3 09:47:32 2014
New Revision: 346872
URL: http://svnweb.freebsd.org/changeset/ports/346872
QAT: https://qat.redports.org/buildarchive/r346872/

Log:
  devel/py-Jinja2: support staging and do general clean-up
  
  - remove indefinite article from COMMENT
  - add license (BSD3C)
  - do not use easy_install for installation and convert to auto-generated packing list
  - add staging support
  - simplify docs installation:
    - install docs manually
    - install docs unconditionally into staging area
    - no need to install doc sources, compiled html versions are suffice
  - limit python version to 2.x only:
    ===>  Configuring for py33-Jinja-1.2_3
    Traceback (most recent call last):
      File "<string>", line 1, in <module>
      File "setup.py", line 28
        except DistutilsError, e:
                           ^
    SyntaxError: invalid syntax
    *** Error code 1
  - remove deprecated author attribution from pkg-descr and do tab->space change in WWW
  - bump PORTREVISION
  
  Approved by:	nivit (maintainer, explicitly for such changes in his ports)

Deleted:
  head/devel/py-Jinja/pkg-plist
Modified:
  head/devel/py-Jinja/Makefile
  head/devel/py-Jinja/files/patch-setup.py
  head/devel/py-Jinja/pkg-descr

Modified: head/devel/py-Jinja/Makefile
==============================================================================
--- head/devel/py-Jinja/Makefile	Mon Mar  3 09:39:57 2014	(r346871)
+++ head/devel/py-Jinja/Makefile	Mon Mar  3 09:47:32 2014	(r346872)
@@ -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 at 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
-
-PYEASYINSTALL_ARCHDEP=	yes
-PYEASYINSTALL_INSTALLARGS=	-N ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}
-PYEASYINSTALL_UNINSTALLARGS=	-q -m -N ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}
+LICENSE=	BSD3CLAUSE
+
+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>

Modified: head/devel/py-Jinja/files/patch-setup.py
==============================================================================
--- head/devel/py-Jinja/files/patch-setup.py	Mon Mar  3 09:39:57 2014	(r346871)
+++ head/devel/py-Jinja/files/patch-setup.py	Mon Mar  3 09:47:32 2014	(r346872)
@@ -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

Modified: head/devel/py-Jinja/pkg-descr
==============================================================================
--- head/devel/py-Jinja/pkg-descr	Mon Mar  3 09:39:57 2014	(r346871)
+++ head/devel/py-Jinja/pkg-descr	Mon Mar  3 09:47:32 2014	(r346872)
@@ -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/