From e2df7833cfe0c969e7895b61a1978dc180f6f784 Mon Sep 17 00:00:00 2001 From: fgsch Date: Thu, 2 May 2013 20:08:15 +0000 Subject: [PATCH] Regen after py-sphinx update and bump. While here ensure docs are built with the right environment. --- www/py-flask/Makefile | 14 ++++++++------ www/py-flask/pkg/PLIST | 11 ++++++++++- www/py-werkzeug/Makefile | 14 ++++++++------ www/py-werkzeug/pkg/PLIST | 11 ++++++++++- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile index 9d5229eb4cd..0fdcf920c09 100644 --- a/www/py-flask/Makefile +++ b/www/py-flask/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.10 2013/03/11 11:44:48 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2013/05/02 20:09:35 fgsch Exp $ COMMENT = microframework based on Werkzeug and Jinja 2 MODPY_EGG_VERSION = 0.9 DISTNAME = Flask-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME:L} -REVISION = 0 +REVISION = 1 CATEGORIES = www devel @@ -28,15 +28,17 @@ BUILD_DEPENDS = textproc/py-sphinx \ www/py-werkzeug>=0.7 TEST_DEPENDS = ${RUN_DEPENDS} +MAKE_ENV = PYTHONPATH="${WRKSRC}" + post-build: - cd ${WRKSRC}/docs && PYTHONPATH=.. $(MAKE_PROGRAM) html + @cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/docs/${MODPY_PY_PREFIX}flask + cd ${WRKSRC}/docs/_build/html && \ + pax -rw * ${PREFIX}/share/docs/${MODPY_PY_PREFIX}flask + rm -rf ${PREFIX}/share/docs/${MODPY_PY_PREFIX}flask/_sources ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${MODPY_PY_PREFIX}flask - cd ${WRKSRC}/docs/_build/html && pax -rw \ - _images _static deploying patterns tutorial *.{inv,js,html} \ - ${PREFIX}/share/docs/${MODPY_PY_PREFIX}flask cd ${WRKSRC}/examples && pax -rw * \ ${PREFIX}/share/examples/${MODPY_PY_PREFIX}flask diff --git a/www/py-flask/pkg/PLIST b/www/py-flask/pkg/PLIST index 8f45bf60c68..0d1c54fbd00 100644 --- a/www/py-flask/pkg/PLIST +++ b/www/py-flask/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2013/03/10 10:57:51 fgsch Exp $ +@comment $OpenBSD: PLIST,v 1.6 2013/05/02 20:09:35 fgsch Exp $ lib/python${MODPY_VERSION}/site-packages/Flask-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/Flask-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/Flask-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt @@ -191,10 +191,16 @@ share/docs/${MODPY_PY_PREFIX}flask/_images/logo-full.png share/docs/${MODPY_PY_PREFIX}flask/_images/no.png share/docs/${MODPY_PY_PREFIX}flask/_images/yes.png share/docs/${MODPY_PY_PREFIX}flask/_static/ +share/docs/${MODPY_PY_PREFIX}flask/_static/ajax-loader.gif share/docs/${MODPY_PY_PREFIX}flask/_static/basic.css +share/docs/${MODPY_PY_PREFIX}flask/_static/comment-bright.png +share/docs/${MODPY_PY_PREFIX}flask/_static/comment-close.png +share/docs/${MODPY_PY_PREFIX}flask/_static/comment.png share/docs/${MODPY_PY_PREFIX}flask/_static/debugger.png share/docs/${MODPY_PY_PREFIX}flask/_static/default.css share/docs/${MODPY_PY_PREFIX}flask/_static/doctools.js +share/docs/${MODPY_PY_PREFIX}flask/_static/down-pressed.png +share/docs/${MODPY_PY_PREFIX}flask/_static/down.png share/docs/${MODPY_PY_PREFIX}flask/_static/file.png share/docs/${MODPY_PY_PREFIX}flask/_static/flask.png share/docs/${MODPY_PY_PREFIX}flask/_static/flaskr.png @@ -208,6 +214,9 @@ share/docs/${MODPY_PY_PREFIX}flask/_static/searchtools.js share/docs/${MODPY_PY_PREFIX}flask/_static/sidebar.js share/docs/${MODPY_PY_PREFIX}flask/_static/touch-icon.png share/docs/${MODPY_PY_PREFIX}flask/_static/underscore.js +share/docs/${MODPY_PY_PREFIX}flask/_static/up-pressed.png +share/docs/${MODPY_PY_PREFIX}flask/_static/up.png +share/docs/${MODPY_PY_PREFIX}flask/_static/websupport.js share/docs/${MODPY_PY_PREFIX}flask/_static/yes.png share/docs/${MODPY_PY_PREFIX}flask/advanced_foreword.html share/docs/${MODPY_PY_PREFIX}flask/api.html diff --git a/www/py-werkzeug/Makefile b/www/py-werkzeug/Makefile index 97dff96fa80..c835902c609 100644 --- a/www/py-werkzeug/Makefile +++ b/www/py-werkzeug/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.12 2013/03/10 10:59:42 fgsch Exp $ +# $OpenBSD: Makefile,v 1.13 2013/05/02 20:08:15 fgsch Exp $ COMMENT = WSGI utility collection MODPY_EGG_VERSION = 0.8.3 DISTNAME = Werkzeug-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME:L} -REVISION = 0 +REVISION = 1 CATEGORIES = www devel @@ -17,18 +17,20 @@ MASTER_SITES = ${MASTER_SITE_PYPI:=W/Werkzeug/} PERMIT_PACKAGE_CDROM = Yes MODULES = lang/python + MODPY_SETUPTOOLS = Yes -PKG_ARCH = * BUILD_DEPENDS = textproc/py-sphinx +PKG_ARCH = * + post-build: - cd ${WRKSRC}/docs && $(MAKE_PROGRAM) html + @cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${MODPY_PY_PREFIX}werkzeug cd ${WRKSRC}/docs/_build/html && \ - pax -rw _images _static contrib deployment *.{inv,js,html} \ - ${PREFIX}/share/doc/${MODPY_PY_PREFIX}werkzeug + pax -rw * ${PREFIX}/share/doc/${MODPY_PY_PREFIX}werkzeug + rm -rf ${PREFIX}/share/doc/${MODPY_PY_PREFIX}werkzeug/_sources .include diff --git a/www/py-werkzeug/pkg/PLIST b/www/py-werkzeug/pkg/PLIST index cd3e901af76..290bca871c2 100644 --- a/www/py-werkzeug/pkg/PLIST +++ b/www/py-werkzeug/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2013/03/10 10:59:42 fgsch Exp $ +@comment $OpenBSD: PLIST,v 1.6 2013/05/02 20:08:15 fgsch Exp $ lib/python${MODPY_VERSION}/site-packages/Werkzeug-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/Werkzeug-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/Werkzeug-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt @@ -180,12 +180,18 @@ share/doc/${MODPY_PY_PREFIX}werkzeug/_images/ share/doc/${MODPY_PY_PREFIX}werkzeug/_images/debug-screenshot.png share/doc/${MODPY_PY_PREFIX}werkzeug/_images/shortly.png share/doc/${MODPY_PY_PREFIX}werkzeug/_static/ +share/doc/${MODPY_PY_PREFIX}werkzeug/_static/ajax-loader.gif share/doc/${MODPY_PY_PREFIX}werkzeug/_static/background.png share/doc/${MODPY_PY_PREFIX}werkzeug/_static/basic.css share/doc/${MODPY_PY_PREFIX}werkzeug/_static/codebackground.png +share/doc/${MODPY_PY_PREFIX}werkzeug/_static/comment-bright.png +share/doc/${MODPY_PY_PREFIX}werkzeug/_static/comment-close.png +share/doc/${MODPY_PY_PREFIX}werkzeug/_static/comment.png share/doc/${MODPY_PY_PREFIX}werkzeug/_static/contents.png share/doc/${MODPY_PY_PREFIX}werkzeug/_static/debug-screenshot.png share/doc/${MODPY_PY_PREFIX}werkzeug/_static/doctools.js +share/doc/${MODPY_PY_PREFIX}werkzeug/_static/down-pressed.png +share/doc/${MODPY_PY_PREFIX}werkzeug/_static/down.png share/doc/${MODPY_PY_PREFIX}werkzeug/_static/favicon.ico share/doc/${MODPY_PY_PREFIX}werkzeug/_static/file.png share/doc/${MODPY_PY_PREFIX}werkzeug/_static/header.png @@ -200,6 +206,9 @@ share/doc/${MODPY_PY_PREFIX}werkzeug/_static/shortly.png share/doc/${MODPY_PY_PREFIX}werkzeug/_static/shorty-screenshot.png share/doc/${MODPY_PY_PREFIX}werkzeug/_static/style.css share/doc/${MODPY_PY_PREFIX}werkzeug/_static/underscore.js +share/doc/${MODPY_PY_PREFIX}werkzeug/_static/up-pressed.png +share/doc/${MODPY_PY_PREFIX}werkzeug/_static/up.png +share/doc/${MODPY_PY_PREFIX}werkzeug/_static/websupport.js share/doc/${MODPY_PY_PREFIX}werkzeug/_static/werkzeug.css share/doc/${MODPY_PY_PREFIX}werkzeug/_static/werkzeug.js share/doc/${MODPY_PY_PREFIX}werkzeug/_static/werkzeug.png