From owner-svn-ports-head@FreeBSD.ORG Mon Mar 3 09:04:42 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 993F753B; Mon, 3 Mar 2014 09:04:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7A006CA8; Mon, 3 Mar 2014 09:04:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2394grI018523; Mon, 3 Mar 2014 09:04:42 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2394g5a018521; Mon, 3 Mar 2014 09:04:42 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201403030904.s2394g5a018521@svn.freebsd.org> From: Ruslan Makhmatkhanov Date: Mon, 3 Mar 2014 09:04:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346867 - in head/devel: py-Jinja2 py-Jinja2-doc 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.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Mar 2014 09:04:42 -0000 Author: rm Date: Mon Mar 3 09:04:41 2014 New Revision: 346867 URL: http://svnweb.freebsd.org/changeset/ports/346867 QAT: https://qat.redports.org/buildarchive/r346867/ Log: devel/py-Jinja2: support staging and do general clean-up - clarify license (BSD3C) - do not use easy_install for installation and convert to auto-generated packing list - add staging support - utilize options helpers - use PYTHON_REL instead of PYTHON_VERSION to build docs for python >= 3.2, not only for 3.2 - unmute installation commands - remove inclusion of devel/py-virtualenv/files/py3k-fix-pkg-plist.inc - it's implemented in bsd.python.mk - bump PORTREVISION because of package change Approved by: nivit (maintainer, explicitly for such changes in his ports) Deleted: head/devel/py-Jinja2-doc/pkg-plist head/devel/py-Jinja2/pkg-plist Modified: head/devel/py-Jinja2-doc/Makefile head/devel/py-Jinja2/Makefile Modified: head/devel/py-Jinja2-doc/Makefile ============================================================================== --- head/devel/py-Jinja2-doc/Makefile Mon Mar 3 08:55:45 2014 (r346866) +++ head/devel/py-Jinja2-doc/Makefile Mon Mar 3 09:04:41 2014 (r346867) @@ -5,16 +5,13 @@ PKGNAMESUFFIX= -doc MAINTAINER= nivit@FreeBSD.org COMMENT= Documentation of Jinja2 template engine -LICENSE= BSD +LICENSE= BSD3CLAUSE -DESCR= ${.CURDIR}/pkg-descr +DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../py-Jinja2 OPTIONS_DEFINE= OPTIONS_DEFAULT= -PLIST= ${.CURDIR}/pkg-plist - -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/devel/py-Jinja2/Makefile ============================================================================== --- head/devel/py-Jinja2/Makefile Mon Mar 3 08:55:45 2014 (r346866) +++ head/devel/py-Jinja2/Makefile Mon Mar 3 09:04:41 2014 (r346867) @@ -3,7 +3,7 @@ PORTNAME= Jinja2 PORTVERSION= 2.7.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,13 +12,14 @@ PKGNAMESUFFIX?= MAINTAINER= nivit@FreeBSD.org COMMENT?= Fast and easy to use stand-alone template engine -LICENSE= BSD +LICENSE= BSD3CLAUSE TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:${PORTSDIR}/textproc/py-MarkupSafe -USE_PYTHON= yes +USE_PYTHON= yes .if empty(PKGNAMESUFFIX) -USE_PYDISTUTILS= easy_install +USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes .endif EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} @@ -29,10 +30,12 @@ OPTIONS_DEFAULT?= BABEL SPEEDUPS SPEEDUPS_DESC= Enable speedups BABEL_DESC= Enable Babel extension +BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel +SPEEDUPS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:${PORTSDIR}/textproc/py-MarkupSafe + PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} PY2TO3_ARGS= --fix=all --no-diffs --nobackups --verbose --write -NO_STAGE= yes .include .include @@ -40,19 +43,12 @@ NO_STAGE= yes .if ${PKGNAMESUFFIX} == "-doc" BUILD_DEPENDS+= ${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} +PORTDOCS= * PORT_OPTIONS:= ${PORT_OPTIONS:NEXAMPLES} .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 +.if ${PYTHON_REL} >= 320 pre-build: ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/jinja2 .endif @@ -62,14 +58,15 @@ do-build: . if ${PYTHON_REL} >= 300 @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/docs . endif - @cd ${WRKSRC}/docs && ${MAKE} html + (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} +PORTEXAMPLES= * post-build: . if ${PYTHON_REL} >= 300 ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples @@ -78,8 +75,8 @@ post-build: ${PYTHON_CMD} -O -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 @@ check regression-test test: build @${DO_NADA} .endif -.if ${PYTHON_REL} >= 320 -.include "${.CURDIR}/../py-virtualenv/files/py3k-fix-pkg-plist.inc" -.endif - .include