svn commit: r346867 - in head/devel: py-Jinja2 py-Jinja2-doc
Ruslan Makhmatkhanov
rm at FreeBSD.org
Mon Mar 3 09:04:42 UTC 2014
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 at 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 at 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 <bsd.port.options.mk>
.include <bsd.port.pre.mk>
@@ -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 <bsd.port.post.mk>
More information about the svn-ports-head
mailing list