Attachment 144058 Details for Bug 191267 – Proposed fixes

[patch] Proposed fixes

py-redis-htmldocs2docs.patch (text/plain), 1.79 KB, created by Raphael Kubo da Costa on 2014-06-23 07:14:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raphael Kubo da Costa

Created: 2014-06-23 07:14:04 UTC

Size: 1.79 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 358899)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	redis
> PORTVERSION=	2.10.1
>+PORTREVISION=	1
> CATEGORIES=	databases python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -11,10 +12,8 @@
> 
> LICENSE=	MIT
> 
>-OPTIONS_DEFINE=	HIREDIS HTMLDOCS
>+OPTIONS_DEFINE=	DOCS HIREDIS
> HIREDIS_DESC=	High performance response parser (via hiredis)
>-HTMLDOCS_DESC=	Build and install API docs using Sphinx
>-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
> DOCGEN=		${LOCALBASE}/bin/sphinx-apidoc
> 
> HIREDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>0:${PORTSDIR}/databases/py-hiredis
>@@ -22,6 +21,7 @@
> USE_PYTHON=		yes
> USE_PYDISTUTILS=	yes
> PYDISTUTILS_AUTOPLIST=	yes
>+PYTHON_CONCURRENT_INSTALL=yes
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	andymccurdy
>@@ -29,10 +29,8 @@
> GH_COMMIT=	e7589d7
> 
> .include <bsd.port.options.mk>
>-.if !empty(PORT_OPTIONS:MHTMLDOCS)
>-.	if empty(PORT_OPTIONS:MDOCS)
>-IGNORE=	you cannot build documentation with DOCS option disabled
>-.	endif
>+
>+.if ${PORT_OPTIONS:MDOCS}
> BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
> BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:${PORTSDIR}/textproc/py-MarkupSafe
> PORTDOCS=	*
>@@ -43,7 +41,7 @@
> 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
> 
> post-build:
>-.if ${PORT_OPTIONS:MHTMLDOCS}
>+.if ${PORT_OPTIONS:MDOCS}
> 	@${ECHO_CMD} "Building documentation"
> 	@cd ${WRKSRC} && ${DOCGEN} -o apidocs -F -H 'redis-py' \
> 		-V ${PORTVERSION} -A '2014, Andy McCurdy, Mahdi Yusuf' \
>@@ -53,7 +51,7 @@
> .endif
> 
> post-install:
>-.if ${PORT_OPTIONS:MHTMLDOCS}
>+.if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	@${RM} ${WRKSRC}/apidocs/_build/html/.buildinfo
> 	@cd ${WRKSRC}/apidocs/_build/html && ${COPYTREE_SHARE} . \

Actions: View | Diff

Attachments on bug 191267: 144018 | 144048 | 144058