From owner-svn-ports-head@FreeBSD.ORG  Sun Jul  7 23:07:50 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 879F5555;
 Sun,  7 Jul 2013 23:07:50 +0000 (UTC)
 (envelope-from nivit@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 78E1D1B0E;
 Sun,  7 Jul 2013 23:07:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r67N7o2n073505;
 Sun, 7 Jul 2013 23:07:50 GMT (envelope-from nivit@svn.freebsd.org)
Received: (from nivit@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r67N7ogU073504;
 Sun, 7 Jul 2013 23:07:50 GMT (envelope-from nivit@svn.freebsd.org)
Message-Id: <201307072307.r67N7ogU073504@svn.freebsd.org>
From: Nicola Vitale <nivit@FreeBSD.org>
Date: Sun, 7 Jul 2013 23:07:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322468 - head/devel/py-Jinja2
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Jul 2013 23:07:50 -0000

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