Date: Fri, 10 Jan 2014 14:27:13 GMT From: Olivier Duchateau <olivierd@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/185639: [UPDATE] devel/py-Jinja2 to 2.7.2 Message-ID: <201401101427.s0AERDWr066481@oldred.freebsd.org> Resent-Message-ID: <201401101430.s0AEU0mj093195@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185639
>Category: ports
>Synopsis: [UPDATE] devel/py-Jinja2 to 2.7.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 10 14:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Olivier Duchateau
>Release:
>Organization:
>Environment:
>Description:
- Update to 2.7.2
- Support STAGEDIR
- Use PYTHON_PY3K_PLIST_HACK
- Adjust dependencies, textproc/py-MarkupSafe is needed in jinja2/utils.py
- Don't optimized generated bytecode in ${EXAMPLESDIR}
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (révision 339358)
+++ Makefile (copie de travail)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= Jinja2
-PORTVERSION= 2.7.1
-PORTREVISION= 0
+PORTVERSION= 2.7.2
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -18,21 +17,22 @@
USE_PYTHON= yes
.if empty(PKGNAMESUFFIX)
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:${PORTSDIR}/textproc/py-MarkupSafe
+
USE_PYDISTUTILS= easy_install
+PYTHON_PY3K_PLIST_HACK= yes
.endif
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
-OPTIONS_DEFINE?= BABEL EXAMPLES SPEEDUPS
-OPTIONS_DEFAULT?= BABEL SPEEDUPS
-SPEEDUPS_DESC= Enable speedups
+OPTIONS_DEFINE?= BABEL EXAMPLES
+OPTIONS_DEFAULT?= BABEL
BABEL_DESC= Enable Babel extension
PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER}
PY2TO3_ARGS= --fix=all --no-diffs --nobackups --verbose --write
-NO_STAGE= yes
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
@@ -40,17 +40,13 @@
.if ${PKGNAMESUFFIX} == "-doc"
BUILD_DEPENDS+= ${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-PORT_OPTIONS:= ${PORT_OPTIONS:NEXAMPLES}
+PORT_OPTIONS:= ${PORT_OPTIONS:MEXAMPLES}
.endif
.if ${PORT_OPTIONS:MBABEL}
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel
.endif
-.if ${PORT_OPTIONS:MSPEEDUPS}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:${PORTSDIR}/textproc/py-MarkupSafe
-.endif
-
# no problem with Python > 3.2
.if ${PYTHON_VERSION} == python3.2
pre-build:
@@ -65,8 +61,9 @@
@cd ${WRKSRC}/docs && ${MAKE} html
do-install:
- @${MKDIR} ${DOCSDIR}
- @cd ${WRKSRC}/docs/_build/html && ${COPYTREE_SHARE} . ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @cd ${WRKSRC}/docs/_build/html && \
+ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
@@ -74,12 +71,12 @@
. if ${PYTHON_REL} >= 300
${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples
. endif
- ${PYTHON_CMD} -m compileall ${WRKSRC}/examples ; \
- ${PYTHON_CMD} -O -m compileall ${WRKSRC}/examples
+ ${PYTHON_CMD} -m compileall ${WRKSRC}/examples
post-install:
- @${MKDIR} ${EXAMPLESDIR}
- @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ @cd ${WRKSRC}/examples && \
+ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
.endif
check regression-test test: build
@@ -89,8 +86,4 @@
@${DO_NADA}
.endif
-.if ${PYTHON_REL} >= 320
-.include "${.CURDIR}/../py-virtualenv/files/py3k-fix-pkg-plist.inc"
-.endif
-
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo (révision 339358)
+++ distinfo (copie de travail)
@@ -1,2 +1,2 @@
-SHA256 (Jinja2-2.7.1.tar.gz) = 5cc0a087a81dca1c08368482fb7a92fe2bdd8cfbb22bc0fccfe6c85affb04c8b
-SIZE (Jinja2-2.7.1.tar.gz) = 377813
+SHA256 (Jinja2-2.7.2.tar.gz) = 310a35fbccac3af13ebf927297f871ac656b9da1d248b1fe6765affa71b53235
+SIZE (Jinja2-2.7.2.tar.gz) = 378300
Index: pkg-plist
===================================================================
--- pkg-plist (révision 339358)
+++ pkg-plist (copie de travail)
@@ -132,33 +132,24 @@
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jinja2/visitor.pyo
%%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/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
@@ -166,7 +157,6 @@
%%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,7 +168,6 @@
%%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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401101427.s0AERDWr066481>