Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Jul 2013 23:07:50 +0000 (UTC)
From:      Nicola Vitale <nivit@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r322468 - head/devel/py-Jinja2
Message-ID:  <201307072307.r67N7ogU073504@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nivit
Date: Sun Jul  7 23:07:49 2013
New Revision: 322468
URL: http://svnweb.freebsd.org/changeset/ports/322468

Log:
  - Fix build with Python 3.2  [1]
  - Put all options for the command 2to3 in PY2TO3_ARGS
  
  Build log:	http://goo.gl/AxzsT
  Reported by:	eadler (via private email)  [1]

Modified:
  head/devel/py-Jinja2/Makefile

Modified: head/devel/py-Jinja2/Makefile
==============================================================================
--- head/devel/py-Jinja2/Makefile	Sun Jul  7 23:06:17 2013	(r322467)
+++ head/devel/py-Jinja2/Makefile	Sun Jul  7 23:07:49 2013	(r322468)
@@ -30,6 +30,7 @@ SPEEDUPS_DESC=	Enable speedups
 BABEL_DESC=	Enable Babel extension
 
 PY2TO3_CMD=	${LOCALBASE}/bin/2to3-${PYTHON_VER}
+PY2TO3_ARGS=	--fix=all --no-diffs --nobackups --verbose --write
 
 .include <bsd.port.options.mk>
 
@@ -50,10 +51,16 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Bab
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:${PORTSDIR}/textproc/py-MarkupSafe
 .endif
 
+# no problem with Python > 3.2
+.if ${PYTHON_VERSION} == python3.2
+pre-build:
+	${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/jinja2
+.endif
+
 .if ${PKGNAMESUFFIX} == "-doc"
 do-build:
 .	if ${PYTHON_REL} >= 300
-	@${PY2TO3_CMD} --no-diffs --fix=all --verbose --write ${WRKSRC}/docs
+	@${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/docs
 .	endif
 	@cd ${WRKSRC}/docs && ${MAKE} html
 
@@ -65,7 +72,7 @@ do-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
 post-build:
 .	if ${PYTHON_REL} >= 300
-	${PY2TO3_CMD} --no-diffs --fix=all --verbose --write ${WRKSRC}/examples
+	${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples
 .	endif
 	${PYTHON_CMD} -m compileall ${WRKSRC}/examples ; \
 	${PYTHON_CMD} -O -m compileall ${WRKSRC}/examples



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307072307.r67N7ogU073504>